summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12392 from brad2014/feature/properly-present-buttons-from...Roeland Jago Douma2019-08-152-213/+198
|\
| * Move dav.invitation_link_recipients from getSystemValue to getAppValuebrad20142019-07-313-55/+26
| * IMipPlugin: DRY up - move common test set-up into setUp functionBrad Rubenstein2019-02-281-311/+117
| * IMipPlugin: Added unit test for dav.invitation_link_recipients supportBrad Rubenstein2019-02-281-0/+132
| * Revert 3ff3ed0c56 case-insensitive compares.Brad Rubenstein2019-02-281-2/+2
| * Respect RSVP parameter for attendees when adding accept/decline buttons.Brad Rubenstein2019-02-281-2/+17
| * corrected sample configBrad Rubenstein2019-02-281-1/+1
| * Customize presentation of accept/decline buttons in iMip mailBrad Rubenstein2019-02-282-4/+65
* | [tx-robot] updated from transifexNextcloud bot2019-08-15136-250/+456
* | Reset and init new user form language (#16727)John Molakvoæ2019-08-145-34/+51
|\ \
| * | Reset and init new user form languageJohn Molakvoæ (skjnldsv)2019-08-135-34/+51
* | | Merge pull request #16739 from nextcloud/office/headRoeland Jago Douma2019-08-141-1/+4
|\ \ \
| * | | Return proper responses when office is requesting OPTIONS/HEAD with empty Bea...Julius Härtl2019-08-141-1/+4
* | | | Merge pull request #16663 from JakubOnderka/patch-2Roeland Jago Douma2019-08-141-1/+1
|\ \ \ \
| * | | | files_trashbin: File can be without extensionJakub Onderka2019-08-071-1/+1
* | | | | Merge pull request #16572 from nextcloud/fix/15613/bring-back-psql9-compatRoeland Jago Douma2019-08-142-3/+24
|\ \ \ \ \
| * | | | | instead of upsert, fallback to default query on PgSQL <= 9.4Arthur Schiwon2019-08-142-3/+24
| | |/ / / | |/| | |
* | | | | Merge pull request #16725 from nextcloud/bugfix/noid/syslog-diblizzz2019-08-142-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure SystemConfig class can be injected and syslog_tag is fetched properlyJulius Härtl2019-08-132-2/+3
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-1410-84/+368
* | | | | Merge pull request #14429 from tobiasKaminsky/shareesOnDavRoeland Jago Douma2019-08-135-115/+150
|\ \ \ \ \
| * | | | | Fix testsRoeland Jago Douma2019-08-111-2/+2
| * | | | | get all shares, not only first one per typetobiasKaminsky2019-08-081-2/+1
| * | | | | use namespace everywheretobiasKaminsky2019-08-061-3/+3
| * | | | | Fix testsRoeland Jago Douma2019-08-012-63/+39
| * | | | | add display name to sharee listtobiasKaminsky2019-07-311-2/+3
| * | | | | Unify share fetchingRoeland Jago Douma2019-07-301-99/+27
| * | | | | Use proper ShareeListRoeland Jago Douma2019-07-304-6/+63
| * | | | | Use proper cachingRoeland Jago Douma2019-07-301-25/+54
| * | | | | wiptobiasKaminsky2019-07-232-62/+32
| * | | | | wiptobiasKaminsky2019-07-224-62/+76
| * | | | | Show sharees via propfindtobiasKaminsky2019-07-222-1/+62
* | | | | | Merge pull request #16728 from nextcloud/bugfix/invalid_uidRoeland Jago Douma2019-08-135-1/+63
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Get the proper UIDRoeland Jago Douma2019-08-135-1/+63
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2019-08-132-0/+542
|/ / / /
* | | | Merge pull request #16711 from nextcloud/fix/csp/form_actions/loginflowRoeland Jago Douma2019-08-122-2/+20
|\ \ \ \
| * | | | Fix login flow form actionsRoeland Jago Douma2019-08-112-2/+20
* | | | | Bump vue-router from 3.0.7 to 3.1.2 (#16718)John Molakvoæ2019-08-124-10/+10
|\ \ \ \ \
| * | | | | Bump vue-router from 3.0.7 to 3.1.2dependabot-preview[bot]2019-08-114-10/+10
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-08-126-0/+16
* | | | | | Merge pull request #16721 from nextcloud/fix/16644Roeland Jago Douma2019-08-112-6/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Correctly handle emtpy string in proxyuserpwd configScott Shambarger2019-08-112-6/+16
* | | | | | Merge pull request #16179 from J0WI/mv-frameoptionsRoeland Jago Douma2019-08-112-13/+14
|\ \ \ \ \ \
| * | | | | | Remove duplicated spacesJ0WI2019-08-112-3/+3
| * | | | | | Use "always" condition for security headersJ0WI2019-08-111-7/+7
| * | | | | | Sort headersJ0WI2019-08-112-8/+8
| * | | | | | Add X-Frame-Options header to .htaccessJ0WI2019-08-112-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16713 from nextcloud/dependabot/npm_and_yarn/style-loader...Roeland Jago Douma2019-08-1146-145/+157
|\ \ \ \ \ \
| * | | | | | Bump style-loader from 0.23.1 to 1.0.0dependabot-preview[bot]2019-08-1146-145/+157
|/ / / / / /
* | | | | | Merge pull request #16716 from nextcloud/dependabot/npm_and_yarn/css-loader-3...Roeland Jago Douma2019-08-114-12/+12
|\ \ \ \ \ \