summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13125 from owncloud/lower-deprecation-warning-levelThomas Müller2015-01-061-2/+2
|\ | | | | degraded logging policy for server container in AppFramework
| * degraded logging policy for server container in AppFrameworkMorris Jobke2015-01-061-2/+2
| |
* | Merge pull request #13116 from owncloud/fix_assetsThomas Müller2015-01-062-2/+63
|\ \ | |/ |/| Fix JS asset generation
| * Fix JS asset generationRobin McCorkell2015-01-052-2/+63
| | | | | | | | | | | | | | | | | | At some point SeparatorFilter should be included upstream (kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be removed and the `use` in lib/private/templatelayout.php rewritten. SeparatorFilter inserts a separator between assets, preventing issues when files are incorrectly terminated. For JS this is a semicolon.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-0686-120/+52
| |
* | Merge pull request #13101 from ↵Thomas Müller2015-01-052-26/+306
|\ \ | |/ |/| | | | | owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that Fix undefined variable and write unit tests for OC_Principal connector
| * Use proper test nameLukas Reschke2015-01-051-4/+3
| |
| * Use proper namespaceLukas Reschke2015-01-051-1/+2
| |
| * 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 #13103 from owncloud/fix-htaccess-regexMorris Jobke2015-01-051-1/+1
|\ \ | | | | | | escape . in htaccess regex for CSS and JS HTTP headers
| * | escape . in htaccess regex for CSS and JS HTTP headersMorris Jobke2015-01-051-1/+1
| |/
* | Merge pull request #13108 from owncloud/fix-public-link-mount-for-pre-oc7Morris Jobke2015-01-052-2/+3
|\ \ | | | | | | Check for version before mounting a public link
| * | Check for version before mounting a public linkMorris Jobke2015-01-052-2/+3
| | | | | | | | | | | | | | | | | | * ownCloud 7.0.0 is needed - version of merge of server <-> server sharing - https://github.com/owncloud/core/pull/8399 * adjust error message
* | | Merge pull request #13107 from owncloud/change-to-better-error-levelBernhard Posselt2015-01-051-2/+2
|\ \ \ | |/ / |/| | Use info instead of warning log level
| * | Use info instead of warning log levelLukas Reschke2015-01-051-2/+2
| |/ | | | | | | | | | | Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106 Fixes https://github.com/owncloud/core/issues/13106
* | Merge pull request #13099 from owncloud/fix-provisioning-apiLukas Reschke2015-01-051-5/+0
|\ \ | |/ |/| Remove unnecessary setUp method from provisioning_api
| * Remove unnecessary setUp methodTom Needham2015-01-041-5/+0
| |
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 02:09:21 +0000