summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | clean up the sharing ajax calls, add mail notification classBjoern Schiessle2014-02-191-99/+13
| * | | | | | | | | Merge pull request #7255 from owncloud/fix-admin-remoteLukas Reschke2014-02-201-6/+21
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Check whether the app is setLukas Reschke2014-02-181-1/+4
| | * | | | | | | | Check whether the Key is setLukas Reschke2014-02-181-1/+1
| | * | | | | | | | An admin should not be able to add remote and public services on its own. Thi...Lukas Reschke2014-02-181-6/+18
* | | | | | | | | | remove additional transition rule, reduce width of collapsed search barJan-Christoph Borchardt2014-02-201-5/+1
* | | | | | | | | | restrict zooming in to not mangle layout accidentallyJan-Christoph Borchardt2014-02-201-1/+1
* | | | | | | | | | do not show display name on mobile when profile picture is presentJan-Christoph Borchardt2014-02-203-2/+23
* | | | | | | | | | move avatar into clickable area of user menuJan-Christoph Borchardt2014-02-203-8/+10
* | | | | | | | | | reduce width of searchbox on mobile, fix overlap, fix #7282Jan-Christoph Borchardt2014-02-202-4/+26
|/ / / / / / / / /
* | | | / / / / / Optimize some imageskondou2014-02-19174-2969/+1125
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-194-7/+0
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #7114 from owncloud/scrutinizer_documentation_patchesThomas Müller2014-02-191-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-184-5/+772
| |\| | | | | |
| * | | | | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-143-2/+6
| |\ \ \ \ \ \ \
| * | | | | | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-061-0/+8
* | | | | | | | | Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrectTom Needham2014-02-182-12/+22
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | do not autocapitalize fields on mobile, fix user name input. Also disable aut...Jan-Christoph Borchardt2014-02-182-12/+22
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #7243 from owncloud/core-sessionlifetimedefaultThomas Müller2014-02-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Now using PHP session lifetime as default value for the JS configVincent Petry2014-02-171-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | add cbr/cbz file type icon, fix #6953Jan-Christoph Borchardt2014-02-172-0/+771
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #7132 from owncloud/issue/6920Jan-Christoph Borchardt2014-02-171-4/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |