summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* for group shares only the parent has the up-to-date permission. Make sure tha...Bjoern Schiessle2014-09-261-1/+12
* call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all c...Bjoern Schiessle2014-09-251-29/+5
* always select permissions, used in getItems()Bjoern Schiessle2014-09-251-2/+3
* some small fixesBjoern Schiessle2014-09-252-7/+2
* only add a new row if it isn't a unique share, otherwise update the existing rowBjoern Schiessle2014-09-241-1/+1
* mark exclude list as deprecated. It neither used by the files app nor by theBjoern Schiessle2014-09-241-1/+1
* fix add user to group to work with grouped sharesBjoern Schiessle2014-09-241-10/+18
* generateTarget() will always find a unique targetBjoern Schiessle2014-09-242-96/+80
* unit tests for grouping of shares pointing to the same sourceBjoern Schiessle2014-09-221-1/+1
* group shares and combine permissionsBjoern Schiessle2014-09-221-237/+249
* Merge pull request #11092 from owncloud/conceal_sabredav_versionLukas Reschke2014-09-171-0/+8
|\
| * Conceal or display SabreDAV version number in browser and http response headers.scolebrook2014-09-161-0/+8
* | Merge pull request #11009 from owncloud/tobiasKaminsky-routeLukas Reschke2014-09-161-0/+6
|\ \
| * | Route for thumbnail generationtobiasKaminsky2014-09-161-0/+6
* | | Merge pull request #11102 from owncloud/visit1985-issue_108Lukas Reschke2014-09-161-24/+38
|\ \ \
| * | | simplify mysql user creation flowMichael Göhler2014-09-161-24/+38
| | |/ | |/|
* | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-162-0/+128
|\ \ \
| * | | Fixed sort algo for additional casesVincent Petry2014-08-111-1/+2
| * | | Fixed file list sortingVincent Petry2014-08-112-0/+127
* | | | Merge pull request #11082 from owncloud/deduplicateDependencyCheckThomas Müller2014-09-161-70/+42
|\ \ \ \
| * | | | Deduplicate dependency checksLukas Reschke2014-09-161-70/+42
* | | | | Merge pull request #10754 from cetra3/masterLukas Reschke2014-09-161-7/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of https://github.com/owncloud/corecetra32014-09-0856-355/+1324
| |\ \ \ \
| * | | | | Refactor internal session to write directly to $_SESSIONcetra32014-08-301-7/+37
* | | | | | Merge pull request #11084 from owncloud/no-migration-for-mssql-masterLukas Reschke2014-09-162-0/+26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Disable database migrations for MSSQL - scripts have to be applied manuallyThomas Müller2014-09-152-0/+26
* | | | | | Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdocMorris Jobke2014-09-161-16/+8
|\ \ \ \ \ \
| * | | | | | Fix unexisting class and PHPDocLukas Reschke2014-09-151-16/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspectMorris Jobke2014-09-161-7/+17
|\ \ \ \ \ \
| * | | | | | add phpdocGeorg Ehrke2014-09-151-0/+4
| * | | | | | add y to with-aspect naming schemaGeorg Ehrke2014-09-151-7/+13
| |/ / / / /
* | | | | | Merge pull request #10362 from owncloud/preserve_transparency_on_fileloadMorris Jobke2014-09-161-0/+6
|\ \ \ \ \ \
| * | | | | | Preserve transparency when loading from a filekondou2014-09-101-0/+6
* | | | | | | Merge pull request #11060 from owncloud/rmobslangLukas Reschke2014-09-152-22/+0
|\ \ \ \ \ \ \
| * | | | | | | remove obsolete language filesVolkan Gezer2014-09-132-22/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #10109 from owncloud/issue_#9793_guestlayoutMorris Jobke2014-09-151-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Step one, open guest layout for different styles.Lukas Reschke2014-09-111-0/+1
* | | | | | | Merge pull request #10960 from owncloud/use-intl-module-masterLukas Reschke2014-09-152-7/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | use intl's native normalizer_normalize() in case the module is availableThomas Müller2014-09-112-7/+8
| |/ / / / /
* | | | | | Merge pull request #11041 from owncloud/no-size-check-on-lock-masterRaghu Nayyar2014-09-131-1/+1
|\ \ \ \ \ \
| * | | | | | content size checks are not valid for LOCKThomas Müller2014-09-121-1/+1
* | | | | | | Merge pull request #11043 from owncloud/test-againstNullClark Tomlinson2014-09-121-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Return false in case one of the values is nullLukas Reschke2014-09-121-0/+4
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-121-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecause...Thomas Müller2014-09-111-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Add custom hex2bin implementation for 5.3Lukas Reschke2014-09-111-2/+18
* | | | | | | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_overLukas Reschke2014-09-111-0/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Refresh if maintenance mode is overkondou2014-09-091-0/+1
* | | | | | | | Merge pull request #10962 from owncloud/repair_search_luceneLukas Reschke2014-09-113-2/+66
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | repair search lucene before installingJörn Friedrich Dreyer2014-09-103-2/+66
| |/ / / / / /