summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-2338-8/+70
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-22130-212/+174
* Merge pull request #24732 from owncloud/autoloader_fixVincent Petry2016-05-214-22/+2
|\
| * Move Template to PSR-4Roeland Jago Douma2016-05-201-0/+0
| * Fix unit testsRoeland Jago Douma2016-05-201-15/+1
| * Only allow loading of legacy (lib/private/legacy) by defaultRoeland Jago Douma2016-05-201-5/+1
| * \OCP is handled by composer autoloaderRoeland Jago Douma2016-05-201-2/+0
* | Merge pull request #24696 from owncloud/lock-jobs-while-executingVincent Petry2016-05-2113-140/+257
|\ \
| * | Do not lock the cron anymore so we can have multiple workersJoas Schilling2016-05-212-38/+0
| * | Lock jobs while executing them, to allow multiple executors to run in parallelJoas Schilling2016-05-217-101/+148
| * | Add a method to lock a tableJoas Schilling2016-05-216-2/+110
| |/
* | Merge pull request #24307 from owncloud/systemtags-perminterfaceVincent Petry2016-05-2130-414/+1305
|\ \
| * | Increase version for DB additionVincent Petry2016-05-201-1/+1
| * | Make it possible to exclude admin groups from groups select2Vincent Petry2016-05-201-5/+10
| * | Some tweaks for systemtagmanagerVincent Petry2016-05-203-67/+2
| * | Rename "not-assignble" to "restricted"Vincent Petry2016-05-204-4/+4
| * | Add app to shipped.jsonVincent Petry2016-05-201-0/+1
| * | Update integration tests for system tags with groupsVincent Petry2016-05-203-17/+232
| * | Adjust DAV SystemTagPlugin unit tests for groupsVincent Petry2016-05-202-79/+244
| * | Fix system tags DAV plugin testsVincent Petry2016-05-201-50/+20
| * | Fix system tag update codeVincent Petry2016-05-201-0/+4
| * | Add admin-only system tag groups propertyVincent Petry2016-05-201-4/+39
| * | Act on effective system tag canAssign permissionVincent Petry2016-05-208-37/+109
| * | Fix system tags DAV unit testsVincent Petry2016-05-206-160/+269
| * | Bring back admin permissions to change system tag permissionsVincent Petry2016-05-202-9/+19
| * | Add system tag assignability check with groupsVincent Petry2016-05-202-1/+34
| * | Add systemtag_group table and get/set methodsVincent Petry2016-05-204-0/+135
| * | Updated canUser* functions in SystemTagManager to accept objectsVincent Petry2016-05-209-140/+77
| * | Add interface methods for permission checkVincent Petry2016-05-2010-78/+343
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2016-05-218-20/+104
|/
* Merge pull request #22576 from owncloud/folder_scroll_fixVincent Petry2016-05-201-0/+21
|\
| * added back the jquery animationsErik Pellikka2016-05-131-6/+11
| * code style fixErik Pellikka2016-05-131-11/+3
| * code style fixErik Pellikka2016-05-131-3/+2
| * code style fixErik Pellikka2016-05-131-2/+6
| * added elseifErik Pellikka2016-05-131-1/+1
| * fixed to work with share links as wellErik Pellikka2016-05-131-3/+4
| * typo fixErik Pellikka2016-05-131-2/+2
| * TweakingErik Pellikka2016-05-131-7/+7
| * Avoids jumping if window is smaller than 300 pixels in heightMorris Jobke2016-05-131-2/+3
| * Add scrolling when dragging filesErik Pellikka2016-05-131-0/+19
* | Move tests/ to PSR-4 (#24731)Joas Schilling2016-05-20257-180/+171
* | Merge pull request #24702 from owncloud/background-scan-occVincent Petry2016-05-201-3/+12
|\ \
| * | add "unscanned" option to files:scan to triger a background scanRobin Appelman2016-05-191-3/+12
* | | Merge pull request #24728 from owncloud/no-more-test_-filesVincent Petry2016-05-204-8/+12
|\ \ \
| * | | Add PSR-4 loading for Test\ and Tests\Joas Schilling2016-05-191-0/+2
| * | | Create a Fallback in the old autoloader for PSR-4 Test\TestCaseJoas Schilling2016-05-193-0/+10
| * | | No more Test_* files exist, remove autoloadingJoas Schilling2016-05-192-9/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-2012-4/+42
* | | | Merge pull request #24585 from owncloud/files_external_lazyVincent Petry2016-05-195-16/+224
|\ \ \ \