summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.0 alpha 1v8.0.0alpha1Frank Karlitschek2015-01-011-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-0134-36/+732
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-3156-34/+810
* jump to 8.0.0.0 The test upgrade and installation of apps realistic.Frank Karlitschek2014-12-301-1/+1
* Merge pull request #13055 from owncloud/dbal25Lukas Reschke2014-12-301-0/+0
|\
| * update dbal to 2.5.0Robin Appelman2014-12-301-0/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-302-0/+8
* Merge pull request #12854 from owncloud/add-direct-download-linkFrank Karlitschek2014-12-295-0/+58
|\
| * adding getDirectDownload() to WrapperThomas Müller2014-12-282-2/+14
| * Adding basement for the direct download urlThomas Müller2014-12-284-0/+46
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2916-8/+60
|/
* Merge pull request #13023 from owncloud/provisioning_api-2Thomas Müller2014-12-2813-0/+1680
|\
| * Add provisioning_api appTom Needham2014-12-2413-0/+1680
* | Merge pull request #13043 from owncloud/check-for-hashThomas Müller2014-12-281-1/+2
|\ \
| * | Check for hashLukas Reschke2014-12-281-1/+2
* | | Merge pull request #13035 from owncloud/new_edition_detectionLukas Reschke2014-12-282-7/+6
|\ \ \
| * | | remove EditionFrank Karlitschek2014-12-251-2/+0
| * | | Automatically detect the edition based on the enterprise_key app.Frank Karlitschek2014-12-252-5/+6
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-284-0/+50
* | | Merge pull request #13025 from lyonel/masterThomas Müller2014-12-272-2/+2
|\ \ \
| * | | Be less verbose when using a paged searchLyonel Vincent2014-12-241-1/+1
| * | | Be less verbose when disabling SSL cert validationLyonel Vincent2014-12-241-1/+1
| | |/ | |/|
* | | Merge pull request #13012 from owncloud/small_fixThomas Müller2014-12-271-11/+9
|\ \ \
| * | | only send activity if we have a valid path and the file is readableBjoern Schiessle2014-12-231-11/+9
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2718-14/+86
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2620-28/+166
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2518-18/+134
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2442-64/+210
* | Merge pull request #12830 from owncloud/intelligent-containerThomas Müller2014-12-238-14/+586
|\ \
| * | Intelligent containerBernhard Posselt2014-12-238-14/+586
* | | Merge pull request #13008 from owncloud/db-connection-test-cleanupMorris Jobke2014-12-231-0/+19
|\ \ \ | |_|/ |/| |
| * | Clean up test table in Connection Test to prevent unnecessary failures.Andreas Fischer2014-12-231-0/+19
* | | Merge pull request #10292 from owncloud/external-share-deleteMorris Jobke2014-12-232-2/+5
|\ \ \ | |_|/ |/| |
| * | Fix trashbin when deleting a file over an external shareRobin Appelman2014-08-082-2/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2350-40/+258
* | | Merge pull request #12997 from owncloud/sharing_activitiesBjörn Schießle2014-12-223-7/+44
|\ \ \ | |_|/ |/| |
| * | Make sure the path passed to the activity manager is normalizedRobin Appelman2014-12-221-1/+1
| * | add activity if public shared file/folder was downloadedBjoern Schiessle2014-12-223-6/+43
* | | Merge pull request #13003 from owncloud/remove-skip-to-contentMorris Jobke2014-12-222-4/+1
|\ \ \
| * | | remove skip to content for now, see #12999Jan-Christoph Borchardt2014-12-222-4/+1
|/ / /
* | | Merge pull request #12860 from owncloud/remove-apparently-unused-fileThomas Müller2014-12-221-34/+0
|\ \ \ | |/ / |/| |
| * | Remove unused fileLukas Reschke2014-12-151-34/+0
* | | Merge pull request #11810 from owncloud/hhvm-autotestThomas Müller2014-12-222-1/+268
|\ \ \
| * | | HHVM sets stream meta datum wrapper_type to 'File' instead of 'user-space'.Andreas Fischer2014-12-191-1/+2
| * | | Adding autotest-hhvm.shThomas Müller2014-12-181-0/+266
* | | | Merge pull request #12969 from owncloud/clarify-docsMorris Jobke2014-12-222-4/+4
|\ \ \ \
| * | | | Fix typoLukas Reschke2014-12-192-2/+2
| * | | | Clarify return valuesLukas Reschke2014-12-192-2/+2
* | | | | Merge pull request #12961 from owncloud/try_to_cache_keysMorris Jobke2014-12-224-19/+91
|\ \ \ \ \
| * | | | | cache keys to read them only once from the hard discBjoern Schiessle2014-12-194-19/+91