summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move \OC\DB to PSR-4Roeland Jago Douma2016-04-1531-0/+0
* Merge pull request #24031 from owncloud/comments_psr4Thomas Müller2016-04-153-0/+0
|\
| * Move \OC\Comments to PSR-4Roeland Jago Douma2016-04-153-0/+0
|/
* Merge pull request #23933 from owncloud/remember-file-sortingThomas Müller2016-04-1510-16/+161
|\
| * fix default value, update js/php testsChristoph Wurst2016-04-136-17/+116
| * persist file sorting changesChristoph Wurst2016-04-137-8/+47
| * load file sorting mode from the dbChristoph Wurst2016-04-134-2/+9
* | Merge pull request #24023 from owncloud/command_psr4Thomas Müller2016-04-156-0/+0
|\ \
| * | Move \OC\Command to PSR-4Roeland Jago Douma2016-04-156-0/+0
* | | Merge pull request #24024 from owncloud/dropbox-autoloadThomas Müller2016-04-151-1/+1
|\ \ \ | |/ / |/| |
| * | Fix loading the dropbox autoloaderRobin Appelman2016-04-151-1/+1
|/ /
* | Merge pull request #24016 from owncloud/cache_psr4Roeland Douma2016-04-152-0/+0
|\ \
| * | Move \OC\Cache to PSR-4Roeland Jago Douma2016-04-152-0/+0
|/ /
* | Merge pull request #24013 from owncloud/session_psr4Thomas Müller2016-04-155-0/+0
|\ \
| * | Move \OC\Session to PSR-4Roeland Jago Douma2016-04-155-0/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1510-36/+66
|/ /
* | Merge pull request #24007 from owncloud/security_psr4Thomas Müller2016-04-1413-0/+0
|\ \
| * | Move \OC\Security to PSR-4Roeland Jago Douma2016-04-1413-0/+0
* | | Merge pull request #23998 from owncloud/translate-birthdayThomas Müller2016-04-145-17/+54
|\ \ \
| * | | Translate contacts birthday - fixes #23982Thomas Müller2016-04-145-17/+54
* | | | Merge pull request #24005 from owncloud/3rdparty-has-to-be-in-rootThomas Müller2016-04-143-47/+8
|\ \ \ \
| * | | | Kill movable 3rdpartyThomas Müller2016-04-143-47/+8
| | |/ / | |/| |
* | | | Merge pull request #23994 from owncloud/log-in-imageThomas Müller2016-04-142-20/+11
|\ \ \ \
| * | | | use background image for log in viewJan-Christoph Borchardt2016-04-142-20/+11
* | | | | Merge pull request #23561 from owncloud/background-scan-unscannedC. Montero Luque2016-04-141-19/+31
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into background-scan-unscannedC. Montero Luque2016-03-2553-13/+307
| |\ \ \ \
| * | | | | handle completely unscanned storages in the background scannerRobin Appelman2016-03-241-19/+31
* | | | | | Merge pull request #23527 from owncloud/fix-21136C. Montero Luque2016-04-142-2/+6
|\ \ \ \ \ \
| * | | | | | disable Paged Search when chunksize is set to 0, fixes #21136Arthur Schiwon2016-03-232-2/+6
* | | | | | | Merge pull request #23985 from owncloud/ext-fix-namespacesMorris Jobke2016-04-1439-121/+132
|\ \ \ \ \ \ \
| * | | | | | | Fix OCA\Files\External\Api namespaceRobin McCorkell2016-04-143-3/+2
| * | | | | | | Fix storage backend class namespaces and move to subdirRobin McCorkell2016-04-1437-118/+130
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #23991 from owncloud/handle-exceptions-in-templatesThomas Müller2016-04-141-2/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Properly handle exception within templatesMorris Jobke2016-04-141-2/+7
* | | | | | | Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-...Thomas Müller2016-04-141-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Use better names for the default calendars and addressbooks - fixes #23720Thomas Müller2016-04-131-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #22760 from owncloud/tooltip-cssfixThomas Müller2016-04-141-0/+1
|\ \ \ \ \ \ \
| * | | | | | | add word wrap to tooltipsErik Pellikka2016-03-021-0/+1
* | | | | | | | close navigation menu when opening app in new tab (#23914)Christoph Wurst2016-04-141-0/+4
* | | | | | | | add loading feedback to user menu entries (#23916)Christoph Wurst2016-04-142-0/+21
* | | | | | | | On mount make sure multiple shares with same target map to unique ones (#23937)Roeland Douma2016-04-143-15/+61
* | | | | | | | Scrutinizer Auto-Fixes (#23959)Scrutinizer Auto-Fixer2016-04-141-2/+2
* | | | | | | | Merge pull request #23976 from owncloud/kill-dav-migrationThomas Müller2016-04-1415-1476/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove dav migration for 9.1Thomas Müller2016-04-1315-1476/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong...Morris Jobke2016-04-141-4/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Share::getUsersSharingFile() for mount pointsJoas Schilling2016-04-131-4/+17
| |/ / / / / / /
* | | | | | | | Merge pull request #23986 from owncloud/psr-4_lockRoeland Douma2016-04-144-0/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Move \OC\Lock to PSR-4Roeland Jago Douma2016-04-144-0/+0
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-144-0/+4
* | | | | | | Merge pull request #23981 from owncloud/app_psr4Thomas Müller2016-04-1414-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |