summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #17932 from owncloud/fix_move_filesThomas Müller2015-08-112-3/+10
|\
| * make sure that we emit the hooks if a file gets moved from a subfolder to the...Bjoern Schiessle2015-07-292-3/+10
* | Merge pull request #18171 from owncloud/fix-language-of-files-activities-in-e...Morris Jobke2015-08-112-10/+54
|\ \
| * | Correctly make use of the languageCode argument in the files activity extensionJoas Schilling2015-08-102-10/+54
* | | Merge pull request #16528 from owncloud/activity-302-improve-settingsJoas Schilling2015-08-114-15/+36
|\ \ \
| * | | Do not use magic strings when there are constants for itJoas Schilling2015-07-222-11/+12
| * | | Make the favorite type stream onlyJoas Schilling2015-07-221-2/+9
| * | | Allow types to be method specificJoas Schilling2015-07-222-2/+15
* | | | Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-inva...Joas Schilling2015-08-112-92/+147
|\ \ \ \
| * | | | Throw a InvalidArgumentException when a consumer/extension is invalidJoas Schilling2015-07-232-92/+147
* | | | | Merge pull request #18096 from sualko/patch-1Morris Jobke2015-08-105-56/+57
|\ \ \ \ \
| * | | | | add more unit tests for data: as allowed image domainsualko2015-08-103-3/+3
| * | | | | add unit test for data: as allowed image domainsualko2015-08-071-53/+53
| * | | | | add data: to allowed image domainssualko2015-08-051-0/+1
* | | | | | Merge pull request #17919 from rullzer/php_supported_checkThomas Müller2015-08-104-0/+85
|\ \ \ \ \ \
| * | | | | | Display warning in security & setup warnings if php version is EOLRoeland Jago Douma2015-07-294-0/+85
* | | | | | | Merge pull request #18109 from owncloud/fix-router-app-loadedThomas Müller2015-08-102-0/+16
|\ \ \ \ \ \ \
| * | | | | | | Only load app routes if the app has already been loadedRobin McCorkell2015-08-062-0/+16
* | | | | | | | Merge pull request #18175 from owncloud/automatic-db-prefix-query-builderThomas Müller2015-08-1012-92/+157
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary DB prefixes from existing query builder usagesJoas Schilling2015-08-109-50/+50
| * | | | | | | | Automatically prefix table names with *PREFIX* unless specifiedJoas Schilling2015-08-103-42/+107
* | | | | | | | | Merge pull request #15093 from rullzer/capabilities_managerRoeland Douma2015-08-1025-92/+542
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use DIRoeland Jago Douma2015-08-1012-93/+44
| * | | | | | | | | Move core capabilities to new classRoeland Jago Douma2015-08-103-11/+65
| * | | | | | | | | Moved core apps to the capabilities managerRoeland Jago Douma2015-08-1015-86/+179
| * | | | | | | | | Added Capabilities ManagerRoeland Jago Douma2015-08-108-2/+354
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #18159 from owncloud/check-appid-folder-in-archiveThomas Müller2015-08-101-0/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update installer.phpmichag862015-08-101-0/+1
| * | | | | | | | Check if archive contains a directory named like appidmichag862015-08-101-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #17656 from owncloud/files-rightsidebarVincent Petry2015-08-1024-27/+1194
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix unit test for tipsy->tooltip changeVincent Petry2015-08-101-3/+3
| * | | | | | | replace tipsy with tooltipHendrik Leppelsack2015-08-071-1/+1
| * | | | | | | fix tipsy gravity after rebaseArthur Schiwon2015-08-071-1/+1
| * | | | | | | fix timezone issue with unittestArthur Schiwon2015-08-071-1/+2
| * | | | | | | Fix sidebar mtime display unit testVincent Petry2015-08-071-2/+2
| * | | | | | | Set momentJS locale to en during unit test runsVincent Petry2015-08-071-0/+2
| * | | | | | | Fix app-content scrollbar when app-sidebar is openVincent Petry2015-08-074-16/+10
| * | | | | | | fix position of elements in right sidebarJan-Christoph Borchardt2015-08-072-8/+18
| * | | | | | | fix right sidebar position and first styleJan-Christoph Borchardt2015-08-072-10/+5
| * | | | | | | Use own tabs impl in files sidebarVincent Petry2015-08-075-26/+123
| * | | | | | | fix show/hide app sidebar functionsArthur Schiwon2015-08-071-2/+3
| * | | | | | | rename sidebar element and use css and js utility functions to coreArthur Schiwon2015-08-077-56/+80
| * | | | | | | sidebar shall not overlap but shrink the contnetArthur Schiwon2015-08-073-6/+15
| * | | | | | | extend MainFileInfoDetailView JS testsArthur Schiwon2015-08-071-3/+29
| * | | | | | | Main view does not commands detail and tab views to render. Fixes JS tests.Arthur Schiwon2015-08-073-5/+20
| * | | | | | | More work on right sidebar unit testsVincent Petry2015-08-071-3/+3
| * | | | | | | Added unit tests for right sidebarVincent Petry2015-08-077-7/+222
| * | | | | | | Improve layout, fix mime iconVincent Petry2015-08-074-17/+35
| * | | | | | | Disable right sidebar in public file list pageVincent Petry2015-08-072-6/+14
| * | | | | | | Right sidebar now has its own scrollbarVincent Petry2015-08-073-5/+25