summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* filter null values for UserManager::getByEmailGeorg Ehrke2018-10-152-1/+38
* 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
|\ \
| * | Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and ...Morris Jobke2018-10-121-1/+1
|/ /
* | Merge pull request #11771 from nextcloud/techdebt/noid/strict-activity-eventsMorris Jobke2018-10-124-129/+115
|\ \
| * | Make activity events strictJoas Schilling2018-10-124-129/+115
* | | Merge pull request #11793 from nextcloud/dependabot/npm_and_yarn/settings/nex...Roeland Jago Douma2018-10-128-28/+48
|\ \ \ | |/ / |/| |
| * | Rebuild settingsRoeland Jago Douma2018-10-126-10/+10
| * | Bump nextcloud-vue from 0.1.5 to 0.2.0 in /settingsdependabot[bot]2018-10-122-18/+38
|/ /
* | Merge pull request #11759 from nextcloud/feature/11504/sharing-faviconMorris Jobke2018-10-121-1/+1
|\ \
| * | Use default favicon on sharing pagesJulius Härtl2018-10-111-1/+1
| |/
* | Merge pull request #11775 from nextcloud/followup/11769Roeland Jago Douma2018-10-111-0/+0
|\ \
| * | 3rdparty to master followup of #11769Roeland Jago Douma2018-10-111-0/+0
| |/
* | Merge pull request #11764 from nextcloud/fix/11637/sharedstoragerootRoeland Jago Douma2018-10-111-1/+2
|\ \
| * | Normalize getUnjailedPathRoeland Jago Douma2018-10-111-1/+2
* | | Merge pull request #10778 from suntorytimed/patch-1Roeland Jago Douma2018-10-111-0/+4
|\ \ \ | |_|/ |/| |
| * | Adding a check to see if keyFileContents is empty:Stefan Weiberg2018-08-211-0/+4
* | | Merge pull request #11769 from nextcloud/3rdparty/remove/random_compatRoeland Jago Douma2018-10-112-3/+3
|\ \ \
| * | | Remove random_compatJoas Schilling2018-10-112-3/+3
* | | | Merge pull request #11766 from Birkenstab/feature/allow-same-origin-referrer-...Roeland Jago Douma2018-10-112-13/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow "same-origin" as "Referrer-Policy"Moritz Beck2018-10-112-13/+10
|/ / /
* | | Merge pull request #11745 from nextcloud/ci/php73Morris Jobke2018-10-112-3/+56
|\ \ \
| * | | Add 7.3 CI to droneRoeland Jago Douma2018-10-111-0/+53
| * | | Allow php7.3Roeland Jago Douma2018-10-111-3/+3
* | | | Merge pull request #11744 from burned42/fix_percent_sign_breaking_all_files_viewMorris Jobke2018-10-111-2/+0
|\ \ \ \
| * | | | Remove duplicate call to decodeURIComponentBernd Stellwag2018-10-111-2/+0
* | | | | Merge pull request #11756 from nextcloud/ignore-session-lifetime-if-it-can-no...Roeland Jago Douma2018-10-111-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Ignore "session_lifetime" if it can not be converted to a numberDaniel Calviño Sánchez2018-10-111-1/+3
| | |/ / | |/| |
* | | | Merge pull request #11750 from nextcloud/3rdparty/symfony-3.4.17Roeland Jago Douma2018-10-111-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | [3rdparty] Symfony-3.4.17Roeland Jago Douma2018-10-111-0/+0
* | | | Merge pull request #11746 from nextcloud/ci/php72-syntaxMorris Jobke2018-10-111-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Ignore the RiakCacheRoeland Jago Douma2018-10-101-1/+1
| * | | Add syntax ci job for php7.2Roeland Jago Douma2018-10-101-0/+9
|/ / /
* | | 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