summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-131-1/+2
* Merge pull request #8968 from owncloud/scanner-parent-repairVincent Petry2014-06-121-37/+40
|\
| * remove unused argumentRobin Appelman2014-06-101-3/+2
| * add some commentsRobin Appelman2014-06-101-0/+2
| * Repair broken parent link in the scannerRobin Appelman2014-06-101-34/+36
* | Revert "Merge pull request #8998 from macjohnny/master"Morris Jobke2014-06-122-13/+6
* | Merge pull request #8998 from macjohnny/mastermacjohnny2014-06-122-6/+13
|\ \
| * | Update manager.phpmacjohnny2014-06-121-1/+1
| * | Update group.phpmacjohnny2014-06-121-6/+0
| * | drastic speedup for nested ldap groupsmacjohnny2014-06-121-2/+3
| * | Update manager.phpmacjohnny2014-06-121-0/+12
* | | Merge pull request #8980 from owncloud/better-accept-headerVincent Petry2014-06-122-20/+37
|\ \ \ | |/ / |/| |
| * | also handle lowercase headersBernhard Posselt2014-06-111-22/+22
| * | fix indentionBernhard Posselt2014-06-111-6/+6
| * | handle http accept headers more gracefullyBernhard Posselt2014-06-112-18/+35
| |/
* | Merge pull request #8991 from owncloud/fix-php53-arraycombineVincent Petry2014-06-121-2/+7
|\ \
| * | Fixed array_combine for PHP 5.3Vincent Petry2014-06-111-2/+7
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-122-1/+11
* | | Merge pull request #8901 from owncloud/permissions-update-cacheVincent Petry2014-06-111-12/+12
|\ \ \ | |/ / |/| |
| * | Save the permissions in the filecache if it's not saved yetRobin Appelman2014-06-091-12/+12
* | | Added ORDER BY to enforce share entry orderVincent Petry2014-06-111-0/+1
* | | Merge pull request #8966 from owncloud/fix_failing_tests_on_masterVincent Petry2014-06-111-1/+1
|\ \ \
| * | | call self::getNumericStorageId() to get the numeric IDBjoern Schiessle2014-06-101-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-111-6/+6
* | | | make text preview backend use imagettftext, fixes #8087Georg Ehrke2014-06-101-2/+6
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-101-0/+2
| |/ |/|
* | set logger before registrate to an error handlerMorris Jobke2014-06-091-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-092-2/+60
* | Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fixMorris Jobke2014-06-081-0/+2
|\ \
| * | Added hacky fix for long path cleanup routineVincent Petry2014-06-061-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-085-4/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0768-189/+3
| |/ |/|
* | Merge pull request #8927 from owncloud/expire_only_link_sharesBjörn Schießle2014-06-062-36/+79
|\ \
| * | only expire link sharesBjoern Schiessle2014-06-062-36/+79
* | | Merge pull request #8253 from owncloud/pk-on-all-tables-masterThomas Müller2014-06-062-1/+2
|\ \ \
| * | | adding PK to table encryptionThomas Müller2014-06-062-1/+2
* | | | Merge pull request #8921 from owncloud/fix-remove-storage-masterThomas Müller2014-06-061-10/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | No need to create a storage within removeThomas Müller2014-06-061-10/+22
* | | | Merge pull request #4553 from owncloud/update_search_classesVincent Petry2014-06-0617-122/+657
|\ \ \ \
| * | | | fix namespace for legacy search classesJörn Friedrich Dreyer2014-06-062-2/+2
| * | | | make search non-static, add ISearch to server container, make legacy a static...Jörn Friedrich Dreyer2014-06-069-31/+146
| * | | | minor phpdoc cleanup and importsJörn Friedrich Dreyer2014-06-056-13/+14
| * | | | Move new search results to 'lib/private/search'Andrew Brown2014-06-055-1/+1
| * | | | Move legacy search to 'lib/private/legacy'Andrew Brown2014-06-055-68/+29
| * | | | Re-add type to legacy OC_Search_Result classAndrew Brown2014-06-051-1/+14
| * | | | Add audio and image result typesAndrew Brown2014-06-051-2/+2
| * | | | Add audio and image result typesAndrew Brown2014-06-053-1/+81
| * | | | fix formattingJörn Friedrich Dreyer2014-06-0510-191/+200
| * | | | Add legacy adapters for file searchAndrew Brown2014-06-054-0/+133
| * | | | Move to new namespace convention and add new result sub-classingAndrew Brown2014-06-056-100/+323