summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-3117-24/+331
|\
| * [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 detectionjamesryanbell2014-03-171-2/+2
| * | Merge pull request #7720 from ideaship/autoconfig_fixVincent Petry2014-03-281-2/+4
| |\ \
| | * | fix autoconfigideaship2014-03-131-2/+4
| * | | Merge pull request #7107 from owncloud/load-apps-proper-masterThomas Müller2014-03-284-7/+1
| |\ \ \
| | * | | killing some more calls to OC_App::loadApps(); - because we load all apps in ...Thomas Müller2014-03-251-1/+0
| | * | | Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-21297-2992/+2615
| | |\ \ \
| | * | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut...Thomas Müller2014-02-061-2/+1
| | * | | | 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
| |\ \ \ \ \
| | * | | | | 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 bro...Jörn Friedrich Dreyer2014-03-211-0/+1
| | * | | | | 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
| | * | | | | Fixed matchMedia usage to make unit tests work in PhantomJSVincent Petry2014-03-182-42/+52
| | * | | | | 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
| * | | | | | fix SVG replacement for logo so it works in IE8, fix #7866Jan-Christoph Borchardt2014-03-272-2/+2
* | | | | | | 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-03-262-0/+12
* | | | | | Merge pull request #7864 from owncloud/routing-performanceThomas Müller2014-03-251-1/+2
|\ \ \ \ \ \
| * | | | | | update type hint in PHPDocThomas Müller2014-03-251-1/+2
* | | | | | | Merge pull request #7772 from owncloud/filter_more_jsconsoleVicDeo2014-03-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Replace console.time/timeEndThomas Tanghus2014-03-171-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-253-0/+12
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-244-0/+11
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-238-0/+16
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-223-0/+3
* | | | | | Merge pull request #7820 from owncloud/core-macwarningMorris Jobke2014-03-211-0/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Added warning for Mac OS on setup pageVincent Petry2014-03-201-0/+21
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-219-0/+9
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2043-127/+11
* | | | | Fix #7758jbtbnl2014-03-191-1/+1
* | | | | Merge pull request #7557 from owncloud/issue/7297Vincent Petry2014-03-192-1/+21
|\ \ \ \ \
| * | | | | Use tipsy to display error when selecting a date in the pastJoas Schilling2014-03-191-2/+10