Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use namespace | Lukas Reschke | 2015-01-05 | 2 | -5/+23 |
| | |||||
* | Write unit-tests and use DI | Lukas Reschke | 2015-01-05 | 2 | -24/+284 |
| | |||||
* | Fix code-style | Lukas Reschke | 2015-01-05 | 1 | -2/+4 |
| | |||||
* | Merge pull request #13095 from derkostka/master | Morris Jobke | 2015-01-05 | 1 | -1/+1 |
|\ | | | | | fix "app":"PHP","message":"Undefined variable: user at/principal.php#66" | ||||
| * | fix "app":"PHP","message":"Undefined variable: user at/principal.php#66" | derkostka | 2015-01-04 | 1 | -1/+1 |
| | | | | | | changed variable #user to #name | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-05 | 86 | -98/+864 |
|/ | |||||
* | Merge pull request #13060 from dratini0/master | Morris Jobke | 2015-01-04 | 1 | -3/+1 |
|\ | | | | | Fix: X-Accel-Redirect did not support custom data dir and local mounts | ||||
| * | removed a little duplication | dratini0 | 2014-12-30 | 1 | -3/+1 |
| | | |||||
| * | Fix: X-Accel-Redirect did not support custom data dir and local mounts | dratini0 | 2014-12-30 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-04 | 70 | -232/+496 |
| | | |||||
* | | Merge pull request #13091 from owncloud/fix-provisioning-api | Morris Jobke | 2015-01-03 | 5 | -4/+24 |
|\ \ | | | | | | | Fix remaining unit tests for provisioning_api | ||||
| * | | Add proper group setup and teardown to all provisioning_api tests | Tom Needham | 2015-01-03 | 3 | -0/+9 |
| | | | |||||
| * | | Create admin group before running provisioning_api tests | Tom Needham | 2015-01-03 | 1 | -0/+5 |
| | | | |||||
| * | | Ensure admin group is present before running tests | Tom Needham | 2015-01-03 | 4 | -4/+10 |
| | | | |||||
* | | | Merge pull request #13082 from mmattel/rename_text_no_external_storages | Morris Jobke | 2015-01-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | adopt text "no external storage configured" | ||||
| * | | | adopt text "no ecternal storage configured" | root | 2015-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | storage -> storages | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-03 | 20 | -80/+90 |
| | | | | |||||
* | | | | Merge pull request #13083 from owncloud/fix-provisioning-api | Thomas Müller | 2015-01-02 | 2 | -1/+24 |
|\ \ \ \ | | |/ / | |/| | | Add provisioning_api app.php so app is detected | ||||
| * | | | Change array element order to fix failing test | Tom Needham | 2015-01-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add placeholder app.php for provisioning_api so app is detected | Tom Needham | 2015-01-02 | 1 | -0/+23 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-02 | 28 | -186/+386 |
| | | | |||||
* | | | 8.0 alpha 1v8.0.0alpha1 | Frank Karlitschek | 2015-01-01 | 1 | -2/+2 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-01 | 34 | -36/+732 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-31 | 56 | -34/+810 |
| | | |||||
* | | jump to 8.0.0.0 The test upgrade and installation of apps realistic. | Frank Karlitschek | 2014-12-30 | 1 | -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/dbal25 | Lukas Reschke | 2014-12-30 | 1 | -0/+0 |
|\ | | | | | update dbal to 2.5.0 | ||||
| * | update dbal to 2.5.0 | Robin Appelman | 2014-12-30 | 1 | -0/+0 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-30 | 2 | -0/+8 |
| | |||||
* | Merge pull request #12854 from owncloud/add-direct-download-link | Frank Karlitschek | 2014-12-29 | 5 | -0/+58 |
|\ | | | | | Adding foundation for the direct download url | ||||
| * | adding getDirectDownload() to Wrapper | Thomas Müller | 2014-12-28 | 2 | -2/+14 |
| | | |||||
| * | Adding basement for the direct download url | Thomas Müller | 2014-12-28 | 4 | -0/+46 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-29 | 16 | -8/+60 |
|/ | |||||
* | Merge pull request #13023 from owncloud/provisioning_api-2 | Thomas Müller | 2014-12-28 | 13 | -0/+1680 |
|\ | | | | | [jenkins] Add provisioning_api app | ||||
| * | Add provisioning_api app | Tom Needham | 2014-12-24 | 13 | -0/+1680 |
| | | | | | | | | | | | | enable unit tests for provisioning api fix admin docu key | ||||
* | | Merge pull request #13043 from owncloud/check-for-hash | Thomas Müller | 2014-12-28 | 1 | -1/+2 |
|\ \ | | | | | | | Check for hash | ||||
| * | | Check for hash | Lukas Reschke | 2014-12-28 | 1 | -1/+2 |
| | | | | | | | | | | | | See https://github.com/owncloud/core/pull/13042 | ||||
* | | | Merge pull request #13035 from owncloud/new_edition_detection | Lukas Reschke | 2014-12-28 | 2 | -7/+6 |
|\ \ \ | | | | | | | | | Automatically detect the edition based on the enterprise_key app. | ||||
| * | | | remove Edition | Frank Karlitschek | 2014-12-25 | 1 | -2/+0 |
| | | | | |||||
| * | | | Automatically detect the edition based on the enterprise_key app. | Frank Karlitschek | 2014-12-25 | 2 | -5/+6 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-28 | 4 | -0/+50 |
| | | | |||||
* | | | Merge pull request #13025 from lyonel/master | Thomas Müller | 2014-12-27 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | user_ldap is too verbose by default | ||||
| * | | | Be less verbose when using a paged search | Lyonel Vincent | 2014-12-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Lower the priority from INFO to DEBUG | ||||
| * | | | Be less verbose when disabling SSL cert validation | Lyonel Vincent | 2014-12-24 | 1 | -1/+1 |
| | |/ | |/| | | | | change log level from WARN to DEBUG | ||||
* | | | Merge pull request #13012 from owncloud/small_fix | Thomas Müller | 2014-12-27 | 1 | -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 readable | Bjoern Schiessle | 2014-12-23 | 1 | -11/+9 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-27 | 18 | -14/+86 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-26 | 20 | -28/+166 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-25 | 18 | -18/+134 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-24 | 42 | -64/+210 |
| | | |||||
* | | Merge pull request #12830 from owncloud/intelligent-container | Thomas Müller | 2014-12-23 | 8 | -14/+586 |
|\ \ | | | | | | | Intelligent container |