summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10295 from nextcloud/fix/noid/fix-failing-testRoeland Jago Douma2018-07-191-0/+2
|\ | | | | Disable failing test in legacy sharing tests
| * Disable failing test in legacy sharing testsMorris Jobke2018-07-191-0/+2
| | | | | | | | | | | | * seems to be a race condition Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #10294 from ↵Morris Jobke2018-07-191-1/+1
|\ \ | | | | | | | | | | | | nextcloud/bugfix/fac-104/expected-array-got-object Make sure to always use an array as parameter
| * | Make sure to always use an array as parameterJoas Schilling2018-07-191-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #10286 from nextcloud/bugfix/noid/comments-layoutMorris Jobke2018-07-191-0/+1
|\ \ \ | | | | | | | | Fix comment input overlay on empty discussion
| * | | Fix comment input overlay on empty discussionJulius Härtl2018-07-181-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10288 from nextcloud/bugfix/noid/comments-mention-inlineMorris Jobke2018-07-192-3/+26
|\ \ \ | |_|/ |/| | Fix inline avatar display for mentions in comments
| * | Fix inline avatar display for mentions in commentsJulius Härtl2018-07-182-3/+26
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-07-1944-0/+120
| |
* | Fix getting ocs share permissions if a storage is not availableRobin Appelman2018-07-182-6/+10
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2018-07-18230-748/+736
|
* Rebuild jsRoeland Jago Douma2018-07-173-15/+20
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump webpack from 4.16.0 to 4.16.1 in /apps/oauth2dependabot[bot]2018-07-172-8/+8
| | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.16.0 to 4.16.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.16.0...v4.16.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #10271 from ↵Roeland Jago Douma2018-07-174-21/+26
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.16.1 Bump webpack from 4.16.0 to 4.16.1 in /apps/accessibility
| * rebuild jsRoeland Jago Douma2018-07-173-13/+18
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Bump webpack from 4.16.0 to 4.16.1 in /apps/accessibilitydependabot[bot]2018-07-172-8/+8
| | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.16.0 to 4.16.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.16.0...v4.16.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #10269 from nextcloud/darktheme-betaMorris Jobke2018-07-171-4/+4
|\ \ | | | | | | Clarify beta state of dark theme
| * | Clarify beta state of dark themeJan-Christoph Borchardt2018-07-171-4/+4
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #10268 from nextcloud/whatsnew-iconRoeland Jago Douma2018-07-174-7/+12
|\ \ \ | |_|/ |/| | Change what's new popover icon to checkmark, fix #10047
| * | Change what's new popover icon to checkmark, fix #10047Jan-Christoph Borchardt2018-07-174-7/+12
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #10252 from ↵Roeland Jago Douma2018-07-172-22/+20
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.16.0 Bump webpack from 4.15.1 to 4.16.0 in /apps/accessibility
| * | | Bump webpack from 4.15.1 to 4.16.0 in /apps/accessibilitydependabot[bot]2018-07-162-22/+20
| |/ / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.15.1 to 4.16.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.15.1...v4.16.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10251 from ↵Roeland Jago Douma2018-07-172-30/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.16.0 Bump webpack from 4.15.1 to 4.16.0 in /apps/oauth2
| * | | Bump webpack from 4.15.1 to 4.16.0 in /apps/oauth2dependabot[bot]2018-07-162-30/+26
| |/ / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.15.1 to 4.16.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.15.1...v4.16.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10249 from ↵Roeland Jago Douma2018-07-172-22/+20
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.16.0 Bump webpack from 4.15.1 to 4.16.0 in /apps/updatenotification
| * | | Bump webpack from 4.15.1 to 4.16.0 in /apps/updatenotificationdependabot[bot]2018-07-162-22/+20
| |/ / | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.15.1 to 4.16.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.15.1...v4.16.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10230 from nextcloud/feature/shareoverviewMorris Jobke2018-07-1712-334/+337
|\ \ \ | |_|/ |/| | Feature/shares overview
| * | Jsuinit fixesJohn Molakvoæ (skjnldsv)2018-07-171-3/+10
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Reorder position of "Shared by me" and "Shared with me"Morris Jobke2018-07-161-8/+10
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Make section "deleted shares" a subsection of "shares"Morris Jobke2018-07-161-12/+8
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Rename "Shares overview" to "Shares"Morris Jobke2018-07-162-2/+2
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Fix share by/with checkJohn Molakvoæ (skjnldsv)2018-07-141-4/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed phpunitJohn Molakvoæ (skjnldsv)2018-07-131-72/+12
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed sharing coding style and display - Added all shares overviewJohn Molakvoæ (skjnldsv)2018-07-131-112/+71
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Fixed if condition Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix fav quickaccess ressource additionJohn Molakvoæ (skjnldsv)2018-07-133-95/+87
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Upgraded navigation submenu management and api + created sharing submenuJohn Molakvoæ (skjnldsv)2018-07-138-136/+134
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Tiny start of the share overviewRoeland Jago Douma2018-07-133-30/+139
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-07-1712-2/+24
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-07-168-0/+34
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-146-0/+42
| |
* | Merge pull request #5280 from nextcloud/shared-with-display-nameMorris Jobke2018-07-132-2/+132
|\ \ | | | | | | sharedWithDisplayName & sharedWithAvatar
| * | SharedWithDisplayName + SharedWithAvatarMaxence Lange2018-05-212-2/+132
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #10110 from nextcloud/feature/100500/whats-new-info-usersMorris Jobke2018-07-133-27/+9
|\ \ \ | | | | | | | | Display What's New info to users
| * | | wire the frontendArthur Schiwon2018-07-051-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | Backend work to provide NC whats New info to usersArthur Schiwon2018-07-052-27/+8
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #10227 from nextcloud/bugfix/10160/ldap-bind-loopMorris Jobke2018-07-132-3/+3
|\ \ \ \ | | | | | | | | | | Only bind to ldap if configuration for the first server is set
| * | | | Fix tests for backup ldap server connectionJulius Härtl2018-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Only bind if configuration for the first server is availableJulius Härtl2018-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #10224 from ↵Morris Jobke2018-07-132-8/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-formatting-of-email-and-circle-shares Fix formatting of email and circle shares
| * | | | | Fix formatting of email and circle sharesDaniel Calviño Sánchez2018-07-122-8/+62
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a misplaced "||" instead of "===" the condition was always met, so every share type in the conditional chain after the remote and remote group shares was formatted as a remote/remote group share. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>