Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rename confusing getMailHeaderColor to getColorPrimary, ref #3491 | Jan-Christoph Borchardt | 2017-03-29 | 20 | -37/+37 |
* | Merge pull request #4116 from nextcloud/swift-cache-token | Roeland Jago Douma | 2017-03-29 | 2 | -10/+62 |
|\ | |||||
| * | serialize the token to json instead of using php's serialize | Robin Appelman | 2017-03-28 | 1 | -10/+36 |
| * | cache swift tokens in memcache | Robin Appelman | 2017-03-28 | 1 | -10/+36 |
| * | update rackspace/opencloud to 1.16.0 | Robin Appelman | 2017-03-28 | 1 | -0/+0 |
* | | Merge pull request #4066 from nextcloud/always-fix-the-values-live | Roeland Jago Douma | 2017-03-29 | 7 | -452/+371 |
|\ \ | |||||
| * | | Directly fix the values | Joas Schilling | 2017-03-26 | 7 | -452/+371 |
* | | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p | Joas Schilling | 2017-03-29 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Replace unecessary unescaped prints with print | Lukas Reschke | 2017-03-29 | 2 | -2/+2 |
* | | | | Merge pull request #4129 from nextcloud/remove-verbose-error-message | Joas Schilling | 2017-03-29 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Remove verbose error message | Lukas Reschke | 2017-03-29 | 1 | -2/+3 |
| |/ / / | |||||
* | | | | Merge pull request #4060 from nextcloud/shared_by_for_own_calendars | Morris Jobke | 2017-03-29 | 2 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | fix bug with shared_by for own calendars if shared | Georg Ehrke | 2017-03-25 | 2 | -0/+8 |
* | | | | | Merge pull request #4091 from nextcloud/Rudloff-manifest | Morris Jobke | 2017-03-28 | 10 | -113/+129 |
|\ \ \ \ \ | |||||
| * | | | | | Fix unit tests | Morris Jobke | 2017-03-28 | 7 | -113/+113 |
| * | | | | | Web app manifest | Pierre Rudloff | 2017-03-28 | 3 | -0/+16 |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-29 | 52 | -76/+418 |
* | | | | | | Merge pull request #4120 from nextcloud/newest-item-first-in-activity | Morris Jobke | 2017-03-28 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Change the order on merging activities so the newest item is first | Joas Schilling | 2017-03-28 | 1 | -4/+4 |
* | | | | | | | Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar | Morris Jobke | 2017-03-28 | 3 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Better styling of the empty content messages in the sidebar | Joas Schilling | 2017-03-28 | 3 | -6/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #4127 from nextcloud/update-legacy-csp-policy | Morris Jobke | 2017-03-28 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Update legacy CSP policy | Lukas Reschke | 2017-03-28 | 1 | -1/+3 |
* | | | | | | | Merge pull request #4121 from nextcloud/split-sharing-integration-tests | Morris Jobke | 2017-03-28 | 3 | -710/+728 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Split long running features/sharing-v1.feature into two smaller parts | Morris Jobke | 2017-03-28 | 3 | -710/+728 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4070 from nextcloud/gzip_scss_js | Morris Jobke | 2017-03-28 | 8 | -35/+327 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix controller tests | Roeland Jago Douma | 2017-03-28 | 2 | -2/+134 |
| * | | | | | | Fix tests | Roeland Jago Douma | 2017-03-28 | 3 | -29/+117 |
| * | | | | | | Allow to gzip CSS/JS files | Roeland Jago Douma | 2017-03-28 | 4 | -5/+77 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4054 from nextcloud/inlinejsfirst | Joas Schilling | 2017-03-28 | 3 | -15/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Moving the inline js before the CSS | Roeland Jago Douma | 2017-03-28 | 3 | -15/+15 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4004 from nextcloud/backport-27172 | Roeland Jago Douma | 2017-03-28 | 6 | -1/+73 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | fix shared storage numeric id | Robin Appelman | 2017-03-27 | 3 | -0/+11 |
| * | | | | | do not remove the method and only keep the tests | Morris Jobke | 2017-03-23 | 1 | -0/+8 |
| * | | | | | Remove SharedCache::getNumericStorageId to let CacheWrapper do it | Vincent Petry | 2017-03-23 | 5 | -9/+62 |
* | | | | | | Merge pull request #4112 from nextcloud/swift-config | Robin Appelman | 2017-03-28 | 1 | -5/+80 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | better error messages for invalid regions, urltypes and service names | Robin Appelman | 2017-03-28 | 1 | -4/+63 |
| * | | | | | better error messages when swift authentication fails | Robin Appelman | 2017-03-28 | 1 | -1/+17 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #4101 from nextcloud/header-detail | Morris Jobke | 2017-03-28 | 1 | -6/+1 |
|\ \ \ \ \ | |||||
| * | | | | | show active indicator on current app even when hovering other icons | Jan-Christoph Borchardt | 2017-03-27 | 1 | -6/+1 |
* | | | | | | Merge pull request #4082 from nextcloud/fix-menu | John Molakvoæ | 2017-03-28 | 2 | -19/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | highlight active entry in personal info menu again | Jan-Christoph Borchardt | 2017-03-27 | 1 | -5/+5 |
| * | | | | | | Fix pop over menu opacity | Morris Jobke | 2017-03-26 | 2 | -18/+25 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-28 | 88 | -52/+254 |
* | | | | | | Merge pull request #4107 from nextcloud/users-settings-label | Morris Jobke | 2017-03-27 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add Settings label to users settings for consistency | Jan-Christoph Borchardt | 2017-03-28 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4084 from nextcloud/fix-log-spam-with-too-few-navigation-... | Morris Jobke | 2017-03-27 | 1 | -5/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't spam the log with "Undefined index showInHeader" | Joas Schilling | 2017-03-27 | 1 | -5/+3 |
* | | | | | | | Merge pull request #4083 from nextcloud/update-strengthify | Morris Jobke | 2017-03-27 | 5 | -10/+15 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Update strengthify and fix password strength | Morris Jobke | 2017-03-27 | 5 | -10/+15 |
|/ / / / / / |