aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* only create a new share entry, if the user needs a different target name than...Bjoern Schiessle2014-09-261-1/+1
* for group shares we don't need a extra db entry of groupTarget equals itemTargetBjoern Schiessle2014-09-261-3/+3
* 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-253-35/+66
* always select permissions, used in getItems()Bjoern Schiessle2014-09-251-2/+3
* some small fixesBjoern Schiessle2014-09-254-11/+6
* clear share table after each test runBjoern Schiessle2014-09-241-0/+3
* 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 unit testsBjoern Schiessle2014-09-242-5/+22
* 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-224-48/+155
* group shares and combine permissionsBjoern Schiessle2014-09-224-240/+278
* 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
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1761-202/+170
* | Merge pull request #10745 from owncloud/fix-10708-doctrineLukas Reschke2014-09-162-9/+35
|\ \
| * | adding unit test to truncate the tableThomas Müller2014-09-162-1/+32
| * | Use Doctrine Platform to generate SQL query for table truncation.Andreas Fischer2014-08-291-8/+3
* | | Merge pull request #10902 from owncloud/fix-ellepsisLukas Reschke2014-09-162-0/+7
|\ \ \
| * | | Adding link to ellipsis and fixing stylingClark Tomlinson2014-09-162-0/+7
* | | | Merge pull request #11009 from owncloud/tobiasKaminsky-routeLukas Reschke2014-09-164-2/+99
|\ \ \ \
| * | | | Route for thumbnail generationtobiasKaminsky2014-09-164-2/+99
* | | | | 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 #10896 from owncloud/undo-nav-entryMorris Jobke2014-09-161-0/+35
|\ \ \ \ \ \
| * | | | | | add delete undo stylesBernhard Posselt2014-09-161-0/+35
* | | | | | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-169-4/+527
|\ \ \ \ \ \ \
| * | | | | | | Fixed sort algo for additional casesVincent Petry2014-08-114-3/+14
| * | | | | | | Fixed file list sortingVincent Petry2014-08-119-4/+516
* | | | | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15Lukas Reschke2014-09-16264-9790/+5917
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix failing AmazonS3::touch on updated aws sdkJohan Björk2014-09-031-1/+2
| * | | | | | | | Update AWS sdk to 2.6.15Johan Björk2014-09-03263-9789/+5915
* | | | | | | | | Merge pull request #11082 from owncloud/deduplicateDependencyCheckThomas Müller2014-09-161-70/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Deduplicate dependency checksLukas Reschke2014-09-161-70/+42
* | | | | | | | | | Merge pull request #11108 from owncloud/add-proper-descrLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reword the descriptionLukas Reschke2014-09-161-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #10754 from cetra3/masterLukas Reschke2014-09-161-7/+37
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/owncloud/corecetra32014-09-081738-512781/+6129
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor internal session to write directly to $_SESSIONcetra32014-08-301-7/+37
* | | | | | | | | | | Merge pull request #11055 from owncloud/replaceprodnameThomas Müller2014-09-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | replace ownCloud with placeholderVolkan Gezer2014-09-131-2/+2
* | | | | | | | | | | | 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 #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | also expire file if timestamp = limit, happens if trashbin_retention_obligati...Bjoern Schiessle2014-09-151-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-167-5/+79
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | patch tipsy in style.css - don't patch 3rdparty librariesMorris Jobke2014-09-162-1/+6
| * | | | | | | | | | | Better tooltip handling of very long stringsRobin McCorkell2014-09-111-1/+1