Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #12542 from owncloud/update-autotestcmd | Joas Schilling | 2014-12-03 | 1 | -17/+38 | |
|\ \ \ \ \ | ||||||
| * | | | | | Restore the development config after running the tests | Joas Schilling | 2014-12-02 | 1 | -3/+17 | |
| * | | | | | Allow overwriting DATADIR completly so ramdisk can be used | Joas Schilling | 2014-12-02 | 1 | -5/+5 | |
| * | | | | | Allow passing a test file just like in autotest.sh | Joas Schilling | 2014-12-02 | 1 | -7/+7 | |
| * | | | | | Better manage the output when running autotest.cmd | Joas Schilling | 2014-12-02 | 1 | -5/+12 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #12492 from owncloud/deprecate-passwordsalt | Lukas Reschke | 2014-12-03 | 1 | -0/+3 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Officially deprecated passwordsalt | Lukas Reschke | 2014-12-03 | 1 | -0/+3 | |
* | | | | | Merge pull request #12382 from owncloud/enc_reorganize_folders2 | Morris Jobke | 2014-12-03 | 25 | -1674/+1172 | |
|\ \ \ \ \ | ||||||
| * | | | | | small fixes | Bjoern Schiessle | 2014-12-02 | 1 | -2/+2 | |
| * | | | | | delete old keys if file was moved to a different mount point | Bjoern Schiessle | 2014-12-02 | 1 | -4/+10 | |
| * | | | | | upgrade to new folder structure | Bjoern Schiessle | 2014-12-02 | 18 | -341/+483 | |
| * | | | | | change private/public key names for consistency reasons | Bjoern Schiessle | 2014-11-26 | 11 | -226/+202 | |
| * | | | | | harmonize copyright notice | Bjoern Schiessle | 2014-11-26 | 7 | -18/+28 | |
| * | | | | | new folder structure for keys | Bjoern Schiessle | 2014-11-26 | 15 | -1162/+526 | |
* | | | | | | Merge pull request #12552 from szlwzl/master | Thomas Müller | 2014-12-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | adding @ sign between email address and domain name to make the syntax clearer | Simon Whittaker | 2014-12-02 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood | Lukas Reschke | 2014-12-03 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Stop flooding the log, when previews are disabled | Joas Schilling | 2014-12-03 | 1 | -1/+1 | |
* | | | | | Merge pull request #12553 from owncloud/default-iosid | Thomas Müller | 2014-12-03 | 1 | -0/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | add missing public interface for iOS client app id | Morris Jobke | 2014-12-02 | 1 | -0/+8 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #12556 from owncloud/add-route-for-versions | Thomas Müller | 2014-12-03 | 2 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add route for download of versions | Lukas Reschke | 2014-12-02 | 2 | -1/+3 | |
* | | | | | | Merge pull request #12563 from owncloud/usermenu-remove-border | Volkan Gezer | 2014-12-03 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove border from user menu, adjust to apps menu | Jan-Christoph Borchardt | 2014-11-28 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #12565 from owncloud/config-sample-databases | Vincent Petry | 2014-12-03 | 1 | -7/+13 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | add proper description what database is supported by CE and EE | Morris Jobke | 2014-12-03 | 1 | -7/+13 | |
* | | | | | | | Merge pull request #12554 from owncloud/versions-app-autoload | Lukas Reschke | 2014-12-03 | 5 | -8/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Autoload exception from files_trashbin | Joas Schilling | 2014-12-02 | 2 | -2/+0 | |
| * | | | | | | Autoload lib files of versions app | Joas Schilling | 2014-12-02 | 3 | -6/+0 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-03 | 24 | -88/+128 | |
* | | | | | | Merge pull request #10881 from owncloud/touch-statcache | Robin Appelman | 2014-12-02 | 2 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | also clear statcache in mapped local | Robin Appelman | 2014-12-02 | 1 | -0/+1 | |
| * | | | | | | Clear statcache before getting the mtime from local storage backends | Robin Appelman | 2014-12-02 | 1 | -0/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #12333 from owncloud/delete-selected-files | Morris Jobke | 2014-12-02 | 3 | -10/+42 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add js unit test | Robin Appelman | 2014-11-26 | 1 | -7/+27 | |
| * | | | | | | Dont show the delete button for selected files if one of the selected files i... | Robin Appelman | 2014-11-26 | 1 | -2/+12 | |
| * | | | | | | Check if files are deletable before trying to delete them | Robin Appelman | 2014-11-26 | 1 | -1/+3 | |
* | | | | | | | Merge pull request #11975 from owncloud/Combustible-combustible_dev | Morris Jobke | 2014-12-02 | 1 | -254/+267 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Use \OCP\ILogger | Thomas Müller | 2014-12-01 | 1 | -257/+264 | |
| * | | | | | | Added error check to lib/private/image.php | Byron Marohn | 2014-12-01 | 1 | -0/+6 | |
* | | | | | | | Merge pull request #12310 from kampka/master | Thomas Müller | 2014-12-02 | 2 | -2/+52 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Implement a logger to log to error_log | Christian Kampka | 2014-12-01 | 2 | -2/+52 | |
* | | | | | | | Merge pull request #12419 from owncloud/read-only-config | Thomas Müller | 2014-12-01 | 5 | -6/+38 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Allow read-only configuration | Lukas Reschke | 2014-11-25 | 5 | -6/+38 | |
* | | | | | | | Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped | Vincent Petry | 2014-12-01 | 1 | -2/+21 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Also clearstatcache() in MappedLocal before using the stats | Joas Schilling | 2014-11-27 | 1 | -0/+1 | |
| * | | | | | | Check whether file exists before trying to touch() it | Joas Schilling | 2014-11-27 | 1 | -0/+3 | |
| * | | | | | | Check return of disk_free_space before returning it | Joas Schilling | 2014-11-27 | 1 | -1/+5 | |
| * | | | | | | Check file existance in MappedLocal in hasUpdated() | Joas Schilling | 2014-11-27 | 1 | -1/+5 | |
| * | | | | | | Make MappedLocal::isLocal() true like for Local | Joas Schilling | 2014-11-27 | 1 | -0/+7 |