summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-062-2/+5
* Merge pull request #8072 from owncloud/slideshow-buttonsjbtbnl2014-04-061-1/+1
|\
| * Fix slideshow buttons being invisibleRobin Appelman2014-04-061-1/+1
* | Merge pull request #8061 from owncloud/remove-uneeded-fileTom Needham2014-04-051-39/+0
|\ \ | |/ |/|
| * Delete auth.cssLukas Reschke2014-04-041-39/+0
* | Replace echo with `p` or `print_unescaped`Lukas Reschke2014-04-041-5/+5
|/
* Show higher resolution previews for high dpi screensRobin Appelman2014-04-041-0/+4
* Merge pull request #6968 from owncloud/files-ajaxloadMorris Jobke2014-04-034-12/+112
|\
| * Fixed mime type attribute access in file overwrite dialogVincent Petry2014-04-031-1/+1
| * Files, trashbin, public apps use ajax/JSON for the file listVincent Petry2014-04-023-4/+19
| * Fixed parseQueryString to handle empty values and plus signsVincent Petry2014-04-012-7/+92
* | [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
|\
| * 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 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 #7973Thomas Müller2014-03-311-6/+0
* | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-012-15/+23
|\ \ \ \
| * \ \ \ 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 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 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