summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-242-7/+8
* Merge pull request #8324 from owncloud/expired-link-erroricewind19912014-04-231-0/+3
|\
| * Fix error when viewing expired linkRobin Appelman2014-04-231-0/+3
* | Merge pull request #8009 from owncloud/feature/add-sharing-targetJoas Schilling2014-04-232-14/+56
|\ \
| * | Do not query when the list is emptyJoas Schilling2014-04-091-14/+16
| * | Add option to getUsersSharingFile() to get the paths for the shared usersJoas Schilling2014-04-092-14/+54
* | | Merge pull request #7617 from nishiki/cache_userThomas Müller2014-04-231-43/+60
|\ \ \ | |_|/ |/| |
| * | remove cache all useradrien2014-03-211-70/+22
| * | fix remove cache when deleteadrien2014-03-111-6/+3
| * | remove static variable, add limit and offsetadrien2014-03-111-29/+51
| * | fix cache when remove an useradrien2014-03-101-1/+8
| * | fix undifined uidnishiki2014-03-091-1/+2
| * | add query result (boolean) for update or deletenishiki2014-03-091-9/+6
| * | minor clean codenishiki2014-03-091-1/+1
| * | fix undefined in loadUsersadrien2014-03-071-8/+10
| * | update the cache when add useradrien2014-03-061-13/+16
| * | upgrade the cache useradrien2014-03-061-14/+38
| * | add cache for single usersadrien2014-03-061-33/+45
* | | Merge pull request #8068 from wakeup/fix-share.php-string-extractionThomas Müller2014-04-231-63/+89
|\ \ \
| * | | Make lib/** share.php strings extractable for translationVolkan Gezer2014-04-221-63/+89
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-232-0/+16
* | | | Merge pull request #8263 from LEDfan/add-key-to-contactsThomas Müller2014-04-221-1/+6
|\ \ \ \
| * | | | Change key to addressbook-keyTobia De Koninck2014-04-221-1/+1
| * | | | Add key to every contactLEDfan2014-04-181-1/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-222-1/+2
* | | | | Merge pull request #8281 from owncloud/public-responsesMorris Jobke2014-04-223-3/+3
|\ \ \ \ \
| * | | | | make download and redirectresponse publicBernhard Posselt2014-04-203-3/+3
* | | | | | Some more PHPDoc fixesLukas Reschke2014-04-2127-123/+237
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-211-1/+3
* | | | | | Merge pull request #7988 from owncloud/routing-cache-webrootAndreas Fischer2014-04-201-1/+2
|\ \ \ \ \ \
| * | | | | | Sort parameters and cast to intRobin Appelman2014-04-151-1/+2
| * | | | | | add delimiter between host and baseurlRobin Appelman2014-04-071-1/+1
| * | | | | | Merge branch 'master' into routing-cache-webrootRobin Appelman2014-04-0736-105/+162
| |\ \ \ \ \ \
| * | | | | | | Keep cached urls with different hostnames or baseurls seperateRobin Appelman2014-04-011-1/+1
* | | | | | | | Merge pull request #8203 from owncloud/correct-linkAndreas Fischer2014-04-201-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Link to previous directoryLukas Reschke2014-04-161-2/+2
| * | | | | | | | Use direct link instead of JSLukas Reschke2014-04-141-3/+2
* | | | | | | | | Add type hintingLukas Reschke2014-04-201-11/+11
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-191-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #8205 from owncloud/fix-8202Morris Jobke2014-04-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | remove unneeded LOWER. Fixes #8202Victor Dubiniuk2014-04-141-1/+1
* | | | | | | | Merge pull request #8222 from owncloud/type-hintingMorris Jobke2014-04-1714-18/+55
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix PHPdoc in lib/publicBart Visscher2014-04-153-1/+13
| * | | | | | | | Fix PHPdoc in lib/privateBart Visscher2014-04-1511-17/+42
* | | | | | | | | Merge pull request #8189 from Xenopathic/misc_fixesRobin McCorkell2014-04-171-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent error from cache update on deleted filesRobin McCorkell2014-04-131-1/+5
* | | | | | | | | | Merge pull request #8240 from owncloud/thumbnail-on-short-videos-masterJörn Friedrich Dreyer2014-04-171-7/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | escape $second + update PHPDocThomas Müller2014-04-161-7/+7
| * | | | | | | | | | videos which are shorter then 5 seconds will now get a proper thumbnail at 1 ...Thomas Müller2014-04-161-7/+30
* | | | | | | | | | | Merge pull request #8183 from owncloud/move-security-headersMorris Jobke2014-04-164-26/+29
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |