Morris Jobke
494c1d7417
Merge pull request #18440 from owncloud/ext-backends.customjs
...
Migrate custom JS external storage backends to new registration API [part 2]
2015-08-25 11:52:56 +02:00
Thomas Müller
2f86be9ced
Merge pull request #18523 from owncloud/crazy-scanner
...
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
2015-08-25 09:23:42 +02:00
Morris Jobke
424759908d
Merge pull request #18445 from owncloud/ext-only-setuservars-string
...
setUserVars() should only attempt substitution with strings
2015-08-25 08:43:01 +02:00
Robin McCorkell
88a78237b0
Migrate Google external storage to new API
2015-08-25 00:22:10 +01:00
Robin McCorkell
a50ef61876
Migrate Dropbox external storage to new API
2015-08-25 00:22:10 +01:00
Robin McCorkell
ced04f9ad2
Migrate AmazonS3 external storage to new API
2015-08-25 00:22:10 +01:00
Robin McCorkell
f505883e45
Add on-backend and on-auth-mechanism events to JS
2015-08-25 00:22:10 +01:00
Morris Jobke
09808a9007
Merge pull request #18532 from owncloud/fix-regression
...
Fix regression
2015-08-24 20:11:46 +02:00
Morris Jobke
b2fcdd65cd
Merge pull request #18528 from owncloud/files-sidebar-mtime
...
Parse mtime from the data attributes
2015-08-24 19:44:46 +02:00
Morris Jobke
1797bb576f
Merge pull request #18525 from owncloud/app-sidebar-style
...
Right sidebar style improvements
2015-08-24 19:44:31 +02:00
Morris Jobke
2817eecf19
Fix regression
...
* fixes #18529
2015-08-24 17:38:32 +02:00
Vincent Petry
37939fb0e8
Parse mtime from the data attributes
2015-08-24 17:16:20 +02:00
Jan-Christoph Borchardt
a659ccb89c
bigger file thumbnail in app sidebar
2015-08-24 16:58:30 +02:00
Jan-Christoph Borchardt
763b75ff4f
lighter style for app sidebar, new switcher style
2015-08-24 16:58:04 +02:00
Morris Jobke
1f749782aa
Merge pull request #18510 from owncloud/proper-debug-setting
...
Remove DEBUG constant and use config value
2015-08-24 16:44:24 +02:00
Vincent Petry
fe575feca8
Prevent scanner going crazy with unavailable storages
2015-08-24 16:42:53 +02:00
Morris Jobke
bc588a0392
Merge pull request #18521 from owncloud/search-style
...
adjust search box style
2015-08-24 16:03:40 +02:00
Jan-Christoph Borchardt
4ba8685c2d
adjust search box style
2015-08-24 15:52:32 +02:00
Morris Jobke
e88b380973
Remove DEBUG constant and use config value
...
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
2015-08-24 15:14:05 +02:00
Lukas Reschke
a67a2272e7
Merge pull request #18491 from owncloud/expire-token-after-12h-or-login
...
Expire token after 12h and if user logged-in again
2015-08-24 14:08:46 +02:00
blizzz
642ec8e3ba
Merge pull request #18244 from owncloud/fix-issue-17677
...
Fix 17677 - Remove LDAP case sensitive checkbox
2015-08-24 13:45:15 +02:00
Vincent Petry
3d9a1dd7c7
Merge pull request #18513 from owncloud/fix-master-again
...
Fix master again
2015-08-24 13:16:08 +02:00
Lukas Reschke
bd13126a80
Fix master again
...
Caused due to merge of two PRs
2015-08-24 12:19:03 +02:00
Vincent Petry
6848f25c0d
Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges
...
Always detect remote changes for fed sharing
2015-08-24 12:17:23 +02:00
Morris Jobke
b3495a1dc9
Merge pull request #18482 from owncloud/encrypt-session-data
...
Add a session wrapper to encrypt the data before storing it on disk
2015-08-24 12:10:15 +02:00
Lukas Reschke
cca35f0c3e
Merge pull request #18121 from owncloud/enc_improve_privkey_encryption
...
use password hash to encrypt private key
2015-08-24 12:03:27 +02:00
Vincent Petry
fe568ab64d
Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy
...
Use client service to work behind proxy for checks for remote ownCloud instances
2015-08-24 11:05:14 +02:00
Morris Jobke
1f7a59b0e2
Merge pull request #18505 from owncloud/fix-personal-scrollbar
...
fix horizontal scrollbar in personal settings caused by federated cloud ID section
2015-08-24 11:03:37 +02:00
Vincent Petry
c154d1aeb1
Merge pull request #18498 from owncloud/remove-csrf-check-for-avatar
...
Remove requesttoken for avatars
2015-08-24 11:02:05 +02:00
Vincent Petry
31d62c10bf
Merge pull request #17501 from tbartenstein/patch-1
...
Update fileinfo.php
2015-08-24 09:57:27 +02:00
Jan-Christoph Borchardt
0f10e2c1fe
fix horizontal scrollbar in personal settings caused by federated cloud ID section
2015-08-24 09:36:44 +02:00
Morris Jobke
40b1054530
Merge pull request #18254 from owncloud/mitigate-breach
...
Add mitigation against BREACH
2015-08-24 09:14:27 +02:00
Lukas Reschke
84d1e36ff9
Remove requesttoken for avatars
...
First step for https://github.com/owncloud/core/issues/11915
2015-08-23 16:49:12 +02:00
Lukas Reschke
db4cb1dd4d
Expire token after 12h and if user logged-in again
...
As an hardening measure we should expire password reset tokens after 12h and if the user has logged-in again successfully after the token was requested.
2015-08-22 20:42:45 +02:00
Lukas Reschke
c9e2a2f56e
Add CORS header to status.php so that we can migrate to a JS based check in the future
2015-08-22 14:44:02 +02:00
Lukas Reschke
0a1d551090
Use IClientService to check for remote ownCloud instances
...
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
2015-08-22 14:39:43 +02:00
Lennart Rosam
4b04412db3
Spaces -> tabs
2015-08-22 01:27:32 +02:00
Lennart Rosam
588fae54cb
Remove if-block as the helper does return the empty prefix
2015-08-21 22:50:28 +02:00
Lukas Reschke
6a3fb0d3b3
Handle failures gracefully, remove switch
2015-08-21 19:16:28 +02:00
tbartenstein
5e1c2aecc7
fix unit test for folder renaming (icon)
...
fix unit test to go with #17501 and check for the new icon
2015-08-21 18:54:09 +02:00
Joas Schilling
36eef2ddab
Add a session wrapper to encrypt the data before storing it on disk
2015-08-21 17:59:23 +02:00
Vincent Petry
d658d8dd4e
Always detect remote changes for fed sharing
...
This is even more important now that filesystem_check_changes is 0 by
default.
2015-08-21 15:32:53 +02:00
Robin McCorkell
510010e774
Merge pull request #18472 from owncloud/ext-array-filter
...
Replace array_filter() with foreach for PHP <5.6
2015-08-21 11:39:08 +01:00
Robin McCorkell
2992a1aa88
Merge pull request #18395 from owncloud/hide-empty-security-warning
...
[admin settings] Show success message if security warnings are empty
2015-08-21 11:38:40 +01:00
Robin McCorkell
843135e4ff
Replace array_filter() with foreach for PHP <5.6
...
ARRAY_FILTER_USE_KEY is PHP 5.6+
2015-08-21 10:13:15 +01:00
Morris Jobke
63a1f9afac
add success message
2015-08-21 11:09:01 +02:00
Thomas Müller
f5bbe727df
Merge pull request #18456 from owncloud/fix-unrelated-cron-errors
...
Clear cron errors on change of background job mode
2015-08-21 10:52:09 +02:00
Vincent Petry
a930fe5864
Merge pull request #18471 from hasso/shorts-fix
...
Make short versions of weekday/month names translatable
2015-08-21 10:48:10 +02:00
Morris Jobke
ac086a11c1
Merge pull request #18426 from owncloud/joblist-next-non-existing
...
handle non existing job classes in $jobList->getNext
2015-08-21 10:34:33 +02:00
Morris Jobke
c87042905c
Merge pull request #18468 from owncloud/sharing_availability_fix
...
Storage availability fixes for files_sharing and FailedStorage
2015-08-21 10:23:10 +02:00
