summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add .l10nignoreMorris Jobke2018-10-191-0/+2
* Move files_external to compiled handlebarsRoeland Jago Douma2018-10-198-63/+112
* Merge pull request #11711 from nextcloud/feature/backgroundjobs_ocpChristoph Wurst2018-10-197-57/+367
|\
| * fixup! fixup! Add backgroundjobs to OCPRoeland Jago Douma2018-10-092-57/+108
| * fixup! Add backgroundjobs to OCPRoeland Jago Douma2018-10-091-0/+2
| * Bump autolaodersRoeland Jago Douma2018-10-092-0/+6
| * Add backgroundjobs to OCPRoeland Jago Douma2018-10-093-0/+251
* | Merge pull request #11882 from nextcloud/feature/noid/consider-net-connectionblizzz2018-10-185-27/+108
|\ \
| * | Do not try to contact lookup server without internet connection or URLArthur Schiwon2018-10-185-27/+108
* | | Merge pull request #11894 from nextcloud/npm/settingsJulius Härtl2018-10-188-97/+108
|\ \ \
| * | | Bump npm deps in /settingsRoeland Jago Douma2018-10-178-97/+108
* | | | Merge pull request #11785 from nextcloud/3rdparty/azure/1.2.0Morris Jobke2018-10-181-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump azure-storage-blog 1.2.0Roeland Jago Douma2018-10-181-0/+0
| |/ / /
* | | | Merge pull request #11853 from nextcloud/csp/commentsMorris Jobke2018-10-185-27/+56
|\ \ \ \
| * | | | Move more comments to compiled handlebarsRoeland Jago Douma2018-10-155-27/+56
* | | | | Merge pull request #11822 from nextcloud/bugfix/noid/forbid_freebusy_but_allo...Morris Jobke2018-10-187-107/+304
|\ \ \ \ \
| * | | | | move disableFreeBusy check from User principal backend to Scheduling Outbox c...Georg Ehrke2018-10-167-107/+304
* | | | | | Merge pull request #11896 from nextcloud/fix/personal-2fa-settings-unreliable...Morris Jobke2018-10-182-10/+0
|\ \ \ \ \ \
| * | | | | | Remove unreliable 2FA state message on personal 2FA settings pageChristoph Wurst2018-10-182-10/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assetsblizzz2018-10-184-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't require Same Site Cookies on assetsThomas Citharel2018-10-174-0/+6
* | | | | | 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
|/ / / / / / /