Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-03 | 1 | -1/+1 |
| | |||||
* | fix h3 style, move out from settings to apps CSS | Jan-Christoph Borchardt | 2014-04-02 | 1 | -1/+3 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 2 | -1/+12 |
| | |||||
* | Merge pull request #7817 from owncloud/app-navigation-for-apps | Morris Jobke | 2014-04-01 | 1 | -2/+6 |
|\ | | | | | Makes #app-navigation a part of app management. | ||||
| * | apply proposed change | Morris Jobke | 2014-04-01 | 1 | -2/+2 |
| | | |||||
| * | merge CSS rules | Morris Jobke | 2014-03-31 | 1 | -4/+2 |
| | | |||||
| * | Removes highlighting of selected items, padding from apps management. | raghunayyar | 2014-03-30 | 1 | -3/+0 |
| | | |||||
| * | Adds Style changes to app-navigation in core/css/apps.css | raghunayyar | 2014-03-24 | 1 | -2/+11 |
| | | |||||
* | | Merge pull request #7943 from hjort/master | Vincent Petry | 2014-04-01 | 1 | -3/+3 |
|\ \ | | | | | | | Correction: failure on sharing when user ID was prefixed by zero | ||||
| * | | Correction: failure on sharing when user ID was prefixed by zero | Rodrigo Hjort | 2014-03-28 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #7975 from owncloud/fix-7973-master-2 | Vincent Petry | 2014-04-01 | 1 | -6/+0 |
|\ \ \ | | | | | | | | | remove pl_PL - fixes #7973 | ||||
| * | | | remove pl_PL - fixes #7973 | Thomas Müller | 2014-03-31 | 1 | -6/+0 |
| | | | | |||||
* | | | | Merge pull request #7915 from owncloud/replace-personalblock | Vincent Petry | 2014-04-01 | 2 | -15/+23 |
|\ \ \ \ | | | | | | | | | | | Replace personalblock with .section | ||||
| * \ \ \ | external storage: fix merge conflict, indentation | Jan-Christoph Borchardt | 2014-03-31 | 17 | -24/+331 |
| |\ \ \ \ | |||||
| * | | | | | remove CSS rules for personalblock, remove it from core | Jan-Christoph Borchardt | 2014-03-27 | 1 | -12/+4 |
| | | | | | | |||||
| * | | | | | general styles for the content area | Jan-Christoph Borchardt | 2014-03-27 | 1 | -3/+19 |
| | |_|/ / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 1 | -0/+7 |
| |_|/ / |/| | | | |||||
* | | | | Merge pull request #7916 from owncloud/fix-input-sizes | Morris Jobke | 2014-03-31 | 1 | -6/+11 |
|\ \ \ \ | |_|/ / |/| | | | Fix input sizes | ||||
| * | | | fix duplicate rules for button/input styles, em to px | Jan-Christoph Borchardt | 2014-03-31 | 1 | -3/+3 |
| | | | | |||||
| * | | | convert input metrics to px | Jan-Christoph Borchardt | 2014-03-27 | 1 | -3/+8 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-30 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #7770 from jamesryanbell/master | Morris Jobke | 2014-03-28 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | SVG support detection | ||||
| * | | | SVG support detection | jamesryanbell | 2014-03-17 | 1 | -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_fix | Vincent Petry | 2014-03-28 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | fix autoconfig | ||||
| * | | | | fix autoconfig | ideaship | 2014-03-13 | 1 | -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-master | Thomas Müller | 2014-03-28 | 4 | -7/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Load apps proper master | ||||
| * | | | | | killing some more calls to OC_App::loadApps(); - because we load all apps in ↵ | Thomas Müller | 2014-03-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | handleRequest() | ||||
| * | | | | | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 297 | -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üller | 2014-02-06 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication and logging | ||||
| * | | | | | | remove some more global variable $RUNTIME_NOAPPS | Thomas Müller | 2014-02-06 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | remove global variable $RUNTIME_NOAPPS - it's just superfluous | Thomas Müller | 2014-02-06 | 1 | -3/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7724 from owncloud/mobile | Thomas Müller | 2014-03-28 | 6 | -6/+302 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [WIP] Mobile optimization for base layout and Files app | ||||
| * | | | | | | | use minimum-scale=1.0 | Thomas Müller | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | mobile: adjust breakpoint in JS as well | Jan-Christoph Borchardt | 2014-03-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | mobile: set a width for navigation popover to it's always 3 columns | Jan-Christoph Borchardt | 2014-03-21 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | mobile: adjust break to 768, also fix min-widths | Jan-Christoph Borchardt | 2014-03-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | mobile: adjust width of app title, fix overlap | Jan-Christoph Borchardt | 2014-03-21 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | add top:45px to position:fixed controls, fixes alignment on android 4.0.4 ↵ | Jörn Friedrich Dreyer | 2014-03-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser | ||||
| * | | | | | | | mobile: show caret indicator next to logo to make clear it is tappable | Jan-Christoph Borchardt | 2014-03-18 | 1 | -0/+8 |
| | | | | | | | | |||||
| * | | | | | | | Define _matchMedia wrapper earlier | Vincent Petry | 2014-03-18 | 1 | -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 PhantomJS | Vincent Petry | 2014-03-18 | 2 | -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 mode | Vincent Petry | 2014-03-18 | 2 | -6/+154 |
| | | | | | | | | |||||
| * | | | | | | | Only enable toggle for sidebar in mobile mode | Vincent Petry | 2014-03-17 | 1 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | add spans around replaced 'Shared' indicators to make text hide on mobile | Jan-Christoph Borchardt | 2014-03-14 | 1 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | mobile: menu togglable for mobile, use code by @PVince81 | Jan-Christoph Borchardt | 2014-03-14 | 2 | -0/+105 |
| | | | | | | | | |||||
| * | | | | | | | mobile: position share dropdown | Jan-Christoph Borchardt | 2014-03-14 | 1 | -0/+6 |
| | | | | | | | | |||||
| * | | | | | | | mobile: don't require a minimum width for controls bar | Jan-Christoph Borchardt | 2014-03-14 | 1 | -0/+5 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-28 | 3 | -4/+15 |
| | | | | | | | | |||||
* | | | | | | | | prevent dimmed ocdialog div from scrolling | Jörn Friedrich Dreyer | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | specify logo to not repeat when container is bigger | Jan-Christoph Borchardt | 2014-03-27 | 1 | -0/+2 |
| | | | | | | | |