aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #12542 from owncloud/update-autotestcmdJoas Schilling2014-12-031-17/+38
|\ \ \ \ \
| * | | | | Restore the development config after running the testsJoas Schilling2014-12-021-3/+17
| * | | | | Allow overwriting DATADIR completly so ramdisk can be usedJoas Schilling2014-12-021-5/+5
| * | | | | Allow passing a test file just like in autotest.shJoas Schilling2014-12-021-7/+7
| * | | | | Better manage the output when running autotest.cmdJoas Schilling2014-12-021-5/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #12492 from owncloud/deprecate-passwordsaltLukas Reschke2014-12-031-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Officially deprecated passwordsaltLukas Reschke2014-12-031-0/+3
* | | | | Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-0325-1674/+1172
|\ \ \ \ \
| * | | | | small fixesBjoern Schiessle2014-12-021-2/+2
| * | | | | delete old keys if file was moved to a different mount pointBjoern Schiessle2014-12-021-4/+10
| * | | | | upgrade to new folder structureBjoern Schiessle2014-12-0218-341/+483
| * | | | | change private/public key names for consistency reasonsBjoern Schiessle2014-11-2611-226/+202
| * | | | | harmonize copyright noticeBjoern Schiessle2014-11-267-18/+28
| * | | | | new folder structure for keysBjoern Schiessle2014-11-2615-1162/+526
* | | | | | Merge pull request #12552 from szlwzl/masterThomas Müller2014-12-031-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | adding @ sign between email address and domain name to make the syntax clearerSimon Whittaker2014-12-021-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logfloodLukas Reschke2014-12-031-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Stop flooding the log, when previews are disabledJoas Schilling2014-12-031-1/+1
* | | | | Merge pull request #12553 from owncloud/default-iosidThomas Müller2014-12-031-0/+8
|\ \ \ \ \
| * | | | | add missing public interface for iOS client app idMorris Jobke2014-12-021-0/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #12556 from owncloud/add-route-for-versionsThomas Müller2014-12-032-1/+3
|\ \ \ \ \
| * | | | | Add route for download of versionsLukas Reschke2014-12-022-1/+3
* | | | | | Merge pull request #12563 from owncloud/usermenu-remove-borderVolkan Gezer2014-12-031-2/+2
|\ \ \ \ \ \
| * | | | | | remove border from user menu, adjust to apps menuJan-Christoph Borchardt2014-11-281-2/+2
* | | | | | | Merge pull request #12565 from owncloud/config-sample-databasesVincent Petry2014-12-031-7/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | add proper description what database is supported by CE and EEMorris Jobke2014-12-031-7/+13
* | | | | | | Merge pull request #12554 from owncloud/versions-app-autoloadLukas Reschke2014-12-035-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Autoload exception from files_trashbinJoas Schilling2014-12-022-2/+0
| * | | | | | Autoload lib files of versions appJoas Schilling2014-12-023-6/+0
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0324-88/+128
* | | | | | Merge pull request #10881 from owncloud/touch-statcacheRobin Appelman2014-12-022-0/+2
|\ \ \ \ \ \
| * | | | | | also clear statcache in mapped localRobin Appelman2014-12-021-0/+1
| * | | | | | Clear statcache before getting the mtime from local storage backendsRobin Appelman2014-12-021-0/+1
| |/ / / / /
* | | | | | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \ \ \ \ \
| * | | | | | Add js unit testRobin Appelman2014-11-261-7/+27
| * | | | | | Dont show the delete button for selected files if one of the selected files i...Robin Appelman2014-11-261-2/+12
| * | | | | | Check if files are deletable before trying to delete themRobin Appelman2014-11-261-1/+3
* | | | | | | Merge pull request #11975 from owncloud/Combustible-combustible_devMorris Jobke2014-12-021-254/+267
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use \OCP\ILoggerThomas Müller2014-12-011-257/+264
| * | | | | | Added error check to lib/private/image.phpByron Marohn2014-12-011-0/+6
* | | | | | | Merge pull request #12310 from kampka/masterThomas Müller2014-12-022-2/+52
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Implement a logger to log to error_logChristian Kampka2014-12-012-2/+52
* | | | | | | Merge pull request #12419 from owncloud/read-only-configThomas Müller2014-12-015-6/+38
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow read-only configurationLukas Reschke2014-11-255-6/+38
* | | | | | | Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mappedVincent Petry2014-12-011-2/+21
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Also clearstatcache() in MappedLocal before using the statsJoas Schilling2014-11-271-0/+1
| * | | | | | Check whether file exists before trying to touch() itJoas Schilling2014-11-271-0/+3
| * | | | | | Check return of disk_free_space before returning itJoas Schilling2014-11-271-1/+5
| * | | | | | Check file existance in MappedLocal in hasUpdated()Joas Schilling2014-11-271-1/+5
| * | | | | | Make MappedLocal::isLocal() true like for LocalJoas Schilling2014-11-271-0/+7