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

26494 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Robin McCorkell
643e3a5b6d Convert string booleans to real booleans 
Legacy compatibility, from the days in stable8 when checkbox boolean
values were stored as the strings 'true' and 'false'.
 2015-08-20 12:23:12 +01: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
62d328525a setUserVars() should only attempt substitution with strings 2015-08-20 02:19:03 +01: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
Robin McCorkell
dc335ba5a9 Trigger storage recheck on auth mechanism change 2015-08-19 20:11:29 +01:00
Morris Jobke
08161027c4 Merge pull request #18403 from owncloud/do-not-delete-group-if-empty 
Do not delete group if empty, hide delete icon for group admin
 2015-08-19 21:07:04 +02:00
michag86
3a6d273265 do not remove empty group in gui by js 2015-08-19 20:05:52 +02:00
Morris Jobke
b3356b1288 Merge pull request #18432 from owncloud/ext-backends.simple 
Migrate simple external storage backends to new registration API [part 1]
 2015-08-19 20:04:20 +02:00
Robin Appelman
9dda39bf48 Merge pull request #18433 from owncloud/get-mountpoints-return 
add missing return statements in getSystem/getPersonalMountPoints
 2015-08-19 19:31:36 +02:00
Thomas Müller
313cb092f9 Merge pull request #18427 from owncloud/fix-format-ocs 
Fix format of log/private/ocs.php
 2015-08-19 19:09:32 +02:00
Vincent Petry
b919ae96f0 Display app names in update page for app updates 
Whenever the update page is displayed for apps, show app names instead
of the core update text.
 2015-08-19 18:03:35 +02:00
Lennart Rosam
fdf1a941b7 Add database update routine and bump version to 0.6.2 2015-08-19 17:55:21 +02:00
Lennart Rosam
45fba849a9 Remove another occurance of ldap_nocase 2015-08-19 17:54:16 +02:00
Morris Jobke
6900dbdaff Merge pull request #18430 from owncloud/add-warning-ca-bundle 
Add warning for not existing CA bundle when updating
 2015-08-19 17:51:26 +02:00
Joas Schilling
4314c8fc6f Use an IEvent object instead of a huge parameter list 2015-08-19 17:44:57 +02:00
Joas Schilling
e985dcc5a0 Send the file id when dealing with remote share responses 2015-08-19 17:44:57 +02:00
Joas Schilling
bc2aa14849 Extend the interfaces IManager and IConsumer to allow passing in the object 2015-08-19 17:44:57 +02:00
Robin McCorkell
d577aad4ac Use OCP classes as much as possible in files_external 2015-08-19 15:26:38 +01:00
Robin Appelman
273c776eb7 add missing return statements in getSystem/getPersonalMountPoints 2015-08-19 16:26:33 +02:00
Morris Jobke
4c93a07196 Merge pull request #18424 from owncloud/filter-objectstore-password-from-config-list 
Filter the objectstore password from the config list as well
 2015-08-19 16:24:01 +02:00
Morris Jobke
8f00f103c6 Merge pull request #18114 from owncloud/fix-delete-user-feedback 
[user mgnt] fix delete user feedback on failure
 2015-08-19 16:10:55 +02:00
Robin McCorkell
16389270ff Migrate SFTP external storage to new API 2015-08-19 14:41:44 +01:00
Robin McCorkell
a99e524898 Migrate OwnCloud external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell
68418bdd34 Migrate DAV external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell
ab8c738b8d Migrate SMB external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell
0f1809eced Migrate FTP external storage to new API 2015-08-19 14:41:43 +01:00