summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add "password_by_talk" column to "share" table in the databaseDaniel Calviño Sánchez2018-07-244-1/+51
| | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #10363 from nextcloud/structure-mobile-and-public-fixesMorris Jobke2018-07-2420-34/+128
|\ | | | | Structure mobile and public fixes
| * Phpunit tests fixesJohn Molakvoæ (skjnldsv)2018-07-241-0/+63
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed scrolling containerJohn Molakvoæ (skjnldsv)2018-07-2411-14/+23
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Acceptance and mobile navigation fixesJohn Molakvoæ (skjnldsv)2018-07-2410-22/+44
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #10331 from weeman1337/fix-10330-files-multi-select-headerMorris Jobke2018-07-241-1/+1
|\ | | | | Adjusts the files multi select header width
| * Uses a variable for the multiselect header offsetMichael Weimann2018-07-231-1/+1
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * Adjusts the files multi select header widthMichael Weimann2018-07-221-1/+1
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Merge pull request #10218 from nextcloud/share-commentsRoeland Jago Douma2018-07-2442-953/+1252
|\ \ | | | | | | allow to add a personal note to a share
| * | Comply @since requirementsJohn Molakvoæ (skjnldsv)2018-07-231-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Design fixesJohn Molakvoæ (skjnldsv)2018-07-211-2/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Adjust acceptance tests to the new share link UIDaniel Calviño Sánchez2018-07-211-24/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The share link UI no longer uses its own layout below the other shares; now it is shown as a share row with a menu for the actions (except enabling it, which is shown in the row itself), just like the other shares. The share link is no longer shown, either; now the link is got by clicking on a "Copy URL" menu item, which copies the link to the clipboard. As the clipboard is not accessible from the acceptance tests the URL is now extracted from the attributes of that menu item (although the menu item is clicked anyway to mimic the user behaviour). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Design structure fixesJohn Molakvoæ (skjnldsv)2018-07-217-31/+65
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Tests fixes and design bumpJohn Molakvoæ (skjnldsv)2018-07-219-191/+45
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Don't use shorthand syntax for functionsJulius Härtl2018-07-212-8/+8
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | No remote note and various fixesJohn Molakvoæ (skjnldsv)2018-07-212-8/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | move the note up, so that it is also visible in the file drop viewBjoern Schiessle2018-07-211-5/+6
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | Public fixesJohn Molakvoæ (skjnldsv)2018-07-217-238/+120
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Public shareJohn Molakvoæ (skjnldsv)2018-07-217-386/+325
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | fix unit testsBjoern Schiessle2018-07-211-5/+8
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix post urlBjoern Schiessle2018-07-211-3/+3
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | Autoresize + autoloaderJohn Molakvoæ (skjnldsv)2018-07-213-0/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Popovermenu migrationJohn Molakvoæ (skjnldsv)2018-07-218-309/+271
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | unit tests updatedBjoern Schiessle2018-07-211-4/+27
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | UI set share note!John Molakvoæ (skjnldsv)2018-07-216-0/+202
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | return the as well note if we fetch a shareBjoern Schiessle2018-07-211-0/+1
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix unit testsBjoern Schiessle2018-07-211-0/+5
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | explicitely mention that the note column can be nullBjoern Schiessle2018-07-211-1/+1
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | some small template fixesBjoern Schiessle2018-07-213-5/+5
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | allow 'note' to be nullBjoern Schiessle2018-07-212-5/+6
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix unit testsBjoern Schiessle2018-07-212-11/+59
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add a nice looking button as direct link to the sharreBjoern Schiessle2018-07-211-9/+7
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add direct link to the shareBjoern Schiessle2018-07-211-0/+7
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add direct link to the file for user/group sharesBjoern Schiessle2018-07-212-5/+20
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | fix mail templatesBjoern Schiessle2018-07-212-6/+6
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | show note on public link pageBjoern Schiessle2018-07-213-0/+11
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add note to share object when reading it from the dbBjoern Schiessle2018-07-212-0/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | improve mail template and escape html codeBjoern Schiessle2018-07-212-24/+10
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | allow to add a personal note to a shareBjoern Schiessle2018-07-218-6/+286
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | [tx-robot] updated from transifexNextcloud bot2018-07-2422-4/+70
| | |
* | | Merge pull request #10338 from ↵Morris Jobke2018-07-232-80/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.2.6 Bump vue-loader from 15.2.4 to 15.2.6 in /apps/updatenotification
| * | | Bump vue-loader from 15.2.4 to 15.2.6 in /apps/updatenotificationdependabot[bot]2018-07-232-80/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.2.4 to 15.2.6. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/compare/v15.2.4...v15.2.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #10342 from ↵Morris Jobke2018-07-232-82/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.2.6 Bump vue-loader from 15.2.4 to 15.2.6 in /apps/oauth2
| * | | | Bump vue-loader from 15.2.4 to 15.2.6 in /apps/oauth2dependabot[bot]2018-07-232-82/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.2.4 to 15.2.6. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/compare/v15.2.4...v15.2.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #10344 from ↵Morris Jobke2018-07-232-172/+219
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-cli-3.1.0 Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/accessibility
| * | | | | Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/accessibilitydependabot[bot]2018-07-232-172/+219
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.0.8 to 3.1.0. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #10356 from nextcloud/bugfix/noid/dont-call-getuid-on-nullMorris Jobke2018-07-231-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Don't call getUID on null when the app is loaded for a guest
| * | | | Don't call getUID on null when the app is loaded for a guestJoas Schilling2018-07-231-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10355 from ↵Roeland Jago Douma2018-07-231-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/bugfix/noid/make-sure-error-log-always-receives-a-string Make sure error_log() always receives a string
| * | | | Make sure error_log() always receives a stringJoas Schilling2018-07-231-0/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>