summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24677 from owncloud/single-token-providerVincent Petry2016-05-187-69/+96
|\
| * a single token provider sufficesChristoph Wurst2016-05-187-69/+96
* | Merge pull request #24685 from owncloud/files_psr4Vincent Petry2016-05-1844-0/+0
|\ \ | |/ |/|
| * Move \OCP\Files to PSR-4Roeland Jago Douma2016-05-1844-0/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-1816-0/+30
* Fixed dynamic group ldap access (#23450)blizzz2016-05-171-9/+11
* Move \OCP\Encryption to PSR-4 (#24680)Roeland Douma2016-05-175-0/+0
* use mount providers to setup home storages (#24567)Robin Appelman2016-05-177-33/+227
* \OCP\DB to PSR-4 (#24650)Roeland Douma2016-05-176-2/+2
* Merge pull request #24597 from owncloud/run-upgrade-in-incognito-modeVincent Petry2016-05-171-0/+3
|\
| * run upgrades in incognito modeChristoph Wurst2016-05-121-0/+3
* | Group fixup (#24621)Roeland Douma2016-05-1715-514/+585
* | Move \OCP\Diagnostics to PSR-4 (#24667)Roeland Douma2016-05-174-0/+0
* | Move \OCP\Authentication to PSR-4 (#24632)Roeland Douma2016-05-171-0/+0
* | Move \OCP\Console to PSR-4 (#24636)Roeland Douma2016-05-171-0/+0
* | Move \OCP\Contacts to PSR-4 (#24645)Roeland Douma2016-05-171-0/+0
* | Merge pull request #24634 from owncloud/sharesettings-sortVincent Petry2016-05-171-7/+7
|\ \
| * | fix admin share settings sorting, use same order as in sidebarJan-Christoph Borchardt2016-05-141-7/+7
* | | Merge pull request #24630 from owncloud/one-shall-adjust-the-pathVincent Petry2016-05-171-1/+1
|\ \ \
| * | | Use proper pathLukas Reschke2016-05-031-1/+1
* | | | Merge pull request #24370 from owncloud/iclientservice-dicontainerJörn Friedrich Dreyer2016-05-171-0/+4
|\ \ \ \
| * | | | add IClientService to DI containerChristoph Wurst2016-05-011-0/+4
* | | | | Merge pull request #24083 from owncloud/fix-race-conditionJörn Friedrich Dreyer2016-05-172-2/+4
|\ \ \ \ \
| * | | | | Read only onceLukas Reschke2016-05-022-2/+4
* | | | | | Merge pull request #24006 from owncloud/audio_m4aJörn Friedrich Dreyer2016-05-171-0/+2
|\ \ \ \ \ \
| * | | | | | Adding mimetypes for m4a and m4bMartin2016-04-141-0/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1724-6/+194
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-1634-2/+128
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-15158-42/+384
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-14256-262/+24
* | | | | | | Merge pull request #24617 from owncloud/autoloader_no_privateVincent Petry2016-05-132-36/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix unit testsRoeland Jago Douma2016-05-131-18/+4
| * | | | | | | All \OC\ classes are handled by the composer autoloaderRoeland Jago Douma2016-05-131-17/+0
| * | | | | | | OC_xx all live in the legacy folderRoeland Jago Douma2016-05-131-1/+0
* | | | | | | | Merge pull request #22341 from owncloud/pellaeon-pr-breadcrumb-filelist-overl...Vincent Petry2016-05-132-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle case when breadcrumb and filelist item overlapPellaeon Lin2016-03-172-0/+19
* | | | | | | | | Merge pull request #22214 from owncloud/ext-better-dropbox-gdriveVincent Petry2016-05-1315-29/+111
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move Dropbox/GDrive link to iconRobin McCorkell2016-05-033-8/+17
| * | | | | | | | | Change colour of input fields instead of printing 'Access granted'Robin McCorkell2016-05-033-11/+16
| * | | | | | | | | Add links to load GDrive/Dropbox configuration pagesRobin McCorkell2016-05-036-4/+58
| * | | | | | | | | Allow multiple custom JS filesRobin McCorkell2016-05-038-18/+32
* | | | | | | | | | Merge pull request #24600 from owncloud/http-client-lazy-configVincent Petry2016-05-131-6/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | only configure the http client once we start using itRobin Appelman2016-05-121-6/+23
* | | | | | | | | | | Merge pull request #24614 from owncloud/token-validation-logVincent Petry2016-05-131-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | don't spam the log file with failed token validation entriesChristoph Wurst2016-05-131-3/+1
* | | | | | | | | | | | Merge pull request #24594 from owncloud/authtoken-name-column-sizeVincent Petry2016-05-133-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use CLOB for auth token names to allow long user agent stringsChristoph Wurst2016-05-123-4/+6
* | | | | | | | | | | | Merge pull request #24601 from owncloud/template_psr4Vincent Petry2016-05-139-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move \OC\Template to PSR-4Roeland Jago Douma2016-05-136-0/+0
| * | | | | | | | | | | | Move functions.php to legacyRoeland Jago Douma2016-05-133-2/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |