aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix select statementRobin Appelman2018-10-1724-435/+952
* Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_initblizzz2018-10-171-1/+3
|\
| * Double check for failed cache with a shared storageRoeland Jago Douma2018-10-161-1/+3
* | Merge pull request #11842 from nextcloud/fix/settings-strict-cspMorris Jobke2018-10-1713-524/+4522
|\ \
| * | Remove Vue compiler because templates have to be precompiled anywayChristoph Wurst2018-10-1613-4015/+142
| * | Fix unsafe-eval used in 2FA admin settingsChristoph Wurst2018-10-1618-647/+8518
| |/
* | Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escapingMorris Jobke2018-10-166-8/+8
|\ \
| * | Properly escape column name in "createFunction" callMorris Jobke2018-10-166-8/+8
| |/
* | Merge pull request #11835 from nextcloud/csp/jquery_contactsmenuMorris Jobke2018-10-164-15/+31
|\ \
| * | Tests: Remove spacing from html before comparing the templateJulius Härtl2018-10-161-6/+6
| * | Move jquery.contactsmenu.js to compiled handlebarsRoeland Jago Douma2018-10-163-9/+25
| |/
* | Merge pull request #11839 from nextcloud/csp/files_dropRoeland Jago Douma2018-10-166-13/+43
|\ \ | |/ |/|
| * fixup! Move files_drop to compiled handlebarsRoeland Jago Douma2018-10-161-1/+2
| * Move files_drop to compiled handlebarsRoeland Jago Douma2018-10-165-12/+41
* | Merge pull request #11830 from nextcloud/bugfix/9326/make_sure_usermanager_ge...Morris Jobke2018-10-162-1/+38
|\ \
| * | filter null values for UserManager::getByEmailGeorg Ehrke2018-10-152-1/+38
* | | Merge pull request #11358 from Zulan/fix-welcome-l10nMorris Jobke2018-10-166-115/+41
|\ \ \ | |_|/ |/| |
| * | Get l10n within NewUserMailHelper to ensure it always uses the new user's lan...zulan2018-10-156-115/+41
* | | Merge pull request #11740 from nextcloud/feature/noid/account-apiRoeland Jago Douma2018-10-1512-20/+810
|\ \ \
| * | | Use IAccountManager constantsJulius Härtl2018-10-153-68/+67
| * | | Update autoloaderJulius Härtl2018-10-152-0/+12
| * | | Add tests for new account api classesJulius Härtl2018-10-153-0/+253
| * | | Add \OCP\Account public APIJulius Härtl2018-10-157-20/+546
* | | | Merge pull request #11834 from nextcloud/csp/federationmenuRoeland Jago Douma2018-10-156-20/+53
|\ \ \ \
| * | | | Compile federationscope menu handlebars templateRoeland Jago Douma2018-10-156-20/+53
* | | | | Merge pull request #11849 from nextcloud/csp/fileactionsmenuRoeland Jago Douma2018-10-154-23/+56
|\ \ \ \ \
| * | | | | Tests: Properly compare the file action labelJulius Härtl2018-10-151-1/+1
| * | | | | Move fileactionsmenu to compiled handlebarsRoeland Jago Douma2018-10-153-22/+55
* | | | | | Merge pull request #10222 from nextcloud/interface-dashboardMaxence Lange2018-10-1516-0/+1771
|\ \ \ \ \ \
| * | | | | | include dashboard into coreMaxence Lange2018-10-1516-0/+1771
|/ / / / / /
* | | | | | Merge pull request #11848 from nextcloud/csp/workflowengineJulius Härtl2018-10-157-72/+181
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move workflowengine to compiled handlebarsRoeland Jago Douma2018-10-157-72/+181
* | | | | | Merge pull request #11838 from nextcloud/bugfix/noid/fix-default-types-of-mem...Roeland Jago Douma2018-10-151-6/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix default types of activity event member variablesJoas Schilling2018-10-151-6/+6
* | | | | | Merge pull request #11714 from nextcloud/lookupserver-and-global-scaleBjörn Schießle2018-10-152-5/+307
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add more testsBjoern Schiessle2018-10-121-0/+231
| * | | | | some small fixes and improvementsBjoern Schiessle2018-10-102-6/+29
| * | | | | adjust testsBjoern Schiessle2018-10-092-3/+32
| * | | | | always query the lookup server in a global scale setup and have a nicer labelBjoern Schiessle2018-10-091-3/+22
* | | | | | Merge pull request #11765 from nextcloud/feature/mandatory-2fa-for-groupsMorris Jobke2018-10-1529-157/+727
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make it possible to enforce mandatory 2FA for groupsChristoph Wurst2018-10-1529-157/+727
| | |/ / / | |/| | |
* | | | | Merge pull request #10439 from eugulixes/improve-encrypt-all-and-decrypt-all-...Morris Jobke2018-10-154-0/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Check if TTY is invalid in encryption:encrypt-all and encryption:decrypt-allEvgeny Golyshev2018-10-144-0/+22
| | |_|/ | |/| |
* | | | Merge pull request #11028 from nextcloud/feature/no_eval_cspRoeland Jago Douma2018-10-149-151/+238
|\ \ \ \ | |/ / / |/| | |
| * | | Fix plural function to be hardcodedRoeland Jago Douma2018-10-142-76/+164
| * | | Use jQuery.getScript to dynamically load scriptChristoph Wurst2018-10-141-9/+3
| * | | Disallow unsafe-eval by defaultRoeland Jago Douma2018-10-146-66/+71
|/ / /
* | | Merge pull request #11782 from nextcloud/bugfix/11099/fix-htaccess-referrerPatrik Kernstock2018-10-131-0/+1
|\ \ \
| * | | Add "Referrer-Policy" to htaccess file, addresses issue #11099Patrik Kernstock2018-10-111-0/+1
* | | | Merge pull request #11802 from nextcloud/bugfix/noid/fix-password_by_talk-not...Roeland Jago Douma2018-10-131-1/+1
|\ \ \ \