summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use namespaceLukas Reschke2015-01-052-5/+23
|
* Write unit-tests and use DILukas Reschke2015-01-052-24/+284
|
* Fix code-styleLukas Reschke2015-01-051-2/+4
|
* Merge pull request #13095 from derkostka/masterMorris Jobke2015-01-051-1/+1
|\ | | | | fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
| * fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"derkostka2015-01-041-1/+1
| | | | | | changed variable #user to #name
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0586-98/+864
|/
* Merge pull request #13060 from dratini0/masterMorris Jobke2015-01-041-3/+1
|\ | | | | Fix: X-Accel-Redirect did not support custom data dir and local mounts
| * removed a little duplicationdratini02014-12-301-3/+1
| |
| * Fix: X-Accel-Redirect did not support custom data dir and local mountsdratini02014-12-301-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0470-232/+496
| |
* | Merge pull request #13091 from owncloud/fix-provisioning-apiMorris Jobke2015-01-035-4/+24
|\ \ | | | | | | Fix remaining unit tests for provisioning_api
| * | Add proper group setup and teardown to all provisioning_api testsTom Needham2015-01-033-0/+9
| | |
| * | Create admin group before running provisioning_api testsTom Needham2015-01-031-0/+5
| | |
| * | Ensure admin group is present before running testsTom Needham2015-01-034-4/+10
| | |
* | | Merge pull request #13082 from mmattel/rename_text_no_external_storagesMorris Jobke2015-01-031-1/+1
|\ \ \ | | | | | | | | adopt text "no external storage configured"
| * | | adopt text "no ecternal storage configured"root2015-01-021-1/+1
| | | | | | | | | | | | | | | | storage -> storages
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0320-80/+90
| | | |
* | | | Merge pull request #13083 from owncloud/fix-provisioning-apiThomas Müller2015-01-022-1/+24
|\ \ \ \ | | |/ / | |/| | Add provisioning_api app.php so app is detected
| * | | Change array element order to fix failing testTom Needham2015-01-021-1/+1
| | | |
| * | | Add placeholder app.php for provisioning_api so app is detectedTom Needham2015-01-021-0/+23
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0228-186/+386
| | |
* | | 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
|/ | | | | Don´t open the champaign yet. This is obviously not the final release. ;-) The final will have the version number 8.0.0.x
* Merge pull request #13055 from owncloud/dbal25Lukas Reschke2014-12-301-0/+0
|\ | | | | update dbal to 2.5.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 foundation for the direct download url
| * 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
|\ | | | | [jenkins] Add provisioning_api app
| * Add provisioning_api appTom Needham2014-12-2413-0/+1680
| | | | | | | | | | | | enable unit tests for provisioning api fix admin docu key
* | Merge pull request #13043 from owncloud/check-for-hashThomas Müller2014-12-281-1/+2
|\ \ | | | | | | Check for hash
| * | Check for hashLukas Reschke2014-12-281-1/+2
| | | | | | | | | | | | See https://github.com/owncloud/core/pull/13042
* | | Merge pull request #13035 from owncloud/new_edition_detectionLukas Reschke2014-12-282-7/+6
|\ \ \ | | | | | | | | Automatically detect the edition based on the enterprise_key app.
| * | | 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
|\ \ \ | | | | | | | | user_ldap is too verbose by default
| * | | Be less verbose when using a paged searchLyonel Vincent2014-12-241-1/+1
| | | | | | | | | | | | Lower the priority from INFO to DEBUG
| * | | Be less verbose when disabling SSL cert validationLyonel Vincent2014-12-241-1/+1
| | |/ | |/| | | | change log level from WARN to DEBUG
* | | 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 readable
| * | | 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 container