Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adjust design of grid view | Jan-Christoph Borchardt | 2018-10-18 | 1 | -2/+70 |
* | Grid init | John Molakvoæ (skjnldsv) | 2018-10-18 | 3 | -1/+45 |
* | Merge pull request #11785 from nextcloud/3rdparty/azure/1.2.0 | Morris Jobke | 2018-10-18 | 1 | -0/+0 |
|\ | |||||
| * | [3rdparty] Bump azure-storage-blog 1.2.0 | Roeland Jago Douma | 2018-10-18 | 1 | -0/+0 |
* | | Merge pull request #11853 from nextcloud/csp/comments | Morris Jobke | 2018-10-18 | 5 | -27/+56 |
|\ \ | |||||
| * | | Move more comments to compiled handlebars | Roeland Jago Douma | 2018-10-15 | 5 | -27/+56 |
* | | | Merge pull request #11822 from nextcloud/bugfix/noid/forbid_freebusy_but_allo... | Morris Jobke | 2018-10-18 | 7 | -107/+304 |
|\ \ \ | |||||
| * | | | move disableFreeBusy check from User principal backend to Scheduling Outbox c... | Georg Ehrke | 2018-10-16 | 7 | -107/+304 |
* | | | | Merge pull request #11896 from nextcloud/fix/personal-2fa-settings-unreliable... | Morris Jobke | 2018-10-18 | 2 | -10/+0 |
|\ \ \ \ | |||||
| * | | | | Remove unreliable 2FA state message on personal 2FA settings page | Christoph Wurst | 2018-10-18 | 2 | -10/+0 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assets | blizzz | 2018-10-18 | 4 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Don't require Same Site Cookies on assets | Thomas Citharel | 2018-10-17 | 4 | -0/+6 |
* | | | | Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_init | blizzz | 2018-10-17 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Double check for failed cache with a shared storage | Roeland Jago Douma | 2018-10-16 | 1 | -1/+3 |
* | | | | | Merge pull request #11842 from nextcloud/fix/settings-strict-csp | Morris Jobke | 2018-10-17 | 13 | -524/+4522 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Remove Vue compiler because templates have to be precompiled anyway | Christoph Wurst | 2018-10-16 | 13 | -4015/+142 |
| * | | | | Fix unsafe-eval used in 2FA admin settings | Christoph Wurst | 2018-10-16 | 18 | -647/+8518 |
| |/ / / | |||||
* | | | | Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escaping | Morris Jobke | 2018-10-16 | 6 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | Properly escape column name in "createFunction" call | Morris Jobke | 2018-10-16 | 6 | -8/+8 |
| |/ / / | |||||
* | | | | Merge pull request #11835 from nextcloud/csp/jquery_contactsmenu | Morris Jobke | 2018-10-16 | 4 | -15/+31 |
|\ \ \ \ | |||||
| * | | | | Tests: Remove spacing from html before comparing the template | Julius Härtl | 2018-10-16 | 1 | -6/+6 |
| * | | | | Move jquery.contactsmenu.js to compiled handlebars | Roeland Jago Douma | 2018-10-16 | 3 | -9/+25 |
| |/ / / | |||||
* | | | | Merge pull request #11839 from nextcloud/csp/files_drop | Roeland Jago Douma | 2018-10-16 | 6 | -13/+43 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixup! Move files_drop to compiled handlebars | Roeland Jago Douma | 2018-10-16 | 1 | -1/+2 |
| * | | | Move files_drop to compiled handlebars | Roeland Jago Douma | 2018-10-16 | 5 | -12/+41 |
* | | | | Merge pull request #11830 from nextcloud/bugfix/9326/make_sure_usermanager_ge... | Morris Jobke | 2018-10-16 | 2 | -1/+38 |
|\ \ \ \ | |||||
| * | | | | filter null values for UserManager::getByEmail | Georg Ehrke | 2018-10-15 | 2 | -1/+38 |
* | | | | | Merge pull request #11358 from Zulan/fix-welcome-l10n | Morris Jobke | 2018-10-16 | 6 | -115/+41 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Get l10n within NewUserMailHelper to ensure it always uses the new user's lan... | zulan | 2018-10-15 | 6 | -115/+41 |
* | | | | | Merge pull request #11740 from nextcloud/feature/noid/account-api | Roeland Jago Douma | 2018-10-15 | 12 | -20/+810 |
|\ \ \ \ \ | |||||
| * | | | | | Use IAccountManager constants | Julius Härtl | 2018-10-15 | 3 | -68/+67 |
| * | | | | | Update autoloader | Julius Härtl | 2018-10-15 | 2 | -0/+12 |
| * | | | | | Add tests for new account api classes | Julius Härtl | 2018-10-15 | 3 | -0/+253 |
| * | | | | | Add \OCP\Account public API | Julius Härtl | 2018-10-15 | 7 | -20/+546 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #11834 from nextcloud/csp/federationmenu | Roeland Jago Douma | 2018-10-15 | 6 | -20/+53 |
|\ \ \ \ \ | |||||
| * | | | | | Compile federationscope menu handlebars template | Roeland Jago Douma | 2018-10-15 | 6 | -20/+53 |
* | | | | | | Merge pull request #11849 from nextcloud/csp/fileactionsmenu | Roeland Jago Douma | 2018-10-15 | 4 | -23/+56 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Tests: Properly compare the file action label | Julius Härtl | 2018-10-15 | 1 | -1/+1 |
| * | | | | | | Move fileactionsmenu to compiled handlebars | Roeland Jago Douma | 2018-10-15 | 3 | -22/+55 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #10222 from nextcloud/interface-dashboard | Maxence Lange | 2018-10-15 | 16 | -0/+1771 |
|\ \ \ \ \ \ | |||||
| * | | | | | | include dashboard into core | Maxence Lange | 2018-10-15 | 16 | -0/+1771 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #11848 from nextcloud/csp/workflowengine | Julius Härtl | 2018-10-15 | 7 | -72/+181 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Move workflowengine to compiled handlebars | Roeland Jago Douma | 2018-10-15 | 7 | -72/+181 |
* | | | | | | Merge pull request #11838 from nextcloud/bugfix/noid/fix-default-types-of-mem... | Roeland Jago Douma | 2018-10-15 | 1 | -6/+6 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix default types of activity event member variables | Joas Schilling | 2018-10-15 | 1 | -6/+6 |
* | | | | | | Merge pull request #11714 from nextcloud/lookupserver-and-global-scale | Björn Schießle | 2018-10-15 | 2 | -5/+307 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | add more tests | Bjoern Schiessle | 2018-10-12 | 1 | -0/+231 |
| * | | | | | some small fixes and improvements | Bjoern Schiessle | 2018-10-10 | 2 | -6/+29 |
| * | | | | | adjust tests | Bjoern Schiessle | 2018-10-09 | 2 | -3/+32 |
| * | | | | | always query the lookup server in a global scale setup and have a nicer label | Bjoern Schiessle | 2018-10-09 | 1 | -3/+22 |