summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #8866 from owncloud/flock-quotafixVincent Petry2014-06-051-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed quota wrapper to return the value from flock()Vincent Petry2014-06-041-1/+1
* | | | | | | Merge pull request #8894 from owncloud/public-share-js-overwriteThomas Müller2014-06-051-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Dont overwrite OCA.SharingRobin Appelman2014-06-051-1/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #8890 from owncloud/cleanup-trashsizes-table-masterThomas Müller2014-06-052-33/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | table files_trashsizes was still used in some locations -> removedThomas Müller2014-06-052-33/+2
* | | | | | | Merge pull request #8880 from owncloud/webdav-read-permissionsThomas Müller2014-06-051-0/+24
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Use the permissions exposed by ownCloud for webdav external storagesRobin Appelman2014-06-041-0/+24
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #8883 from owncloud/files-slide-toggleJan-Christoph Borchardt2014-06-052-8/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | use slide toggle for files appBernhard Posselt2014-06-052-8/+2
* | | | | | Merge pull request #7878 from owncloud/quota-extstorageswitchicewind19912014-06-054-24/+180
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added experimental switch to count external storage data in quotaVincent Petry2014-06-044-24/+180
| |/ / / /
* | | | | Merge pull request #8861 from owncloud/share-overview-linklistVincent Petry2014-06-054-2/+146
|\ \ \ \ \
| * | | | | Fixed wording to "Shared by link"Vincent Petry2014-06-042-3/+3
| * | | | | Added "Shared with link" sidebar section in files appVincent Petry2014-06-044-2/+146
* | | | | | Merge pull request #8884 from owncloud/move-flock-to-appJörn Friedrich Dreyer2014-06-054-564/+0
|\ \ \ \ \ \
| * | | | | | remove file locking - code will continue to live in it's own appThomas Müller2014-06-044-564/+0
* | | | | | | 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
|\ \ \ \ \