summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-09170-262/+34
* Merge pull request #12577 from owncloud/public-mount-apiLukas Reschke2014-12-087-25/+56
|\
| * Use the mount config api for files_externalRobin Appelman2014-12-044-18/+48
| * Add public api for mount configurationsRobin Appelman2014-12-043-7/+8
* | Merge pull request #12704 from owncloud/fix-12647-2Lukas Reschke2014-12-082-3/+9
|\ \
| * | add docArthur Schiwon2014-12-081-0/+1
| * | preserve an asterisk at the start when escaping a search termArthur Schiwon2014-12-082-3/+8
* | | Merge pull request #12696 from owncloud/trashbin-selected-deleteRobin Appelman2014-12-081-0/+4
|\ \ \ | |/ / |/| |
| * | Fix deleting selected files in the trashbinRobin Appelman2014-12-081-0/+4
* | | Merge pull request #12452 from owncloud/server2server-ng-ocsMorris Jobke2014-12-0811-50/+575
|\ \ \
| * | | OCS API for server-to-server sharingBjoern Schiessle2014-12-0411-50/+575
* | | | Merge pull request #12394 from owncloud/files-fileactionsimprovementsLukas Reschke2014-12-083-128/+314
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve FileActions JS to allow for custom renderingVincent Petry2014-11-243-128/+314
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0874-68/+6
* | | | Merge pull request #12668 from owncloud/keepspaceThomas Müller2014-12-071-1/+1
|\ \ \ \
| * | | | Keep spaces out of the stringVolkan Gezer2014-12-071-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0712-4/+12
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0614-0/+14
* | | | Merge pull request #12166 from helmutschneider/aws-2.7.5Lukas Reschke2014-12-0551-254/+710
|\ \ \ \
| * | | | Upgrade AWS sdk to 2.7.5Johan Björk2014-11-1351-254/+710
* | | | | Merge pull request #11485 from brumsoel/masterLukas Reschke2014-12-052-3/+3
|\ \ \ \ \
| * | | | | Modified filesort test cases to test for large sizes & timestampsbrumsel2014-12-031-2/+2
| * | | | | Merge remote-tracking branch 'upstream/master'brumsel2014-12-032335-31221/+61241
| |\ \ \ \ \
| * | | | | | Fix timestamp comparator return valuebrumsoel2014-10-081-1/+1
* | | | | | | Merge pull request #12523 from owncloud/port-11747Vincent Petry2014-12-051-3/+28
|\ \ \ \ \ \ \
| * | | | | | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-12-011-3/+28
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-0580-84/+30
* | | | | | | | cache total user countArthur Schiwon2014-12-041-0/+5
* | | | | | | | Forward port of #12493Arthur Schiwon2014-12-043-1/+152
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #12596 from owncloud/remove-travis-tracesMorris Jobke2014-12-041-40/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove last traces of travis integrationMorris Jobke2014-12-041-40/+0
* | | | | | | | update error messageBjoern Schiessle2014-12-041-1/+1
* | | | | | | | OC8 and later requires PHP >= 5.4, so we can remove the check from the encryp...Bjoern Schiessle2014-12-041-5/+1
|/ / / / / / /
* | | / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-044-2/+12
| |_|/ / / / |/| | | | |
* | | | | | fix typoBjoern Schiessle2014-12-031-1/+1
* | | | | | 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 #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 #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-032-2/+2
* | | | | | | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add js unit testRobin Appelman2014-11-261-7/+27