summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-1910-18/+56
* Merge pull request #11141 from owncloud/update_encrytionlinkMorris Jobke2014-09-182-3/+3
|\
| * update encryption doc linkVolkan Gezer2014-09-182-3/+3
* | Merge pull request #9541 from owncloud/force_loading_of_encryption_appMorris Jobke2014-09-181-0/+3
|\ \
| * | force loading of encryption appLukas Reschke2014-09-171-0/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-185-6/+23
| |/ |/|
* | Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfixLukas Reschke2014-09-172-0/+14
|\ \ | |/ |/|
| * Tentative fix for legacy file actions unit test side effectVincent Petry2014-09-162-0/+14
* | Also check if the file itself is updatableRobin Appelman2014-09-172-2/+2
* | Check if a folder is deletable before we try to recursively delete itRobin Appelman2014-09-173-2/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-178-2/+16
* | Merge pull request #10745 from owncloud/fix-10708-doctrineLukas Reschke2014-09-162-9/+35
|\ \
| * | adding unit test to truncate the tableThomas Müller2014-09-162-1/+32
| * | Use Doctrine Platform to generate SQL query for table truncation.Andreas Fischer2014-08-291-8/+3
* | | Merge pull request #10902 from owncloud/fix-ellepsisLukas Reschke2014-09-161-0/+2
|\ \ \
| * | | Adding link to ellipsis and fixing stylingClark Tomlinson2014-09-161-0/+2
* | | | Merge pull request #11009 from owncloud/tobiasKaminsky-routeLukas Reschke2014-09-163-2/+93
|\ \ \ \
| * | | | Route for thumbnail generationtobiasKaminsky2014-09-163-2/+93
| | |_|/ | |/| |
* | | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-162-2/+2
|\ \ \ \
| * | | | Fixed file list sortingVincent Petry2014-08-112-2/+2
* | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15Lukas Reschke2014-09-16264-9790/+5917
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix failing AmazonS3::touch on updated aws sdkJohan Björk2014-09-031-1/+2
| * | | | Update AWS sdk to 2.6.15Johan Björk2014-09-03263-9789/+5915
* | | | | Merge pull request #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ \ \ \ \
| * | | | | also expire file if timestamp = limit, happens if trashbin_retention_obligati...Bjoern Schiessle2014-09-151-1/+1
* | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-165-5/+68
|\ \ \ \ \ \
| * | | | | | Show original path information in trashbin and sharing viewsRobin McCorkell2014-09-115-5/+68
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-166-0/+15
* | | | | | | Merge pull request #11060 from owncloud/rmobslangLukas Reschke2014-09-156-39/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | remove obsolete language filesVolkan Gezer2014-09-136-39/+0
* | | | | | | Merge pull request #11021 from owncloud/do-not-double-decodeAndreas Fischer2014-09-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Do not double decode valuesLukas Reschke2014-09-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-151-0/+3
* | | | | | | Merge pull request #11050 from owncloud/enc-flockfixLukas Reschke2014-09-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove passing by reference to allow for proper GCVincent Petry2014-09-121-1/+1
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-141-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-131-0/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-123-0/+8
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #9698 from owncloud/fix-9666Thomas Müller2014-09-111-3/+1
|\ \ \ \ \ \
| * | | | | | Fix mkdir error in mountconfig.phpRobin McCorkell2014-09-101-1/+1
| * | | | | | Load apps in test situationsRobin McCorkell2014-09-101-2/+0
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-09-1110-47/+251
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1014-1/+34
* | | | | Merge pull request #10922 from owncloud/explicit-scan-transactionsLukas Reschke2014-09-092-2/+2
|\ \ \ \ \
| * | | | | Use bigger transactions when doing explicit file system scansRobin Appelman2014-09-082-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0939-40/+115
* | | | | | Merge pull request #10739 from owncloud/eventsource-publicLukas Reschke2014-09-082-4/+4
|\ \ \ \ \ \
| * | | | | | Better phpdoc and method namingRobin Appelman2014-09-042-2/+2
| * | | | | | Use the public api to get event sourcesRobin Appelman2014-09-032-4/+4
* | | | | | | Merge pull request #10885 from owncloud/swift-hasupdatedLukas Reschke2014-09-082-20/+52
|\ \ \ \ \ \ \