Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Use "file size" instead of "filesize", then also apply camel case. | Andreas Fischer | 2014-05-29 | 1 | -16/+16 |
| | | |||||
| * | Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable. | Andreas Fischer | 2014-05-29 | 1 | -0/+7 |
| | | |||||
| * | Add helper method for turning int|float into base-10 unsigned integer string. | Andreas Fischer | 2014-05-29 | 1 | -0/+46 |
| | | |||||
| * | Rename: LargeFileHelper -> LargeFileHelperGetFilesize | Andreas Fischer | 2014-05-29 | 1 | -1/+1 |
| | | |||||
| * | Unit Tests for LargeFileHelper. | Andreas Fischer | 2014-05-29 | 1 | -0/+62 |
| | | |||||
* | | Merge pull request #8778 from owncloud/storage-instanceof | icewind1991 | 2014-05-30 | 3 | -0/+17 |
|\ \ | | | | | | | Add storage->instanceOfStorage() to handle instanceof with storage wrappers | ||||
| * | | Add $storage->instanceOfStorage to handle instanceof for storage wrappers | Robin Appelman | 2014-05-29 | 3 | -0/+17 |
| |/ | |||||
* | | Sharing overview fixes and unit tests | Vincent Petry | 2014-05-30 | 1 | -8/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Fixed renaming and fileActionsReady event - Added unit tests for shares list - Fixed public page with defer - Fixed file actions in sharing overview - Fixed sharing counterpart list (10 entries max) - Fixed file path attribute to be used in download action - Fix sharing list headers - OC.Share icons now operate on fileList instance - Fix OC.Share.updateIcon when more than one list in DOM | ||||
* | | Merge pull request #8759 from owncloud/fix-phpunit | Lukas Reschke | 2014-05-29 | 3 | -115/+98 |
|\ \ | |/ |/| | fix 8757, get rid of service locator antipattern | ||||
| * | fix assertions | Bernhard Posselt | 2014-05-28 | 1 | -9/+14 |
| | | |||||
| * | fix 8757, get rid of service locator antipattern | Bernhard Posselt | 2014-05-28 | 3 | -106/+84 |
| | | |||||
* | | Merge pull request #3908 from owncloud/storage-folder-copy-rename | icewind1991 | 2014-05-29 | 2 | -1/+120 |
|\ \ | | | | | | | Recursive copy and remove for local storage backends | ||||
| * | | fix illegal usage of unlink in test case | Robin Appelman | 2014-05-28 | 1 | -1/+1 |
| | | |