summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-2952-76/+418
* Merge pull request #4120 from nextcloud/newest-item-first-in-activityMorris Jobke2017-03-281-4/+4
|\
| * Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
* | Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebarMorris Jobke2017-03-283-6/+6
|\ \
| * | Better styling of the empty content messages in the sidebarJoas Schilling2017-03-283-6/+6
* | | Merge pull request #4127 from nextcloud/update-legacy-csp-policyMorris Jobke2017-03-281-1/+3
|\ \ \
| * | | Update legacy CSP policyLukas Reschke2017-03-281-1/+3
* | | | Merge pull request #4121 from nextcloud/split-sharing-integration-testsMorris Jobke2017-03-283-710/+728
|\ \ \ \
| * | | | Split long running features/sharing-v1.feature into two smaller partsMorris Jobke2017-03-283-710/+728
* | | | | Merge pull request #4070 from nextcloud/gzip_scss_jsMorris Jobke2017-03-288-35/+327
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix controller testsRoeland Jago Douma2017-03-282-2/+134
| * | | | Fix testsRoeland Jago Douma2017-03-283-29/+117
| * | | | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-284-5/+77
| | |/ / | |/| |
* | | | Merge pull request #4054 from nextcloud/inlinejsfirstJoas Schilling2017-03-283-15/+15
|\ \ \ \
| * | | | Moving the inline js before the CSSRoeland Jago Douma2017-03-283-15/+15
| |/ / /
* | | | Merge pull request #4004 from nextcloud/backport-27172Roeland Jago Douma2017-03-286-1/+73
|\ \ \ \ | |/ / / |/| | |
| * | | fix shared storage numeric idRobin Appelman2017-03-273-0/+11
| * | | do not remove the method and only keep the testsMorris Jobke2017-03-231-0/+8
| * | | Remove SharedCache::getNumericStorageId to let CacheWrapper do itVincent Petry2017-03-235-9/+62
* | | | Merge pull request #4112 from nextcloud/swift-configRobin Appelman2017-03-281-5/+80
|\ \ \ \ | |_|_|/ |/| | |
| * | | better error messages for invalid regions, urltypes and service namesRobin Appelman2017-03-281-4/+63
| * | | better error messages when swift authentication failsRobin Appelman2017-03-281-1/+17
| | |/ | |/|
* | | Merge pull request #4101 from nextcloud/header-detailMorris Jobke2017-03-281-6/+1
|\ \ \
| * | | show active indicator on current app even when hovering other iconsJan-Christoph Borchardt2017-03-271-6/+1
* | | | Merge pull request #4082 from nextcloud/fix-menuJohn Molakvoæ2017-03-282-19/+26
|\ \ \ \
| * | | | highlight active entry in personal info menu againJan-Christoph Borchardt2017-03-271-5/+5
| * | | | Fix pop over menu opacityMorris Jobke2017-03-262-18/+25
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-2888-52/+254
* | | | Merge pull request #4107 from nextcloud/users-settings-labelMorris Jobke2017-03-271-2/+2
|\ \ \ \
| * | | | add Settings label to users settings for consistencyJan-Christoph Borchardt2017-03-281-2/+2
|/ / / /
* | | | Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-...Morris Jobke2017-03-271-5/+3
|\ \ \ \
| * | | | Don't spam the log with "Undefined index showInHeader"Joas Schilling2017-03-271-5/+3
* | | | | Merge pull request #4083 from nextcloud/update-strengthifyMorris Jobke2017-03-275-10/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update strengthify and fix password strengthMorris Jobke2017-03-275-10/+15
|/ / / /
* | | | Merge pull request #4094 from nextcloud/ldap-descriptionMorris Jobke2017-03-271-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/nextcloud/serverMarius Blüm2017-03-272-17/+49
| |\ \ \ \
| * | | | | Fix LDAP descriptionMarius Blüm2017-03-271-2/+2
* | | | | | Merge pull request #4092 from nextcloud/theme-favicon-mask-colorMorris Jobke2017-03-273-3/+3
|\ \ \ \ \ \
| * | | | | | use theming colors for favicon on macOSJan-Christoph Borchardt2017-03-273-3/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4096 from nextcloud/touch-floorMorris Jobke2017-03-272-1/+18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | round the mtime in touchRobin Appelman2017-03-272-1/+18
| | |_|/ / | |/| | |
* | | | | Merge pull request #4027 from nextcloud/better-spreed-call-urlsRobin Appelman2017-03-272-17/+49
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Throw a nice HintException when the apps are missingJoas Schilling2017-03-241-10/+30
| * | | | Allow to use short URLs for callsJoas Schilling2017-03-241-0/+6
| * | | | Allow to push a non-query URL to the browser historyJoas Schilling2017-03-241-9/+15
* | | | | Merge pull request #4072 from nextcloud/move-x-frame-options-into-phpGeorg Ehrke2017-03-272-2/+1
|\ \ \ \ \
| * | | | | Move X-Frame-Options into PHPLukas Reschke2017-03-262-2/+1
* | | | | | Merge pull request #4073 from nextcloud/secure-dropRoeland Jago Douma2017-03-271-1/+1
|\ \ \ \ \ \
| * | | | | | Rename File drop to Secure dropOlivier Paroz2017-03-261-1/+1
| |/ / / / /
* | | | | | Merge pull request #4064 from nextcloud/update-momentRoeland Jago Douma2017-03-277-24507/+1017
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |