aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix test for tooltip and local share ownerJan-Christoph Borchardt2017-11-013-6/+8
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Restore 'Shared' text field for owner, since 'recipients' is still empty.Marin Treselj2017-10-311-3/+2
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Fix CSS, better handling of recipientsMarin Treselj2017-10-312-13/+14
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Fixed a11y; span instead of a divMarin Treselj2017-10-311-1/+1
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Show avatar instead of username for shared filesJan-Christoph Borchardt2017-10-312-1/+10
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #6903 from ↵Joas Schilling2017-10-312-11/+221
|\ | | | | | | | | nextcloud/feature/679/remove_valarms_from_read_only_shared_calendars remove reminders from read-only shared calendars
| * remove reminders from read-only shared calendarsGeorg Ehrke2017-10-222-11/+221
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348
| |
* | Merge pull request #7016 from nextcloud/fix_6820Roeland Jago Douma2017-10-301-0/+4
|\ \ | | | | | | Do not error when downloading from a numeric public subfolder
| * | Do not error when downloading from a numeric public subfolderRoeland Jago Douma2017-10-301-0/+4
|/ / | | | | | | | | | | Fixes #6820 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7004 from Fiech/masterRoeland Jago Douma2017-10-301-0/+8
|\ \ | | | | | | Extended list of sensitive configuration values
| * | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-291-0/+8
| | | | | | | | | | | | | | | | | | | | | In accordance with the issuetemplate app issue: https://github.com/nextcloud/issuetemplate/issues/27 Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* | | Merge pull request #7012 from nextcloud/show-favourite-action-as-the-first-oneJan-Christoph Borchardt2017-10-302-3/+7
|\ \ \ | | | | | | | | Show favourite action as the first one in the file actions menu
| * | | Reverse favorite icon coloring in files action menuJan-Christoph Borchardt2017-10-302-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Show favourite action as the first one in the file actions menuDaniel Calviño Sánchez2017-10-301-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #6867 from nextcloud/imessage-attachmentsGeorg Ehrke2017-10-308-1/+195
|\ \ \ \ | | | | | | | | | | Add attachment support to emails
| * | | | Move attachment creators to mailer classJoas Schilling2017-10-254-38/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix docsJoas Schilling2017-10-192-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Extend the API with teh parameters from SwiftJoas Schilling2017-10-192-3/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add attachment support to emailsJoas Schilling2017-10-186-1/+170
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6932 from nextcloud/constants-for-talk-useragentsRoeland Jago Douma2017-10-301-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Define constants for the talk user agents
| * | | | | Define constants for the talk user agentsJoas Schilling2017-10-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #6981 from nextcloud/unit-tests-for-6977Roeland Jago Douma2017-10-301-0/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Unit tests for #6977
| * | | | | | Unit tests for #6977Joas Schilling2017-10-271-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #6992 from nextcloud/2-lines-for-better-codeMorris Jobke2017-10-301-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use ::class and fix missing doc
| * | | | | | | Use ::class and fix missing docJoas Schilling2017-10-281-1/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #6976 from nextcloud/fix-checkbox-in-popoverMorris Jobke2017-10-302-16/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix checkboxes on popover
| * | | | | | | Share views fixJohn Molakvoæ (skjnldsv)2017-10-261-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Fix checkboxes on popoverJohn Molakvoæ (skjnldsv)2017-10-262-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-306-8/+10
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-298-20/+38
| |/ / / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-2814-86/+122
| | | | | |
* | | | | | Merge pull request #6869 from burned42/6307-fix_page_title_not_changedDaniel Calviño Sánchez2017-10-273-1/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | #6307 fix page title not changed
| * | | | | bugfix: set/change page title when switching to file tagsBernd Stellwag2017-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bernd Stellwag <burned@zerties.org>
| * | | | | bugfix: set/change page title when switching to filelistBernd Stellwag2017-10-272-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bernd Stellwag <burned@zerties.org>
* | | | | | Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added additional methods for removal of sensitive info
| * | | | | | Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
| | | | | | |
* | | | | | | Merge pull request #6973 from nextcloud/menu-highlightMorris Jobke2017-10-262-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add blue bar as highlight to active menu entry
| * | | | | | | Add blue highlight to active menu entryJan-Christoph Borchardt2017-10-242-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | Merge pull request #6970 from nextcloud/class-usage-in-mocks-encryption-appMorris Jobke2017-10-2627-115/+176
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Use ::class in test mocks of encryption app
| * | | | | | | Use ::class in test mocks of encryption appMorris Jobke2017-10-2627-115/+176
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-appMorris Jobke2017-10-2642-113/+159
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use ::class in test mocks of dav app
| * | | | | | | Fix another warningMorris Jobke2017-10-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | Use ::class in test mocks of dav appMorris Jobke2017-10-2641-109/+154
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #6949 from nextcloud/cachingrouter_localRoeland Jago Douma2017-10-261-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use local cache for the CachingRouter
| * | | | | | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to cache routes distributed. It even has the downside that the router might return different routes then the ones in the local routes.php files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'mastix-master'Morris Jobke2017-10-251-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Updated OpenGraph title to display folder name instead of a nextcloud ↵Sascha Sambale2017-10-251-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | standard text When sharing a folder via Facebook, WhatsApp or any other platform that makes use of OpenGraph, the display title was "Nextcloud - a safe home for all your data" and the description was the actual name of the folder. This should not be the case, so the display title has been changed to display the folder name and the description now displays the former OpenGraph title. Signed-off-by: Sascha Sambale <mastixmc@gmail.com> Fixing whitespaces and empty line.