summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #11701 from nextcloud/dependachristoph/bower/pin-versionsRoeland Jago Douma2018-10-1020-57/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Pin Bower versionsChristoph Wurst2018-10-1020-57/+58
* | | | Merge pull request #11675 from nextcloud/feature/enforce-2fa-admin-settingsRoeland Jago Douma2018-10-1027-27/+1005
|\ \ \ \
| * | | | Add admin interface to enforce 2FAChristoph Wurst2018-10-1027-27/+1005
| |/ / /
* | | | Merge pull request #11719 from nextcloud/techdebt/noid/allow-to-mock-new-date...Morris Jobke2018-10-104-85/+43
|\ \ \ \
| * | | | Fix mock of ITimeFactoryJoas Schilling2018-10-102-83/+24
| * | | | Allow to inject/mock `new \DateTime()` similar to time()Joas Schilling2018-10-092-2/+19
* | | | | Merge pull request #11689 from nextcloud/performance/normalizePathMorris Jobke2018-10-102-86/+84
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move normalizePath to regexes instead of loopingRoeland Jago Douma2018-10-102-86/+84
|/ / / /
* | | | Merge pull request #11733 from nextcloud/fix/noid/misleading-well-known-checkChristoph Wurst2018-10-102-6/+6
|\ \ \ \
| * | | | Fix a misleading setup check for .well-known/caldav & carddavMorris Jobke2018-10-102-6/+6
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-10-10982-4946/+4556
* | | | Merge pull request #11622 from nextcloud/feature/11617Roeland Jago Douma2018-10-093-0/+39
|\ \ \ \
| * | | | Add function to generate urls for OCS routesRoeland Jago Douma2018-10-093-0/+39
| |/ / /
* | | | Merge pull request #11716 from nextcloud/bugfix/noid/use-numeric-placeholders...Morris Jobke2018-10-0920-71/+71
|\ \ \ \
| * | | | Use numeric placeholders if there are multiple, so that RTL languages can ope...Joas Schilling2018-10-0920-71/+71
* | | | | Merge pull request #11721 from nextcloud/revert-10782-fix/10774/deadtagactionMorris Jobke2018-10-092-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "in 14 the click action gets lost in the Backbone view."Morris Jobke2018-10-092-2/+3
|/ / / /
* | | | Merge pull request #11709 from nextcloud/refactor/jquery-beforeunloadMorris Jobke2018-10-091-1/+1
|\ \ \ \
| * | | | Fix depracted jQuery.bind callChristoph Wurst2018-10-091-1/+1
| |/ / /
* | | | Merge pull request #11691 from nextcloud/refactor/fix-usage-deprecated-oc-web...Morris Jobke2018-10-0922-102/+102
|\ \ \ \
| * | | | Fix usage of deprecated OC.webrootChristoph Wurst2018-10-0922-102/+102
* | | | | Merge pull request #11698 from nextcloud/refactor/cleanup-github-filesMorris Jobke2018-10-095-5/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move GitHub files to .github directoryChristoph Wurst2018-10-095-5/+3
* | | | | Merge pull request #11705 from nextcloud/certificate/noid/update-crlMorris Jobke2018-10-091-10/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update CRL due to changed cert for linkshareexMorris Jobke2018-10-091-10/+10
|/ / / /
* | | | Merge pull request #11677 from nextcloud/feature/appdata_previewsMorris Jobke2018-10-092-12/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Allow the creationg of previews of files stored in appdataRoeland Jago Douma2018-10-082-12/+10
* | | | Merge pull request #11696 from nextcloud/refactor/remove-hhvm-leftoversMorris Jobke2018-10-094-6/+2
|\ \ \ \
| * | | | Remove HHVM checkChristoph Wurst2018-10-091-1/+1
| * | | | Remove comment about hhvmChristoph Wurst2018-10-091-1/+1
| * | | | Remove unused HHVM test executorChristoph Wurst2018-10-092-4/+0
|/ / / /
* | | | Merge pull request #11686 from nextcloud/deprecation/noid/ocp_util_recursiveA...Morris Jobke2018-10-091-0/+1
|\ \ \ \
| * | | | Deprecate unused OCP\Util::recursiveArraySearchMorris Jobke2018-10-081-0/+1
* | | | | Merge pull request #11685 from nextcloud/deprecation/noid/oc_helper_linkToPublicMorris Jobke2018-10-093-56/+6
|\ \ \ \ \
| * | | | | Deprecate unused, private OC_Helper::linkToPublicMorris Jobke2018-10-083-56/+6
| |/ / / /
* | | | | Merge pull request #11693 from nextcloud/refactor/remove-legacy-sharemodel-ar...Morris Jobke2018-10-091-8/+0
|\ \ \ \ \
| * | | | | Remove deprecated and unused legacy ShareConfigModel.areAvatarsEnabled()Christoph Wurst2018-10-091-8/+0
* | | | | | Merge pull request #11692 from nextcloud/refactor/remove-noop-oc-appconfigMorris Jobke2018-10-091-14/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove deprecated and noop APIs from OC.AppConfigChristoph Wurst2018-10-091-14/+0
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2018-10-09128-948/+948
* | | | | Merge pull request #11678 from nextcloud/refactor/settings-axios-libJulius Härtl2018-10-0812-65/+40
|\ \ \ \ \
| * | | | | Remove useless promise transformationChristoph Wurst2018-10-089-29/+19
| * | | | | Replace hand-crafted request token logic by nextcloud-axios libChristoph Wurst2018-10-084-41/+26
* | | | | | Merge pull request #11664 from nextcloud/feature/noid/has-been-interrupted-th...Roeland Jago Douma2018-10-083-38/+28
|\ \ \ \ \ \
| * | | | | | Rename method to abortIfInterruptedDaniel Kesselberg2018-10-083-10/+10
| * | | | | | Adjust code for changed method signatureDaniel Kesselberg2018-10-072-30/+16
| * | | | | | Refactor method to throw exception instead of true/falseDaniel Kesselberg2018-10-071-7/+11
* | | | | | | Merge pull request #11679 from nextcloud/refactor/remove-ie8-apisMorris Jobke2018-10-083-31/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove outdated commentChristoph Wurst2018-10-081-8/+0