summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adding a basic configuration for the mention botThomas Müller2015-12-071-0/+11
* Merge pull request #20987 from owncloud/dont-deprecate-OC.filePath-masterThomas Müller2015-12-071-1/+0
|\
| * OC.FilePath has still a valid use case when generating paths to static files ...Thomas Müller2015-12-071-1/+0
* | Merge pull request #20998 from owncloud/add-csp-header-to-static-resourcesThomas Müller2015-12-071-0/+4
|\ \
| * | Add CSP header to static resourcesLukas Reschke2015-12-071-0/+4
* | | Merge pull request #20993 from owncloud/issue-20666-language-always-overwrittenThomas Müller2015-12-071-3/+7
|\ \ \ | |/ / |/| |
| * | Do not overwrite the language when it's just missing for one appJoas Schilling2015-12-071-3/+7
| |/
* | Merge pull request #20988 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-0710-9/+17
|\ \
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-0710-9/+17
| |/
* | Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-share...Thomas Müller2015-12-072-4/+22
|\ \ | |/ |/|
| * Add a unit test for single user case as wellJoas Schilling2015-12-071-7/+9
| * Allow sending a share email to multiple usersJoas Schilling2015-12-072-4/+20
* | Merge pull request #20569 from owncloud/issue_20427Thomas Müller2015-12-077-3/+732
|\ \
| * \ Merge branch 'master' into issue_20427Jesus Macias Portela2015-12-031340-11370/+31525
| |\ \
| * | | 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-242-1/+207
| |\ \ \
| | * | | Added some unit tests for the status managerVincent Petry2015-11-202-1/+207
| * | | | 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 #20530 from owncloud/icons-moreThomas Müller2015-12-0752-91/+96
|\ \ \ \ \ \
| * | | | | | add new icon rules to icons.cssJan-Christoph Borchardt2015-11-201-1/+13
| * | | | | | add icons for checked+disabled checkbox and radioJan-Christoph Borchardt2015-11-204-0/+10
| * | | | | | compress action iconsJan-Christoph Borchardt2015-11-2022-84/+24
| * | | | | | add icons for disabled checkbox, radio button, error and colored checkmarkJan-Christoph Borchardt2015-11-2025-6/+49
* | | | | | | Merge pull request #20480 from owncloud/css-prefixesThomas Müller2015-12-077-41/+11
|\ \ \ \ \ \ \
| * | | | | | | remove unneeded css prefixesHendrik Leppelsack2015-11-237-41/+11
* | | | | | | | Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContentThomas Müller2015-12-072-19/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove OC_Util::getUrlContent and replace by proper usage of public interfacesMorris Jobke2015-12-042-19/+12
* | | | | | | | | Merge pull request #11131 from owncloud/use-phpini-wrapperThomas Müller2015-12-0710-19/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace new occurences of ini_get with IniWrapper methodsMorris Jobke2015-11-234-7/+9
| * | | | | | | | | Replacing ini_get instances with inigetwrapper usagesClark Tomlinson2015-11-238-12/+11
* | | | | | | | | | Merge pull request #20904 from owncloud/view-mime-filterThomas Müller2015-12-072-6/+37
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix mimetype filter in getDirectoryContentRobin Appelman2015-12-032-6/+37
* | | | | | | | | | | Merge pull request #20949 from owncloud/fix_20892Thomas Müller2015-12-071-4/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [Sharing] Properly check if a group already has accessRoeland Jago Douma2015-12-041-4/+2
* | | | | | | | | | | | Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_ava...Thomas Müller2015-12-074-15/+70
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Do not request an avatar if there is noneRoeland Jago Douma2015-12-041-2/+6
| * | | | | | | | | | | | Only try to load avatars in the user list if there is anyRoeland Jago Douma2015-12-043-13/+64
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #20957 from owncloud/use-correct-method-signatureThomas Müller2015-12-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use correct method signatureLukas Reschke2015-12-041-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 15:34:17 +0000