summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | 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
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-304-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-294-6/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-288-6/+20
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-276-0/+6
* | | | | Merge pull request #12448 from owncloud/no503forRootMorris Jobke2014-11-261-1/+1
|\ \ \ \ \
| * | | | | Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
| |/ / / /
* | | | | Merge pull request #6989 from AdamWill/google-1Robin Appelman2014-11-2657-6250/+11212
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | google: disable compression when curl is not availableAdam Williamson2014-11-071-0/+6
| * | | | update google-api-php-client to 1.0.6-betaAdam Williamson2014-11-0721-264/+1179
| * | | | scrutinizer fix: explicitly declare Google class property $clientAdam Williamson2014-11-061-0/+1
| * | | | scrutinizer fix: correct @return for getDriveFile()Adam Williamson2014-11-061-2/+3
| * | | | bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)Adam Williamson2014-11-064-11/+38
| * | | | google drive: set access type to 'offline' when requesting tokenAdam Williamson2014-11-061-0/+1
| * | | | fix a bug in google-api-php-client: generates an auth url that doesn't workAdam Williamson2014-11-061-1/+1
| * | | | files_external/3rdparty: update google-api-php-client to 1.0.2-betaAdam Williamson2014-11-0653-6160/+10171