Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | Merge pull request #8791 from owncloud/share-overview-sharewithstatus | Morris Jobke | 2014-06-04 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | Update share action text to display owner/recipients | ||||
| * | | Added unit tests for share.js and share icon | Vincent Petry | 2014-06-02 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #8822 from owncloud/cache-change-propagator | Vincent Petry | 2014-06-04 | 4 | -21/+153 |
|\ \ \ | |_|/ |/| | | [WIP] Improved propagation of cache changes | ||||
| * | | Fix unit tests | Robin Appelman | 2014-06-04 | 2 | -12/+10 |
| | | | |||||
| * | | Fix unit tests | Robin Appelman | 2014-06-03 | 2 | -13/+19 |
| | | | |||||
| * | | propagate changes in the scanner | Robin Appelman | 2014-06-02 | 1 | -0/+56 |
| | | | |||||
| * | | Add a change propagator class to handle propagating etag and mtime changes | Robin Appelman | 2014-06-02 | 1 | -0/+72 |
| |/ | |||||
* | | Can't use assertInstanceOf on wrapped storage; use ↵ | ringmaster | 2014-06-04 | 2 | -6/+6 |
| | | | | | | | | assertTrue(instanceOfStorage() instead. | ||||
* | | fix unit test after adding the additional parameter to addStorageWrapper() | Bjoern Schiessle | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Fix unit tests | Robin Appelman | 2014-06-03 | 1 | -1/+1 |
| | | |||||
* | | skip tests for oracle | Robin Appelman | 2014-06-03 | 1 | -0/+3 |
| | | |||||
* | | Check sqlite migration on a copy of the database file | Robin Appelman | 2014-06-03 | 1 | -19/+47 |
| | | |||||
* | | Fix migrator for postgres | Robin Appelman | 2014-06-03 | 1 | -7/+3 |
| | | |||||
* | | skip migration tests for sqlite | Robin Appelman | 2014-06-03 | 1 | -3/+11 |
| | | |||||
* | | Create unique names for temporary indexes | Robin Appelman | 2014-06-03 | 1 | -5/+8 |
| | | |||||
* | | Add a mechanism to try the database migration on a copy of the tables before ↵ | Robin Appelman | 2014-06-03 | 1 | -0/+84 |
|/ | | | | running it on the "real" data | ||||
* | - fix dropTable() and introduce tableExists() | Thomas Müller | 2014-05-30 | 1 | -49/+5 |
| | | | | | | | - kill replaceDB() - this function is unused and it's implementation obviously wrong - add method annotation OC_DB_StatementWrapper::fetchAll - remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists - remove unused variables | ||||
* | Merge pull request #5365 from owncloud/filesize-improvements-32bit | Thomas Müller | 2014-05-30 | 2 | -0/+115 |
|\ | | | | | Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues | ||||
| * | Typo: getFileSizeViaDOM -> getFileSizeViaCOM | Andreas Fischer | 2014-05-29 | 1 | -1/+1 |
| | |