summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | [tx-robot] updated from transifexNextcloud bot2018-10-26152-678/+364
* | Merge pull request #12045 from nextcloud/improve-encrypt-all-stable14Morris Jobke2018-10-254-10/+76
|\ \ | |/ |/|
| * skip already decrypted files on decrypt all commandBjoern Schiessle2018-10-252-10/+37
| * skip already encrypted files on encrypt all commandBjoern Schiessle2018-10-252-0/+39
|/
* Merge pull request #12032 from Dagefoerde/stable14-11919-do-not-always-fallbackRoeland Jago Douma2018-10-251-1/+7
|\
| * Catch more occurences where ExpiredTokenException can be thrownRoeland Jago Douma2018-10-251-1/+5
| * Expired PK tokens should not fall back to legacy tokensRoeland Jago Douma2018-10-251-0/+2
|/
* [tx-robot] updated from transifexNextcloud bot2018-10-2538-52/+108
* Merge pull request #12005 from iPaat/Backport14/Fix11847Morris Jobke2018-10-242-3/+3
|\
| * Remove cookies from Clear-Site-Data HeaderPatrick Conrad2018-10-242-3/+3
* | Merge pull request #11800 from nextcloud/lookupserver-and-global-scale-stable14Morris Jobke2018-10-242-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 #11783 from suntorytimed/stable14Morris Jobke2018-10-241-0/+4
|\ \ \ | |_|/ |/| |
| * | backport of #10778Stefan Weiberg2018-10-241-0/+4
* | | [tx-robot] updated from transifexNextcloud bot2018-10-24136-172/+300
* | | Merge pull request #11995 from nextcloud/stable14-11967-fix-opening-a-section...Roeland Jago Douma2018-10-2310-29/+148
|\ \ \
| * | | Add acceptance tests for opening a section in the Files appDaniel Calviño Sánchez2018-10-232-0/+88
| * | | Remove event handler no longer neededDaniel Calviño Sánchez2018-10-232-12/+0
| * | | Fix opening a section again in the Files appDaniel Calviño Sánchez2018-10-236-7/+50
| * | | Fix indentationDaniel Calviño Sánchez2018-10-231-11/+11
* | | | Merge pull request #11994 from nextcloud/assemblly-stream-lazy-14Morris Jobke2018-10-231-5/+6
|\ \ \ \
| * | | | lazy open first source stream in assemblystreamRobin Appelman2018-10-231-5/+6
* | | | | Merge pull request #11961 from nextcloud/backport/11931/stable14Morris Jobke2018-10-231-6/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not emit preHooks twice on non-part-storageRoeland Jago Douma2018-10-211-6/+5
* | | | | [tx-robot] updated from transifexNextcloud bot2018-10-23578-2206/+3556
| |/ / / |/| | |
* | | | Merge pull request #11925 from nextcloud/backport/11920/properly-ignore-compi...Morris Jobke2018-10-237-0/+25
|\ \ \ \
| * | | | Add .l10nignore files for compiled assetsMorris Jobke2018-10-197-0/+25
* | | | | Merge pull request #11979 from nextcloud/bugfix-stable14/noid/forbid_freebusy...Morris Jobke2018-10-237-107/+304
|\ \ \ \ \
| * | | | | move disableFreeBusy check from User principal backend to Scheduling Outbox c...Georg Ehrke2018-10-227-107/+304
* | | | | | Merge pull request #11976 from nextcloud/bugfix-stable14/9326/make_sure_userm...Roeland Jago Douma2018-10-232-1/+38
|\ \ \ \ \ \
| * | | | | | filter null values for UserManager::getByEmailGeorg Ehrke2018-10-222-1/+38
| |/ / / / /
* | | | | | Merge pull request #11990 from nextcloud/backport/11972/fix-l10n-fetching-fro...Roeland Jago Douma2018-10-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.jsMorris Jobke2018-10-231-0/+1
|/ / / / /
* | | | | Merge pull request #11950 from Birkenstab/allow-same-origin-referrer-policy-b...Morris Jobke2018-10-222-13/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow "same-origin" as "Referrer-Policy"Moritz Beck2018-10-202-13/+10
|/ / / /
* | | | Merge pull request #11939 from nextcloud/backport/11611/stable14Roeland Jago Douma2018-10-191-1/+1
|\ \ \ \
| * | | | Allow userId to be nullRoeland Jago Douma2018-10-191-1/+1
|/ / / /
* | | | Merge pull request #11929 from nextcloud/backport/11870/proper-column-name-es...Morris Jobke2018-10-196-8/+8
|\ \ \ \
| * | | | Properly escape column name in "createFunction" callMorris Jobke2018-10-196-8/+8
| |/ / /
* | | | Merge pull request #11772 from nextcloud/stable14-pretty-urls-dont-workMorris Jobke2018-10-191-5/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Backport https://github.com/nextcloud/server/pull/11446Daniel Kesselberg2018-10-111-5/+4
* | | | Merge pull request #11851 from nextcloud/backport/11802/fix-password_by_talk-...Joas Schilling2018-10-161-1/+1
|\ \ \ \
| * | | | Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and ...Morris Jobke2018-10-151-1/+1
* | | | | Merge pull request #11798 from nextcloud/backport/11782/stable14Joas Schilling2018-10-151-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add "Referrer-Policy" to htaccess file, addresses issue #11099Patrik Kernstock2018-10-121-0/+1
* | | | | Merge pull request #11790 from nextcloud/backport/11745/stable14Roeland Jago Douma2018-10-122-3/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow php7.3Roeland Jago Douma2018-10-121-3/+3