summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-2920-37/+37
* Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-292-10/+62
|\
| * serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| * cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
| * update rackspace/opencloud to 1.16.0Robin Appelman2017-03-281-0/+0
* | Merge pull request #4066 from nextcloud/always-fix-the-values-liveRoeland Jago Douma2017-03-297-452/+371
|\ \
| * | Directly fix the valuesJoas Schilling2017-03-267-452/+371
* | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-pJoas Schilling2017-03-292-2/+2
|\ \ \
| * | | Replace unecessary unescaped prints with printLukas Reschke2017-03-292-2/+2
* | | | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \ \ \
| * | | | Remove verbose error messageLukas Reschke2017-03-291-2/+3
| |/ / /
* | | | Merge pull request #4060 from nextcloud/shared_by_for_own_calendarsMorris Jobke2017-03-292-0/+8
|\ \ \ \
| * | | | fix bug with shared_by for own calendars if sharedGeorg Ehrke2017-03-252-0/+8
* | | | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-2810-113/+129
|\ \ \ \ \
| * | | | | Fix unit testsMorris Jobke2017-03-287-113/+113
| * | | | | Web app manifestPierre Rudloff2017-03-283-0/+16
* | | | | | [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
|/ / / / / /