summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13131 from owncloud/db-connect-stacktraceMorris Jobke2015-01-071-0/+10
|\
| * Prevent leaking db connection info in the stacktraceRobin Appelman2015-01-061-0/+10
* | Merge pull request #13130 from owncloud/getstoragestats-error-handlingLukas Reschke2015-01-061-0/+3
|\ \
| * | Add error handling to getstoragestats.phpRobin Appelman2015-01-061-0/+3
| |/
* | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-063-3/+31
|\ \ | |/ |/|
| * move search results below filelist, show hint when results are off screen, us...Jörn Friedrich Dreyer2015-01-021-4/+6
| * ajax paging, some js cleanupsJörn Friedrich Dreyer2015-01-021-1/+3
| * add paged providerJörn Friedrich Dreyer2015-01-022-2/+26
| * new OC.Search, add search result formatters and handlers, use full content wi...Jörn Friedrich Dreyer2015-01-021-1/+1
* | Merge pull request #13125 from owncloud/lower-deprecation-warning-levelThomas Müller2015-01-061-2/+2
|\ \
| * | 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 generationRobin McCorkell2015-01-052-2/+63
* | | 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
|/ /
* | fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"derkostka2015-01-041-1/+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
|/
* adding getDirectDownload() to WrapperThomas Müller2014-12-282-2/+14
* Adding basement for the direct download urlThomas Müller2014-12-283-0/+36
* Merge pull request #13043 from owncloud/check-for-hashThomas Müller2014-12-281-1/+2
|\
| * Check for hashLukas Reschke2014-12-281-1/+2
* | remove EditionFrank Karlitschek2014-12-251-2/+0
* | Automatically detect the edition based on the enterprise_key app.Frank Karlitschek2014-12-251-2/+6
|/
* Intelligent containerBernhard Posselt2014-12-234-14/+330
* Merge pull request #12969 from owncloud/clarify-docsMorris Jobke2014-12-221-2/+2
|\
| * Fix typoLukas Reschke2014-12-191-1/+1
| * Clarify return valuesLukas Reschke2014-12-191-1/+1
* | Merge pull request #12983 from owncloud/root-ifaceMorris Jobke2014-12-221-1/+3
|\ \
| * | add an interface for the root folder so apps have an interface to deal with s...Bernhard Posselt2014-12-211-1/+3
* | | 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-211-1/+3
|\ \ \ | |/ / |/| |
| * | add an interface for the timefactory classBernhard Posselt2014-12-201-1/+3
* | | 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-196-77/+295
|\ \ \
| * | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-196-77/+295
* | | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-191-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Split mapping from Access and Helper classes into it's own. Fully test them, ...Arthur Schiwon2014-12-191-0/+1
* | | | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add ultra-slim hack for incognito modeLukas Reschke2014-12-172-0/+12
* | | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-195-6/+38
|\ \ \ \ | |_|/ / |/| | |
| * | | introduce names for user backends - IUserBackendMorris Jobke2014-12-195-6/+38
* | | | Merge pull request #12954 from owncloud/hhvm-apc-clearLukas Reschke2014-12-191-1/+1
|\ \ \ \
| * | | | HHVM: In APC cache clear, only request the cache key in APCIterator.Andreas Fischer2014-12-191-1/+1
* | | | | Merge pull request #12918 from owncloud/use-uid-instead-of-login-nameMorris Jobke2014-12-191-1/+1
|\ \ \ \ \
| * | | | | Return UID instead of login nameLukas Reschke2014-12-171-1/+1
| | |_|_|/ | |/| | |