wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26399 commits 157 branches 562 tags 714 MiB
Commit graph

26399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
bd13126a80 Fix master again 
Caused due to merge of two PRs
 2015-08-24 12:19:03 +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
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
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
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
Hasso Tepper
acc5a7d6cc Make short versions of weekday/month names translatable 2015-08-21 10:17:36 +03:00
Robin McCorkell
5ded5c6fc1 Add availability methods to files_external FailedStorage 2015-08-20 22:47:57 +01:00
Robin McCorkell
99b54e102d Prevent shares being added to oc_storages via availability 2015-08-20 22:43:46 +01:00
Robin McCorkell
5f5c3520c9 Merge pull request #18457 from owncloud/test-traits 
Move common test logic to re-usable traits
 2015-08-20 22:28:54 +01:00
Thomas Müller
0451cc0060 Merge pull request #18459 from owncloud/files-detailtabview-namespace 
Add namespace in case the file is loaded individually
 2015-08-20 18:16:11 +02:00
Vincent Petry
7c64ae4663 Add namespace in case the file is loaded individually 
Some apps might load this file in JS unit tests and need the OCA.Files
namespace to exist.
 2015-08-20 17:54:52 +02:00
Robin Appelman
24a2fff946 add test mountprovider logic to a trait 2015-08-20 16:39:32 +02:00
Joas Schilling
9573d7d60d Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities 
Issue 18358 object type and id for activities
 2015-08-20 15:53:36 +02:00
Joas Schilling
c58316b1ae Expand the doc blocks on the new methods 2015-08-20 15:35:24 +02:00
Robin Appelman
3dbfbdaf54 allow moving common test logic into traits 2015-08-20 15:17:14 +02:00
Robin McCorkell
337898343c Merge pull request #18453 from owncloud/update-wording 
fix wording of update header
 2015-08-20 14:16:26 +01:00
Morris Jobke
e8c3eb7473 Clear cron errors on change of background job mode 
* fixes #18454
 2015-08-20 14:51:28 +02:00
Robin McCorkell
d93bf35482 Merge pull request #18408 from owncloud/ext-ocp 
Use OCP classes as much as possible in files_external v2
 2015-08-20 13:09:12 +01:00
Robin McCorkell
67893ca839 Merge pull request #18380 from owncloud/files-sidebar-selectbar 
Fix files select bar width when app sidebar is visible
 2015-08-20 12:35:33 +01:00
Morris Jobke
d725de505e Merge pull request #18439 from owncloud/fix-appmanagement-install 
[app management] fix dependency check on install
 2015-08-20 13:26:55 +02:00
Joas Schilling
6697844c01 Remove unnecessary code 2015-08-20 13:10:11 +02:00
Jan-Christoph Borchardt
f21cf516da fix wording of update header 2015-08-20 12:59:13 +02:00
Morris Jobke
c7b0d50cb2 Merge pull request #18369 from owncloud/occ-log 
occ commands to manage logging
 2015-08-20 12:57:05 +02:00
Vincent Petry
28e58594ba Merge pull request #18437 from owncloud/ext-auth-trigger 
Trigger storage recheck on auth mechanism change
 2015-08-20 11:58:18 +02:00
Morris Jobke
06d8edd963 Merge pull request #17434 from owncloud/update-showappnameonappupdate 
Display app names in update page for app updates
 2015-08-20 11:50:01 +02:00
Morris Jobke
2fe070ca37 Merge pull request #18447 from owncloud/ext-fix-empty-var 
Don't use `empty()` with a return value, PHP 5.4
 2015-08-20 11:36:12 +02:00
Vincent Petry
a2674b2b30 Additions to update page 
Apps to update and to disable will always be shown.
Main title changes only when apps need updated, not core.
Added bullet style.
Exclude incompatible apps from updated apps list.
 2015-08-20 11:14:30 +02:00
Joas Schilling
389a32e92a Add test coverage for Activity Event and Manager 2015-08-20 10:25:49 +02:00
Vincent Petry
3e7e7511ca Merge pull request #18438 from owncloud/ext-session-fix 
Fix 'Declaration of SessionStorageWrapper::__construct()...'
 2015-08-20 10:23:16 +02:00
Robin McCorkell
6907a88d14 Don't use empty() with a return value, PHP 5.4 2015-08-20 01:03:45 +01:00
Morris Jobke
29decf698c [app management] fix dependency check on install 2015-08-19 21:32:56 +02:00
Robin McCorkell
8cd47e4f03 Fix 'Declaration of SessionStorageWrapper::__construct()...' 2015-08-19 20:14:56 +01:00