summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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-196-6/+65
|\ \ \ \ | |_|/ / |/| | |
| * | | introduce names for user backends - IUserBackendMorris Jobke2014-12-196-6/+65
* | | | 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
| | |_|_|/ | |/| | |
* | | | | Merge pull request #12865 from owncloud/files-tags-webdavMorris Jobke2014-12-195-7/+431
|\ \ \ \ \
| * | | | | Fix code style issues for tags pluginVincent Petry2014-12-183-6/+4
| * | | | | Remove obsolete methodVincent Petry2014-12-181-8/+0
| * | | | | Returns and update tags through WebDAV PROPFIND and PROPPATCHVincent Petry2014-12-175-7/+441
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-196-10/+18
| |_|/ / / |/| | | |
* | | | | Merge pull request #12748 from owncloud/redis_cacheMorris Jobke2014-12-192-1/+97
|\ \ \ \ \
| * | | | | Add Redis cache implementation, prefer over memcached, tests & config sampleJörn Friedrich Dreyer2014-12-102-1/+97
* | | | | | Merge pull request #12879 from owncloud/mountconfigMorris Jobke2014-12-189-19/+111
|\ \ \ \ \ \
| * | | | | | Allow disabling previews per mountRobin Appelman2014-12-171-0/+5
| * | | | | | Add getMountPoint to FileInfoRobin Appelman2014-12-176-17/+66
| * | | | | | Load mount specific options from the mount configRobin Appelman2014-12-172-2/+40
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #12759 from owncloud/core-reduce-js-and-cssJörn Friedrich Dreyer2014-12-182-11/+25
|\ \ \ \ \ \
| * | | | | | load showpassord.js conditionally in the template only if neededThomas Müller2014-12-161-2/+0