Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9123 from owncloud/webdav-move-permissions | icewind1991 | 2014-06-25 | 1 | -0/+4 |
|\ | | | | | Fix permissions check when moving a file to a different directory over webdav | ||||
| * | Fix unit tests | Robin Appelman | 2014-06-20 | 1 | -0/+4 |
| | | |||||
* | | Added unit test for the helper's rmdirr | Vincent Petry | 2014-06-23 | 1 | -0/+24 |
|/ | |||||
* | Merge pull request #9071 from owncloud/extstorage-list-unittests | Morris Jobke | 2014-06-19 | 1 | -0/+10 |
|\ | | | | | Added JS unit tests for ext storage | ||||
| * | Added JS unit tests for ext storage | Vincent Petry | 2014-06-17 | 1 | -0/+10 |
| | | | | | | | | Added JS unit tests for the external storage file list extension. | ||||
* | | Merge pull request #9068 from owncloud/trashbin_unittests_master | Björn Schießle | 2014-06-18 | 1 | -0/+1 |
|\ \ | | | | | | | fix trash bin expire operation and add unit tests | ||||
| * | | fix trash bin expire operation and add unit tests | Bjoern Schiessle | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #8399 from owncloud/server-server-sharing | icewind1991 | 2014-06-17 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Add server<->server sharing | ||||
| * | | | Fix moving movablemount over webdav | Robin Appelman | 2014-06-17 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #9065 from owncloud/migrator-keepprimaryindexname | Vincent Petry | 2014-06-17 | 1 | -0/+21 |
|\ \ \ \ | | | | | | | | | | | Do not rename primary key index when renaming table | ||||
| * | | | | Added unit test for checkMigrate with primary key + autoinc | Vincent Petry | 2014-06-17 | 1 | -0/+21 |
| | |/ / | |/| | | | | | | | | | | | | | | Added unit test to make sure that checkMigrate() works when adding a primary key and autoincrement column to a table schema. | ||||
* | | | | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore | Georg Ehrke | 2014-06-16 | 4 | -1/+78 |
|\ \ \ \ | |/ / / |/| | | | Make shipped apps updatable via appstore | ||||
| * | | | Update preseed-config.php | Georg Ehrke | 2014-06-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into update_shipped_apps_from_appstore | Georg Ehrke | 2014-06-05 | 19 | -192/+429 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/app.php settings/templates/apps.php | ||||
| * | | | | fix unit tests | Thomas Müller | 2014-06-05 | 1 | -9/+15 |
| | | | | | |||||
| * | | | | remove not needed unlink in installer test | Georg Ehrke | 2014-06-04 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | add unit test | Georg Ehrke | 2014-06-04 | 3 | -0/+74 |
| | | | | | |||||
* | | | | | Merge pull request #8917 from owncloud/repair-routine-base | Vincent Petry | 2014-06-16 | 1 | -0/+159 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add support for repair step classes | ||||
| * | | | | Added RepairStep interface and default repair step lists | Vincent Petry | 2014-06-12 | 1 | -0/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updater is using "before update" repair steps and "regular" repair steps. The "regular" repair steps are also used by the CLI tool. Currently no steps exist but can be added later in the static methods in the \OC\Repair class. Added unit test to test messaging, error and exception cases. | ||||
* | | | | | Merge pull request #8968 from owncloud/scanner-parent-repair | Vincent Petry | 2014-06-12 | 1 | -2/+49 |
|\ \ \ \ \ | |/ / / / |/| | | | | Repair broken parent link in the scanner | ||||
| * | | | | Repair broken parent link in the scanner | Robin Appelman | 2014-06-10 | 1 | -2/+49 |
| | | | | | |||||
* | | | | | Merge pull request #9004 from owncloud/cleanup-storages | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Added check and cleanup for storage/filecache | ||||
| * | | | | Added check and cleanup for storage/filecache | Vincent Petry | 2014-06-12 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests don't clean up the file cache and sometimes entries are reused by mistake in subsequent test suites. This cleans up the file cache and storage after every test suite and also shows an annoying warning. | ||||
* | | | | | Merge pull request #8980 from owncloud/better-accept-header | Vincent Petry | 2014-06-12 | 1 | -0/+32 |
|\ \ \ \ \ | |/ / / / |/| | | | | handle http accept headers more gracefully | ||||
| * | | | | also handle lowercase headers | Bernhard Posselt | 2014-06-11 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | handle http accept headers more gracefully | Bernhard Posselt | 2014-06-11 | 1 | -0/+23 |
| |/ / / | |||||
* / / / | Use assertNotSame when checking etags | Vincent Petry | 2014-06-11 | 1 | -3/+3 |
|/ / / | | | | | | | | | | | | | Sometimes etags contain a "e" character which makes PHP believe it's a number and make the tests fail | ||||
* | | | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix | Morris Jobke | 2014-06-08 | 1 | -4/+9 |
|\ \ \ | | | | | | | | | Added hacky fix for long path cleanup routine | ||||
| * | | | Added hacky fix for long path cleanup routine | Vincent Petry | 2014-06-06 | 1 | -4/+9 |
| | | | | |||||
* | | | | Merge pull request #8927 from owncloud/expire_only_link_shares | Björn Schießle | 2014-06-06 | 1 | -59/+18 |
|\ \ \ \ | | | | | | | | | | | only expire link shares | ||||
| * | | | | only expire link shares | Bjoern Schiessle | 2014-06-06 | 1 | -59/+18 |
| | | | | | |||||
* | | | | | adding PK to table encryption | Thomas Müller | 2014-06-06 | 3 | -0/+93 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding auto increment/PK to table files_trash adding PK to table ldap_user_mapping and ldap_group_members adding PK to table ldap_group_mapping truncate permissions table to allow smooth creation of primary key adding unit test for creating an auto increment column on a table which already contains data remove unneeded table files_trashsizes fix unit test no need to truncate *PREFIX*permissions On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually | ||||
* | | | | Merge pull request #8783 from owncloud/remove-serializers | Thomas Müller | 2014-06-06 | 1 | -21/+1 |
|\ \ \ \ | |/ / / |/| | | | Remove controller serializers | ||||
| * | | | remove controller serializers | Bernhard Posselt | 2014-06-05 | 1 | -21/+1 |
| | | | | |||||
* | | | | use system function to recursive remove the directory used by temporary storage | Thomas Müller | 2014-06-06 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #8483 from owncloud/encryption_use_oc_preferences | Thomas Müller | 2014-06-05 | 1 | -13/+41 |
|\ \ \ \ | |/ / / |/| | | | [encryption] use oc preferences | ||||
| * | | | allow to set pre-condition for setValue | Bjoern Schiessle | 2014-06-05 | 1 | -13/+41 |
| | | | | |||||
* | | | | Merge pull request #8865 from owncloud/improve_share_settings | Vincent Petry | 2014-06-05 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | Improve share settings | ||||
| * | | | unify share settings | Bjoern Schiessle | 2014-06-05 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #8893 from owncloud/feature/get-users-by-preference | Thomas Müller | 2014-06-05 | 1 | -0/+18 |
|\ \ \ | |/ / |/| | | Add method to get users by their preference | ||||
| * | | Sort the result before comparing | Joas Schilling | 2014-06-05 | 1 | -1/+3 |
| | | | |||||
| * | | Add method to get users by their preference | Joas Schilling | 2014-06-05 | 1 | -0/+16 |
| | | | |||||
* | | | Merge pull request #8889 from owncloud/mtime-reuse | Thomas Müller | 2014-06-05 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Don't update the mtime if the storage mtime hasn't changed | ||||
| * | | | Fix uit tests | Robin Appelman | 2014-06-05 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #7878 from owncloud/quota-extstorageswitch | icewind1991 | 2014-06-05 | 1 | -21/+124 |
|\ \ \ \ | |_|/ / |/| | | | Added switch to count external storage data in quota | ||||
| * | | | Added experimental switch to count external storage data in quota | Vincent Petry | 2014-06-04 | 1 | -21/+124 |
| |/ / | | | | | | | | | | | | | | | | | | | This includes all mountpoints except the Shared one in the used space calculation. Added unit tests for ext storage inclusion in quota calculation | ||||
* | | | Merge pull request #8852 from owncloud/kill-permissions-master | Thomas Müller | 2014-06-05 | 6 | -120/+0 |
|\ \ \ | | | | | | | | | Kill permissions table | ||||
| * | | | - drop permissions table and related code | Thomas Müller | 2014-06-05 | 6 | -120/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | - the file/folder's permission is now stored in the file cache - BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs - increase version to trigger database migration | ||||
* | | | | Merge pull request #8724 from owncloud/update-sabre-2.0 | Thomas Müller | 2014-06-04 | 5 | -22/+21 |
|\ \ \ \ | | | | | | | | | | | Update SabreDAV to 1.8.10 | ||||
| * | | | | Upgrade SabreDAV to 1.8.10 | Thomas Müller | 2014-06-04 | 5 | -22/+21 |
| |/ / / | | | | | | | | | | | | | Updating SabreDAV namespaces |