summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-031-1/+1
|
* fix h3 style, move out from settings to apps CSSJan-Christoph Borchardt2014-04-021-1/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-022-1/+12
|
* Merge pull request #7817 from owncloud/app-navigation-for-appsMorris Jobke2014-04-011-2/+6
|\ | | | | Makes #app-navigation a part of app management.
| * apply proposed changeMorris Jobke2014-04-011-2/+2
| |
| * merge CSS rulesMorris Jobke2014-03-311-4/+2
| |
| * Removes highlighting of selected items, padding from apps management.raghunayyar2014-03-301-3/+0
| |
| * Adds Style changes to app-navigation in core/css/apps.cssraghunayyar2014-03-241-2/+11
| |
* | Merge pull request #7943 from hjort/masterVincent Petry2014-04-011-3/+3
|\ \ | | | | | | Correction: failure on sharing when user ID was prefixed by zero
| * | Correction: failure on sharing when user ID was prefixed by zeroRodrigo Hjort2014-03-281-3/+3
| | |
* | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-011-6/+0
|\ \ \ | | | | | | | | remove pl_PL - fixes #7973
| * | | remove pl_PL - fixes #7973Thomas Müller2014-03-311-6/+0
| | | |
* | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-012-15/+23
|\ \ \ \ | | | | | | | | | | Replace personalblock with .section
| * \ \ \ external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-3117-24/+331
| |\ \ \ \
| * | | | | remove CSS rules for personalblock, remove it from coreJan-Christoph Borchardt2014-03-271-12/+4
| | | | | |
| * | | | | general styles for the content areaJan-Christoph Borchardt2014-03-271-3/+19
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-011-0/+7
| |_|/ / |/| | |
* | | | Merge pull request #7916 from owncloud/fix-input-sizesMorris Jobke2014-03-311-6/+11
|\ \ \ \ | |_|/ / |/| | | Fix input sizes
| * | | fix duplicate rules for button/input styles, em to pxJan-Christoph Borchardt2014-03-311-3/+3
| | | |
| * | | convert input metrics to pxJan-Christoph Borchardt2014-03-271-3/+8
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-301-0/+2
| | |
* | | Merge pull request #7770 from jamesryanbell/masterMorris Jobke2014-03-281-2/+2
|\ \ \ | | | | | | | | SVG support detection
| * | | SVG support detectionjamesryanbell2014-03-171-2/+2
| | | | | | | | | | | | The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
* | | | Merge pull request #7720 from ideaship/autoconfig_fixVincent Petry2014-03-281-2/+4
|\ \ \ \ | | | | | | | | | | fix autoconfig
| * | | | fix autoconfigideaship2014-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In array_merge, $post overrides $opts (concerns data directory). Always merge $post before calling display(). Default value for dbtype which may still be undefined in display(). Fixes several problems related to autoconfig: - installation.php only showed $AUTOCONFIG data if it was called after install() had come back with errors - if autoconfig.php was set, installation.php showed an editable field with the wrong data in it; then, regardless of any changes, the value from autoconfig.php was used - installation.php used undefined indeces (dbtype, dbIsSet, directoryIsSet)
* | | | | Merge pull request #7107 from owncloud/load-apps-proper-masterThomas Müller2014-03-284-7/+1
|\ \ \ \ \ | | | | | | | | | | | | Load apps proper master
| * | | | | killing some more calls to OC_App::loadApps(); - because we load all apps in ↵Thomas Müller2014-03-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | handleRequest()
| * | | | | Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-21297-2992/+2615
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php
| * | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, ↵Thomas Müller2014-02-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication and logging
| * | | | | | remove some more global variable $RUNTIME_NOAPPSThomas Müller2014-02-061-1/+0
| | | | | | |
| * | | | | | remove global variable $RUNTIME_NOAPPS - it's just superfluousThomas Müller2014-02-061-3/+0
| | | | | | |
* | | | | | | Merge pull request #7724 from owncloud/mobileThomas Müller2014-03-286-6/+302
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [WIP] Mobile optimization for base layout and Files app
| * | | | | | | use minimum-scale=1.0Thomas Müller2014-03-251-1/+1
| | | | | | | |
| * | | | | | | mobile: adjust breakpoint in JS as wellJan-Christoph Borchardt2014-03-211-1/+1
| | | | | | | |
| * | | | | | | mobile: set a width for navigation popover to it's always 3 columnsJan-Christoph Borchardt2014-03-211-2/+1
| | | | | | | |
| * | | | | | | mobile: adjust break to 768, also fix min-widthsJan-Christoph Borchardt2014-03-211-1/+1
| | | | | | | |
| * | | | | | | mobile: adjust width of app title, fix overlapJan-Christoph Borchardt2014-03-211-2/+2
| | | | | | | |
| * | | | | | | add top:45px to position:fixed controls, fixes alignment on android 4.0.4 ↵Jörn Friedrich Dreyer2014-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser
| * | | | | | | mobile: show caret indicator next to logo to make clear it is tappableJan-Christoph Borchardt2014-03-181-0/+8
| | | | | | | |
| * | | | | | | Define _matchMedia wrapper earlierVincent Petry2014-03-181-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unit test stub didn't work because the _matchMedia wrapper was defined too late. This fix defines it earlier.
| * | | | | | | Fixed matchMedia usage to make unit tests work in PhantomJSVincent Petry2014-03-182-42/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhantomJS has a bug that makes it impossible to properly stub window.matchMedia. This fix adds a wrapper as OC._matchMedia that is used for unit tests
| * | | | | | | Add/remove main menu action when switching between desktop/mobile modeVincent Petry2014-03-182-6/+154
| | | | | | | |
| * | | | | | | Only enable toggle for sidebar in mobile modeVincent Petry2014-03-171-1/+6
| | | | | | | |
| * | | | | | | add spans around replaced 'Shared' indicators to make text hide on mobileJan-Christoph Borchardt2014-03-141-4/+4
| | | | | | | |
| * | | | | | | mobile: menu togglable for mobile, use code by @PVince81Jan-Christoph Borchardt2014-03-142-0/+105
| | | | | | | |
| * | | | | | | mobile: position share dropdownJan-Christoph Borchardt2014-03-141-0/+6
| | | | | | | |
| * | | | | | | mobile: don't require a minimum width for controls barJan-Christoph Borchardt2014-03-141-0/+5
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-283-4/+15
| | | | | | | |
* | | | | | | | prevent dimmed ocdialog div from scrollingJörn Friedrich Dreyer2014-03-281-1/+1
| | | | | | | |
* | | | | | | | specify logo to not repeat when container is biggerJan-Christoph Borchardt2014-03-271-0/+2
| | | | | | | |