summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-0513-418/+397
|\
| * fix leading decimal Scrutinizer coding style issueJan-Christoph Borchardt2014-06-051-3/+3
| * fix unit test templateMorris Jobke2014-06-051-1/+1
| * fix first failing testMorris Jobke2014-06-051-2/+1
| * add to app navigation after enablingMorris Jobke2014-06-041-8/+10
| * hover effect for app switcher labelJan-Christoph Borchardt2014-06-041-6/+18
| * fix related layout issues in user managementJan-Christoph Borchardt2014-06-043-2/+6
| * add a bit of whitespace to the bottom of the app listJan-Christoph Borchardt2014-06-041-0/+1
| * reduce opacity of app icon when loadingJan-Christoph Borchardt2014-06-041-5/+3
| * more CSS rearranging, removing duplicate codeJan-Christoph Borchardt2014-06-042-62/+52
| * rearrange CSS, remove duplicate codeJan-Christoph Borchardt2014-06-043-154/+109
| * move 'add apps' entry into normal navigation instead of a new lineJan-Christoph Borchardt2014-06-042-17/+5
| * better loading feedback for app start, move from JS to CSSJan-Christoph Borchardt2014-06-043-2/+25
| * show 'Apps' as fallback label for app switcher if no app title is present (fo...Jan-Christoph Borchardt2014-06-041-1/+1
| * show loading feedbackJan-Christoph Borchardt2014-06-041-2/+10
| * separate home icon and menu toggleJan-Christoph Borchardt2014-06-042-0/+8
| * show appname on mobile since now there's enough spaceJan-Christoph Borchardt2014-06-041-9/+0
| * cut ownCloud text from logo when logged in, place appname thereJan-Christoph Borchardt2014-06-044-5/+84
| * reduce font size of appname in headerJan-Christoph Borchardt2014-06-042-6/+9
| * drop "push" element - no sticky footer needed anymoreMorris Jobke2014-06-043-7/+3
| * Remove obsoleted code to trigger navigation menuVincent Petry2014-06-042-106/+9
| * fix navigation bubble width and height on mobileJan-Christoph Borchardt2014-06-041-2/+2
| * show appname next to logo for better hint at navigationJan-Christoph Borchardt2014-06-044-8/+38
| * toggle the navigation on desktop, not only on mobileJan-Christoph Borchardt2014-06-041-8/+2
| * adjust controls bar position for removed nav barJan-Christoph Borchardt2014-06-041-1/+1
| * hide navigation by default, not only on small screens, first stepJan-Christoph Borchardt2014-06-043-80/+75
* | Merge pull request #8862 from owncloud/share-overview-fixmimetypeicewind19912014-06-051-4/+2
|\ \
| * | Fix mime type returning for "shared with others" filesVincent Petry2014-06-041-4/+2
* | | Merge pull request #8878 from owncloud/update-checkmigrationforappsVincent Petry2014-06-058-38/+126
|\ \ \
| * | | Do not load apps when upgrade is neededVincent Petry2014-06-041-1/+1
| * | | Removed simulate db update flag and split into separate methodsVincent Petry2014-06-043-23/+47
| * | | Simulate apps database schema update on upgradeVincent Petry2014-06-047-38/+102
* | | | Merge pull request #8852 from owncloud/kill-permissions-masterThomas Müller2014-06-0523-640/+29
|\ \ \ \
| * | | | - drop permissions table and related codeThomas Müller2014-06-0523-640/+29
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-05817-12478/+17543
* | | | | Merge pull request #8882 from owncloud/remove-placeholdercallMorris Jobke2014-06-051-2/+0
|\ \ \ \ \
| * | | | | remove obsolete placeholder call, fix #8881Jan-Christoph Borchardt2014-06-041-2/+0
* | | | | | Merge pull request #8724 from owncloud/update-sabre-2.0Thomas Müller2014-06-0434-212/+193
|\ \ \ \ \ \
| * | | | | | use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterfaceThomas Müller2014-06-043-10/+1
| * | | | | | Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-0434-212/+202
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #8824 from owncloud/mail_template_editing_in_webuiMorris Jobke2014-06-0410-0/+457
|\ \ \ \ \ \
| * | | | | | fixes during testThomas Müller2014-06-044-59/+32
| * | | | | | convert mail template editor to app framework for a restful apiJörn Friedrich Dreyer2014-06-0313-141/+204
| * | | | | | minimal mail template editor for administrators, refs #7177Jörn Friedrich Dreyer2014-06-0211-0/+421
* | | | | | | Merge pull request #8471 from owncloud/versioning_no_longer_track_the_sizeThomas Müller2014-06-047-118/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix merge conflictThomas Müller2014-06-031-31/+0
| * | | | | | | use OC_DB::dropTable()Thomas Müller2014-06-022-4/+2
| * | | | | | | return size '0' if the trashbin folder doesn't exists yetBjoern Schiessle2014-06-021-2/+2
| * | | | | | | let file cache handle the versions sizeBjoern Schiessle2014-06-025-87/+14
* | | | | | | | Merge pull request #8876 from owncloud/design-css-settingsMorris Jobke2014-06-041-4/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |