summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-2920-37/+37
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #4116 from nextcloud/swift-cache-tokenRoeland Jago Douma2017-03-292-10/+62
|\ | | | | Cache swift authentication token in memcache
| * serialize the token to json instead of using php's serializeRobin Appelman2017-03-281-10/+36
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * cache swift tokens in memcacheRobin Appelman2017-03-281-10/+36
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * update rackspace/opencloud to 1.16.0Robin Appelman2017-03-281-0/+0
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4066 from nextcloud/always-fix-the-values-liveRoeland Jago Douma2017-03-297-452/+371
|\ \ | | | | | | Directly fix invalid values of DTEND and DTSTART
| * | Directly fix the valuesJoas Schilling2017-03-267-452/+371
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-pJoas Schilling2017-03-292-2/+2
|\ \ \ | | | | | | | | Replace unecessary unescaped prints with print
| * | | Replace unecessary unescaped prints with printLukas Reschke2017-03-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4129 from nextcloud/remove-verbose-error-messageJoas Schilling2017-03-291-2/+3
|\ \ \ \ | | | | | | | | | | Remove verbose error message
| * | | | Remove verbose error messageLukas Reschke2017-03-291-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | There's no need to have this included in the error message. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | 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 shared
| * | | | fix bug with shared_by for own calendars if sharedGeorg Ehrke2017-03-252-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-2810-113/+129
|\ \ \ \ \ | | | | | | | | | | | | Web app manifest for adding to Android home screen
| * | | | | Fix unit testsMorris Jobke2017-03-287-113/+113
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Web app manifestPierre Rudloff2017-03-283-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | [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 first
| * | | | | | Change the order on merging activities so the newest item is firstJoas Schilling2017-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | 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 sidebar
| * | | | | | | Better styling of the empty content messages in the sidebarJoas Schilling2017-03-283-6/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policyMorris Jobke2017-03-281-1/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update legacy CSP policy
| * | | | | | Update legacy CSP policyLukas Reschke2017-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns it with the one enforced by the AppFramework Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | | 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 parts
| * | | | | | | Split long running features/sharing-v1.feature into two smaller partsMorris Jobke2017-03-283-710/+728
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #4070 from nextcloud/gzip_scss_jsMorris Jobke2017-03-288-35/+327
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | GZip generated CSS/JS files
| * | | | | | Fix controller testsRoeland Jago Douma2017-03-282-2/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Fix testsRoeland Jago Douma2017-03-283-29/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Allow to gzip CSS/JS filesRoeland Jago Douma2017-03-284-5/+77
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since in production the SCSS files are compiled once and the javascript files are combined once we can just as well gzip them aggresively. This means that once they are requested and the browser supports gzip we can just serve the gzipped file saving precious bandwidth. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4054 from nextcloud/inlinejsfirstJoas Schilling2017-03-283-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moving the inline js before the CSS
| * | | | | | Moving the inline js before the CSSRoeland Jago Douma2017-03-283-15/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows browsers to do smarted parallel downloads Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4004 from nextcloud/backport-27172Roeland Jago Douma2017-03-286-1/+73
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do it
| * | | | | fix shared storage numeric idRobin Appelman2017-03-273-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | do not remove the method and only keep the testsMorris Jobke2017-03-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do itVincent Petry2017-03-235-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CacheWrapper will properly forward the call to the wrapped cache. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4112 from nextcloud/swift-configRobin Appelman2017-03-281-5/+80
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Better error messages for objectsack swift configuration
| * | | | | better error messages for invalid regions, urltypes and service namesRobin Appelman2017-03-281-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | better error messages when swift authentication failsRobin Appelman2017-03-281-1/+17
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #4101 from nextcloud/header-detailMorris Jobke2017-03-281-6/+1
|\ \ \ \ \ | | | | | | | | | | | | show active indicator on current app even when hovering other icons
| * | | | | show active indicator on current app even when hovering other iconsJan-Christoph Borchardt2017-03-271-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #4082 from nextcloud/fix-menuJohn Molakvoæ2017-03-282-19/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix pop over menu opacity
| * | | | | | highlight active entry in personal info menu againJan-Christoph Borchardt2017-03-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | Fix pop over menu opacityMorris Jobke2017-03-262-18/+25
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [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 consistency
| * | | | | | add Settings label to users settings for consistencyJan-Christoph Borchardt2017-03-281-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #4084 from ↵Morris Jobke2017-03-271-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-log-spam-with-too-few-navigation-items Don't spam the log with "Undefined index showInHeader"
| * | | | | | Don't spam the log with "Undefined index showInHeader"Joas Schilling2017-03-271-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #4083 from nextcloud/update-strengthifyMorris Jobke2017-03-275-10/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update strengthify and fix password strength
| * | | | | | Update strengthify and fix password strengthMorris Jobke2017-03-275-10/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 16:38:41 +0000