summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entryThomas Müller2015-12-081-1/+1
|\
| * passing an empty base in this diagnosis call will not result in LDAP errorsArthur Schiwon2015-12-081-1/+1
* | Merge pull request #21018 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-087-16/+66
|\ \
| * | More fixes to the docsJoas Schilling2015-12-083-6/+20
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-077-10/+46
* | | Merge pull request #20786 from owncloud/systemtags-davThomas Müller2015-12-0815-0/+1876
|\ \ \ | |_|/ |/| |
| * | Fixed system tags DAV and API and docsVincent Petry2015-12-047-40/+49
| * | Unit test for system tags pluginVincent Petry2015-12-0310-14/+988
| * | Fix PHPDoc ...Thomas Müller2015-12-037-16/+20
| * | Added dav endpoints for system tagsVincent Petry2015-12-039-0/+889
* | | Use proper PHPDoc referenceLukas Reschke2015-12-081-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-088-4/+30
| |/ |/|
* | Merge pull request #21006 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-072-2/+0
|\ \
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-072-2/+0
* | | Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_...Thomas Müller2015-12-072-2/+2
|\ \ \
| * | | Remove of useless codeRenaud Fortier2015-11-261-5/+1
| * | | if define, check the userfilter if the user is still allowedRenaud Fortier2015-08-112-2/+6
* | | | Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopenThomas Müller2015-12-071-1/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Improving fopen behaviour for Swift backendTim Dettrick2015-12-071-1/+10
* | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-0710-9/+17
* | | | Merge pull request #20569 from owncloud/issue_20427Thomas Müller2015-12-076-2/+730
|\ \ \ \
| * \ \ \ Merge branch 'master' into issue_20427Jesus Macias Portela2015-12-03740-7186/+15695
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Delete js unit test. Another issue has been created to create js testJesús Macias2015-12-011-205/+0
| * | | | Fix css selector and bug checking personal mounts statusJesús Macias2015-11-242-5/+5
| * | | | Add css to manage row status colorJesús Macias2015-11-243-4/+12
| * | | | Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427Jesús Macias2015-11-241-0/+205
| |\ \ \ \
| | * | | | Added some unit tests for the status managerVincent Petry2015-11-201-0/+205
| * | | | | Fix code from PR commentsJesús Macias2015-11-244-236/+208
| |/ / / /
| * | | | Adding logic to show custom icon for current backends, waiting for icon filesJesús Macias2015-11-201-0/+24
| * | | | Fix code from PR commentsJesús Macias2015-11-182-615/+525
| * | | | Add method to show custom icon and icon-error for each storage backendJesús Macias2015-11-183-211/+200
| * | | | Add icon management capabilities (error icon)Jesús Macias2015-11-132-17/+18
| * | | | First working approach to show mount statusJesús Macias2015-11-126-50/+874
* | | | | Merge pull request #20796 from owncloud/cleanup-trashbin-codeThomas Müller2015-12-071-15/+6
|\ \ \ \ \
| * | | | | Cleanup trashbin expire codeMorris Jobke2015-11-301-15/+6
* | | | | | Merge pull request #20581 from owncloud/public-page-preview-hidpi-scaleThomas Müller2015-12-071-4/+8
|\ \ \ \ \ \
| * | | | | | Fix hidpi previews on public pageRobin Appelman2015-11-181-4/+8
* | | | | | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-072-4/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Replacing ini_get instances with inigetwrapper usagesClark Tomlinson2015-11-232-4/+3
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-064-0/+6
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0510-8/+20
* | | | | | | db config backend for files_externalRobin Appelman2015-12-0418-951/+1614
* | | | | | | Delete no longer existing users from system addressbookThomas Müller2015-12-041-0/+12
* | | | | | | Merge pull request #20933 from owncloud/more-OC_Config-cleanupsThomas Müller2015-12-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | More cleanups of OC_Config usageMorris Jobke2015-12-031-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20931 from owncloud/dav-fixnamespaceoutputThomas Müller2015-12-042-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix namespace XML output of files and tags davVincent Petry2015-12-032-2/+2
| |/ / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0410-0/+50
* | | | | | | Merge pull request #20545 from owncloud/scan-storage-in-background-jobThomas Müller2015-12-038-145/+280
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move files/ajax/scan.php to background jobLukas Reschke2015-11-288-145/+280