Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix_for_2377 | Florin Peter | 2013-05-24 | 2 | -5/+43 |
|\ | |||||
| * | Merge pull request #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 1 | -5/+6 |
| |\ | | | | | | | New files encryption app | ||||
| | * | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-22 | 5 | -8/+371 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php | ||||
| | * \ | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 1 | -0/+11 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php | ||||
| | * \ \ | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 1 | -0/+19 |
| | |\ \ \ | |||||
| | * | | | | removed FileProxy from test | Florin Peter | 2013-05-15 | 1 | -5/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into move-storages | Michael Gapczynski | 2013-05-23 | 6 | -8/+382 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Conflicts: tests/lib/files/view.php | ||||
| * | | | | | Fix undefined variable for copying empty folders | Michael Gapczynski | 2013-05-19 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Add tests for copying/moving between storages | Michael Gapczynski | 2013-05-19 | 1 | -0/+34 |
| | |_|/ / | |/| | | | |||||
* | | | | | changed tests for using new normalizer | Florin Peter | 2013-05-24 | 2 | -3/+3 |
| | | | | | |||||
* | | | | | revert previous fix and added normalizer to cache class | Florin Peter | 2013-05-23 | 1 | -0/+67 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3266 from owncloud/hooks | Thomas Müller | 2013-05-21 | 2 | -0/+316 |
|\ \ \ \ | | | | | | | | | | | New hook system | ||||
| * | | | | Merge branch 'master' into hooks | Thomas Mueller | 2013-05-15 | 6 | -14/+92 |
| |\| | | | |||||
| * | | | | fix typo | Robin Appelman | 2013-05-09 | 1 | -9/+9 |
| | | | | | |||||
| * | | | | New hook system | Robin Appelman | 2013-05-07 | 2 | -0/+316 |
| | | | | | |||||
* | | | | | merge master into filecache_mtime | Robin Appelman | 2013-05-21 | 17 | -81/+296 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Add test for renaming non-existing category. | Thomas Tanghus | 2013-05-20 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add rename() method to OC_VCategories. | Thomas Tanghus | 2013-05-20 | 1 | -0/+10 |
| | |/ / | |/| | | |||||
| * | | | Add Compound property to avoid double escaping values. | Thomas Tanghus | 2013-05-15 | 1 | -0/+19 |
| | |/ | |/| | |||||
| * | | Use new autoloader class | Thomas Tanghus | 2013-05-11 | 2 | -4/+5 |
| | | | |||||
| * | | Autoloader: fix loading app clases located in lib/ | Robin Appelman | 2013-05-08 | 1 | -10/+17 |
| | | | |||||
| * | | Autoloader: test cases | Robin Appelman | 2013-05-07 | 1 | -5/+53 |
| | | | |||||
| * | | Merge pull request #3044 from owncloud/backgroundwatcher | icewind1991 | 2013-05-07 | 1 | -2/+4 |
| |\ \ | | | | | | | | | Add a background job to watch for external filesystem changes | ||||
| | * | | Cache: add a backgroundjob to check for external changes to the filesystem | Robin Appelman | 2013-04-20 | 1 | -2/+4 |
| | | | | |||||
| * | | | Merge pull request #3025 from owncloud/move-file | Michael Gapczynski | 2013-05-07 | 1 | -3/+4 |
| |\ \ \ | | |_|/ | |/| | | Cache: only look for child entires when doing a move operation when moving a folder | ||||
| | * | | Cache: only look for child entires when doing a move operation when moving a ↵ | Robin Appelman | 2013-04-19 | 1 | -3/+4 |
| | |/ | | | | | | | | | | folder | ||||
| * | | Further seperation of mount management logic | Robin Appelman | 2013-04-26 | 3 | -60/+69 |
| | | | |||||
| * | | Have the filecache updater testcase clean the filesystem properly | Robin Appelman | 2013-04-25 | 1 | -6/+3 |
| |/ | |||||
| * | Fix touch for creating new files | Robin Appelman | 2013-04-10 | 1 | -0/+6 |
| | | |||||
| * | used oc version 5.0.3 | Bernhard Posselt | 2013-04-09 | 1 | -1/+1 |
| | | |||||
| * | added yet another test for the verion compare check due to mail | Bernhard Posselt | 2013-04-09 | 1 | -0/+8 |
| | | |||||
| * | StringProperty unittest | Thomas Tanghus | 2013-04-08 | 1 | -0/+19 |
| | | |||||
| * | Ensure instanceid contains a letter | Miquel Rodríguez Telep / Michael Rodríguez-Torrent | 2013-03-26 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | instanceid is generated by uniqid() and then used as the session_name. Because session_name requires at least one letter and uniqid() does not guarantee to provide that, in the case that uniqid() generates a string of only digits, the user will be stuck in an infinite login loop because every request will generate a new PHP session. | ||||
| * | Merge pull request #2568 from itheiss/master | Bernhard Posselt | 2013-03-26 | 1 | -1/+8 |
| |\ | | | | | | | Implement setting custom domainname for getDefaultEmailAddress | ||||
| | * | Move testcase to own test function | itheiss | 2013-03-26 | 1 | -1/+3 |
| | | | | | | | | | Move testcase for getDefaultEmailAddress with mail_domain set in config.php to own test function. | ||||
| | * | Extend test case for getDefaultEmailAddress() | itheiss | 2013-03-22 | 1 | -1/+6 |
| | | | | | | | | | see #2499 | ||||
| * | | Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master | Bernhard Posselt | 2013-03-23 | 1 | -0/+52 |
| |\ \ | | |/ | |/| | Fixing file mapper ext master | ||||
| | * | Fixing author and copyright | Thomas Müller | 2013-03-20 | 1 | -2/+2 |
| | | | |||||
| | * | some more test cases & fix on file name generation with index | Thomas Mueller | 2013-03-19 | 1 | -0/+11 |
| | | | |||||
| | * | adding extension to slugified physical path | Thomas Mueller | 2013-03-19 | 1 | -0/+41 |
| | | | |||||
| * | | some basic unit test for loading classes | Thomas Mueller | 2013-03-19 | 1 | -0/+19 |
| |/ | |||||
| * | Merge pull request #2204 from owncloud/chache_updater_rename | Frank Karlitschek | 2013-03-17 | 1 | -2/+3 |
| |\ | | | | | | | Cache: better rename hook for cache updater | ||||
| | * | Cache: better rename hook for cache updater | Robin Appelman | 2013-03-08 | 1 | -2/+3 |
| | | | |||||
| * | | fixing various filesystem/storage unit tests on windows | Thomas Mueller | 2013-03-12 | 1 | -2/+1 |
| | | | | | | | | | | | | fixing copy operation on mapper | ||||
| * | | skip archive tests for now | Thomas Mueller | 2013-03-12 | 2 | -0/+4 |
| |/ | |||||
* | | Merge branch 'master' into filecache_mtime | Michael Gapczynski | 2013-03-08 | 8 | -8/+185 |
|\| | | | | | | | | | | | | | Conflicts: lib/files/view.php lib/util.php tests/lib/files/cache/cache.php | ||||
| * | Change findById to findByStorageId in mount test | Michael Gapczynski | 2013-03-07 | 1 | -1/+1 |
| | | |||||
| * | Fix fetching source path of shared files | Michael Gapczynski | 2013-03-07 | 1 | -4/+4 |
| | | |||||
| * | adding test case for getDefaultEmailAddress() + fixing #1844 again | Thomas Mueller | 2013-03-04 | 1 | -0/+5 |
| | | |||||
| * | Check resharing setting | Michael Gapczynski | 2013-02-26 | 1 | -1/+4 |
| | |