aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* allow css/js asset directory to be relocated (#13053)Adam Williamson2015-01-053-7/+9
* Merge pull request #13101 from owncloud/variable-is-undefined-please-use-a-pr...Thomas Müller2015-01-051-26/+57
|\
| * Use namespaceLukas Reschke2015-01-051-2/+18
| * Write unit-tests and use DILukas Reschke2015-01-051-24/+37
| * Fix code-styleLukas Reschke2015-01-051-2/+4
* | Use info instead of warning log levelLukas Reschke2015-01-051-2/+2
|/
* Merge pull request #13095 from derkostka/masterMorris Jobke2015-01-051-1/+1
|\
| * fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"derkostka2015-01-041-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-058-28/+64
|/
* Merge pull request #13060 from dratini0/masterMorris Jobke2015-01-041-3/+1
|\
| * 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-044-18/+78
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-034-6/+8
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-024-56/+60
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-014-2/+20
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-318-0/+26
|/
* 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-292-4/+8
|/
* 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-281-4/+6
|\ \
| * | remove EditionFrank Karlitschek2014-12-251-2/+0
| * | Automatically detect the edition based on the enterprise_key app.Frank Karlitschek2014-12-251-2/+6
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2014-12-274-10/+38
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-262-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-254-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-246-0/+24
* Intelligent containerBernhard Posselt2014-12-236-14/+374
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-232-2/+6
* 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 #12983 from owncloud/root-ifaceMorris Jobke2014-12-222-1/+35
|\ \
| * | add an interface for the root folder so apps have an interface to deal with s...Bernhard Posselt2014-12-212-1/+35
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-226-2/+30
* | | Merge pull request #12978 from owncloud/fix-support-claimThomas Müller2014-12-211-1/+1
|\ \ \
| * | | Change support message to be more explicit about the enterprise editionMorris Jobke2014-12-201-1/+1
* | | | Merge pull request #12982 from owncloud/timefac-ifaceThomas Müller2014-12-212-1/+41
|\ \ \ \
| * | | | add an interface for the timefactory classBernhard Posselt2014-12-202-1/+41
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2112-4/+60
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-204-0/+34
| |/ / |/| |
* | | Fix Undefined variable: result at tags.php#231derkostka2014-12-191-4/+4
* | | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-197-77/+307
|\ \ \
| * | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-197-77/+307
* | | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-192-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Split mapping from Access and Helper classes into it's own. Fully test them, ...Arthur Schiwon2014-12-192-0/+2
* | | | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ \ \ | |_|_|/ |/| | |