summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-11-09144-330/+400
|
* Merge pull request #12349 from ↵Morris Jobke2018-11-082-49/+157
|\ | | | | | | | | nextcloud/feature/noid/populate-notification-message-with-the-comment Populate the mention-notification with the actual message
| * Populate the mention-notification with the actual messageJoas Schilling2018-11-082-49/+157
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #12352 from ↵Morris Jobke2018-11-081-1/+4
|\ \ | | | | | | | | | | | | nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu Adjust acceptance tests to changes in public share page menu
| * | Adjust acceptance tests to changes in public share page menuDaniel Calviño Sánchez2018-11-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The "Download" item in the menu of public share pages is no longer shown in wide (>768px) windows (although the element is in the DOM and shown if resized to a narrow window). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernamesblizzz2018-11-089-15/+70
|\ \ \ | |/ / |/| | do not offer to change display name or password, if not possible.
| * | do not offer to change display name or password, if not possible.Arthur Schiwon2018-11-079-15/+70
| | | | | | | | | | | | | | | | | | Fixes #12319 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1v15.0.0beta1Morris Jobke2018-11-081-2/+2
|\ \ \ | |_|/ |/| | 15.0.0 beta 1
| * | 15.0.0 beta 1Morris Jobke2018-11-081-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecatedMorris Jobke2018-11-081-1/+0
|\ \ | | | | | | Basic CSP no longer deprecated
| * | Basic CSP no longer deprecatedRoeland Jago Douma2018-11-081-1/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendarsMorris Jobke2018-11-0821-116/+2379
|\ \ \ | | | | | | | | cache webcal calendars on server
| * | | update 3rdparty to fix phan error messageGeorg Ehrke2018-11-071-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | cache webcal calendars on serverGeorg Ehrke2018-11-0720-116/+2379
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #12313 from nextcloud/generated-avatar-major-cleanupRoeland Jago Douma2018-11-0811-25/+206
|\ \ \ \ | |_|/ / |/| | | Clear avatar cache with frontend repair
| * | | Clear avatar cache with frontend repairJohn Molakvoæ (skjnldsv)2018-11-0811-25/+206
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-0850-68/+98
| | | |
* | | | Merge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontentRoeland Jago Douma2018-11-071-0/+5
|\ \ \ \ | | | | | | | | | | Add fix for IE11 flexbox height bug
| * | | | Add fix for IE11 flexbox height bugJulius Härtl2018-11-071-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #12316 from nextcloud/public-download-button-fixRoeland Jago Douma2018-11-072-3/+17
|\ \ \ \ \ | | | | | | | | | | | | Better primary visual on public pages
| * | | | | Better primary visual on public pagesJohn Molakvoæ (skjnldsv)2018-11-072-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #12340 from nextcloud/ie11-function-fixRoeland Jago Douma2018-11-071-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove arrow function for ie compatibility
| * | | | | Remove arrow function for ie compatibilityJohn Molakvoæ (skjnldsv)2018-11-071-1/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-titleMorris Jobke2018-11-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Also use default label if share label is null
| * | | | | Also use default label if share label is nullJulius Härtl2018-11-071-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #12334 from nextcloud/bugfix/12164/share-dialog-useridMorris Jobke2018-11-071-17/+24
|\ \ \ \ \ | |_|/ / / |/| | | | Only show label if the shareWith value is relevant
| * | | | Only show label if the shareWith value is relevantJulius Härtl2018-11-071-17/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | For local users / groups the display name is enough to show, we just need details for email/remote shares Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #12324 from ↵Morris Jobke2018-11-072-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares Add "password" parameter to the response data of link shares
| * | | | Add "password" parameter to the response data of link sharesDaniel Calviño Sánchez2018-11-062-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to legacy reasons the password of link shares was returned in the "share_with" and "share_with_displayname" parameters of the response data. Now a proper "password" parameter is returned too; the old "share_with" and "share_with_displayname" parameters are kept, although deprecated, and they will be removed in a future version of Nextcloud. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #11836 from ↵Morris Jobke2018-11-074-9/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/2443/comment-mentions-with-spaces Comment mentions with spaces
| * | | | | Fix the comments UI and activities for space-mentionsJoas Schilling2018-11-072-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Match mentions when the username is wrapped in quotesJoas Schilling2018-11-072-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #12329 from ↵Morris Jobke2018-11-071-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/test-unique-constraint-violation Add test that unique constraint is working
| * | | | | | Add test that unique constraint is workingDaniel Kesselberg2018-11-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | Merge pull request #12317 from nextcloud/deps/noid/es6-polyfillMorris Jobke2018-11-0710-4077/+116
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add es6-shim as polyfill and minify core vendor scripts
| * | | | | | Fix file move testsJulius Härtl2018-11-071-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Add es6-shim as polyfill and minify underscore.jsJulius Härtl2018-11-079-4073/+104
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #11569 from ↵Morris Jobke2018-11-076-31/+179
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | nextcloud/bug-11514/hide-header-actions-for-filedrops Hides the header actions for file drops
| * | | | | Fix unit testsMorris Jobke2018-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Reduce function callsMorris Jobke2018-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Improve text to be better translatable and use CSS instead of HTML for bold textMorris Jobke2018-11-072-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Fix indentation of CSSMorris Jobke2018-11-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Adapts the code to the new master stateMichael Weimann2018-11-072-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | | Moves the terms of service into a dialogMichael Weimann2018-11-074-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | | Inlines the share note for file dropsMichael Weimann2018-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | | Inlines the share note for file dropsMichael Weimann2018-11-074-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | | Hides the header actions for file dropsMichael Weimann2018-11-072-4/+100
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | | Merge pull request #12328 from nextcloud/more-icon-moveMorris Jobke2018-11-071-4/+8
|\ \ \ \ \ | |/ / / / |/| | | | Fix missing dot before class name
| * | | | Fix missing dot before class nameJan-Christoph Borchardt2018-11-051-4/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-11-0764-66/+166
| |_|/ / |/| | |