summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7409 from owncloud/issue/5361Thomas Müller2014-02-261-2/+4
|\
| * Add owncloud version to JS scopeJoas Schilling2014-02-261-2/+4
* | Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-0/+28
|\ \ | |/ |/|
| * Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-261-2/+2
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-0/+28
* | Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-241-13/+18
|\ \
| * | rename url parameterRobin Appelman2014-02-241-1/+1
| * | Add url parameter to control whether previews should return 404 when the mime...Robin Appelman2014-02-211-1/+2
| * | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-217-15/+62
| |\ \
| * \ \ Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-20186-3152/+1264
| |\ \ \
| * | | | Show svg mime icons when no preview is availableRobin Appelman2014-02-191-13/+17
* | | | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1Morris Jobke2014-02-242-0/+18
|\ \ \ \ \
| * | | | | Added oc_defaults stub in specHelper.jsVincent Petry2014-02-241-0/+1
| * | | | | Merge branch 'master' into GuillaumeAmat-patch-1Robin Appelman2014-02-2116-24/+109
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa...Vincent Petry2014-02-201-0/+17
| |\ \ \ \ \ \
| | * | | | | | Adds OC_Defaults values in javascript configGuillaume AMAT2014-02-131-0/+17
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge pull request #7344 from owncloud/add-js-config-varsicewind19912014-02-241-3/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into add-js-config-varsRobin Appelman2014-02-216-15/+67
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Allow apps to add/modify config js output via hook.ringmaster2014-02-201-3/+6
* | | | | | | | Merge pull request #7310 from owncloud/no-css-js-delivery-via-phpMorris Jobke2014-02-213-21/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-216-15/+56
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-2112-9/+42
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-20180-3081/+1159
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | kill references to core.js and core.cssThomas Müller2014-02-201-15/+0
| * | | | | | | | kill old minimizer codeThomas Müller2014-02-201-3/+0
| * | | | | | | | fixing js syntax errorThomas Müller2014-02-201-3/+3
* | | | | | | | | Merge pull request #7355 from owncloud/new-menu-svgicewind19912014-02-211-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use SVG icons from icons.css for New file menuJan-Christoph Borchardt2014-02-211-0/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirsMorris Jobke2014-02-211-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | use directory from original instead of current dirJörn Friedrich Dreyer2014-02-211-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #7336 from owncloud/IE-wipho-viewporticewind19912014-02-211-0/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix viewport size on windows phoneRobin Appelman2014-02-201-0/+11
* | | | | | | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-2114-114/+76
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #7291 from owncloud/adminess-raghuLukas Reschke2014-02-201-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix typoLukas Reschke2014-02-201-1/+1
| | * | | | | | Variable value is expected and not an echoed outputLukas Reschke2014-02-201-1/+1
| | * | | | | | Move oc_isadmin to the config JS scriptLukas Reschke2014-02-203-2/+2
| | * | | | | | Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-192-1/+2
| | | |_|_|/ / | | |/| | | |
| * | | | | | fix IE10 viewport sizeingRobin Appelman2014-02-201-0/+5
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #7056 from owncloud/users-scrollperformanceJan-Christoph Borchardt2014-02-202-1/+19
| |\ \ \ \ \
| | * | | | | Improve users list scrolling performanceVincent Petry2014-02-172-1/+19
| * | | | | | Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fixJan-Christoph Borchardt2014-02-201-5/+0
| |\ \ \ \ \ \
| | * | | | | | remove fix for IE9 nav bar widthKonstantin.Popov2014-01-171-5/+0
| * | | | | | | Merge pull request #7289 from owncloud/fix-filetype-iconsLukas Reschke2014-02-206-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge masterJan-Christoph Borchardt2014-02-20168-2847/+1017
| | |\ \ \ \ \ \ \
| | * | | | | | | | Optimize imageskondou2014-02-196-122/+108
| | * | | | | | | | fix lots of file type icons for archives, js, flash, ics, fonts, code, ...Jan-Christoph Borchardt2014-02-196-0/+0
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-coreJörn Friedrich Dreyer2014-02-203-3/+17
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Moved Core Theme Logos to CSSJake Wilson2013-10-103-3/+17
| * | | | | | | | Merge pull request #7247 from owncloud/sharing_cleanup_step1Björn Schießle2014-02-201-99/+13
| |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 23:42:15 +0000