summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5271 from nextcloud/use-mailer-to-create-email-templateMorris Jobke2017-06-122-5/+9
|\ | | | | Also use IMailer interface to generate the email template
| * Fix testsLukas Reschke2017-06-121-1/+1
| | | | | | | | | | | | return is not defined Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Also use IMailer interface to generate the email templateMorris Jobke2017-06-062-5/+9
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5167 from nextcloud/rakekniven-patch-2Morris Jobke2017-06-123-4/+4
|\ \ | | | | | | l10n improvements from transifex
| * | Update setupchecks.jsrakekniven2017-05-313-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo and removed doclink symbol. Reported at transifex Update util.php Another l10n improvement from transifex. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #5315 from nextcloud/global-evalMorris Jobke2017-06-121-1/+1
|\ \ \ | | | | | | | | execute eval in global scope, addresses #5314
| * | | execute eval in global scope, addresses #5314Arthur Schiwon2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unsure whether this is properly supported everywhere, injection is not an option for us Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #5323 from nextcloud/use-touch-icon-for-favicon-fb.pngMorris Jobke2017-06-121-4/+8
|\ \ \ \ | | | | | | | | | | Theme image for favicon-fb.png
| * | | | Theme image for favicon-fb.pngLukas Reschke2017-06-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/5322 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #5310 from ↵Lukas Reschke2017-06-1214-33/+487
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-tag-label-removed-when-share-view-is-opened Fix tag label removed when share view is opened
| * | | | | Extract toggle visibility of a SystemTagsInfoView to its own viewDaniel Calviño Sánchez2017-06-096-26/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SystemTagsInfoViewToggleView is a basic view that renders a label that, when clicked, toggles the visibility of an associated SystemTagsInfoView. In order to keep the view parent agnostic its attachment and detachment to/from the MainfFileInfoView is done in the FilesPlugin. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add visibility related methodsDaniel Calviño Sánchez2017-06-092-6/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SystemTagsInfoView now provides public methods related to its visibility in preparation to be used by external objects. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix toggle element being removed when MainFileInfoView is rendered againDaniel Calviño Sánchez2017-06-092-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggle element was added to the MainFileInfoView element when SystemTagsInfoView was rendered. However, if the MainFileInfoView was rendered again after that the toggle element was removed. Therefore, instead of adding it when SystemTagsInfoView is rendered, the toggle element has to be added when MainFileInfoView triggers its "post-render" event. Note, however, that when MainFileInfoView is rendered all the events are removed from its child elements. As the toggle uses a "click" event either the event has to be added back or the element has to be detached before the MainFileInfoView is rendered. Fixes #4944 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Trigger pre and post render events in MainFileInfoDetailsViewDaniel Calviño Sánchez2017-06-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The post-render event makes possible to modify the MainFileInfoDetailsView element once it has been rendered, which is needed by OCA.SystemTags.FilesPlugin to add the "Tags" label to the file details, while the pre-render event makes possible to detach added elements if needed before the MainFileInfoDetailsView is rendered again, as that removes the events from the child DOM elements even if they belong to other views. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Make possible to know the registered detail views in a details viewDaniel Calviño Sánchez2017-06-094-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, an app may need to act on a detail view registered by another app or the core, for example, to add extra elements to the element of the detail view. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Extract duplicated code to a methodDaniel Calviño Sánchez2017-06-091-28/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add acceptance tests for showing the input field for tagsDaniel Calviño Sánchez2017-06-092-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #5341 from m4dz/bug/everyone-group-highlightLukas Reschke2017-06-121-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Highlight everyone group by default
| * | | | | | [docs] remove useless TODO markm4dz2017-06-121-1/+0
| | | | | | |
| * | | | | | [fix] Highlight 'everyone' group by defaultm4dz2017-06-121-0/+3
| | | | | | |
* | | | | | | Merge pull request #5344 from nextcloud/fix-transifexLukas Reschke2017-06-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove the char because it breaks the export from transifex
| * | | | | | | Remove the char because it breaks the export from transifexJoas Schilling2017-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #5319 from nextcloud/theming-undo-hoverMorris Jobke2017-06-121-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Show reset to default button for theming values on hover, fix #3198
| * | | | | | | Show reset to default button for theming values on hover, fix #3198Jan-Christoph Borchardt2017-06-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-128-8/+8
| |/ / / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1116-4/+18
| | | | | | |
* | | | | | | Merge pull request #5331 from nextcloud/remove-unneeded-css-apppasswordsJan-Christoph Borchardt2017-06-111-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unneeded CSS
| * | | | | | | Remove unneeded CSSMarius Blüm2017-06-101-4/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * was removed with #5166 so there is no more apppasswords-section Signed-off-by: Marius Blüm <marius@lineone.io>
* | | / / / / [tx-robot] updated from transifexNextcloud bot2017-06-1016-140/+150
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #5307 from artemanufrij/masterJan-Christoph Borchardt2017-06-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix height for horizontal scrollbar
| * | | | | | Fix height for horizontal scrollbarArtem Anufrij2017-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Artem Anufrij <artem.anufrij@live.de>
* | | | | | | Merge pull request #5122 from nextcloud/fix-ldap-integration-testsLukas Reschke2017-06-0913-23/+121
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix ldap integration tests
| * | | | | | | add convenience script to run all tests at onceArthur Schiwon2017-05-261-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Make IDE happyArthur Schiwon2017-05-2610-18/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | add missing INotificationManager when creating User backend, LDAPArthur Schiwon2017-05-263-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UserManager Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #5311 from nextcloud/revert-5116-zipstreamerMorris Jobke2017-06-091-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Revert "Always enable Zip64 extension for zipstreamer"
| * | | | | | | Revert "Always enable Zip64 extension for zipstreamer"Joas Schilling2017-06-091-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #5318 from nextcloud/fix-masterLukas Reschke2017-06-091-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Fix missing js merge on master
| * | | | | | | Fix missing js merge on masterJoas Schilling2017-06-091-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #5118 from nextcloud/use-language-of-recipient-not-adminLukas Reschke2017-06-091-1/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use the language of the recipient not the actor
| * | | | | | | Use the language of the recipient not the actorJoas Schilling2017-05-261-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #5308 from nextcloud/fix_running_only_dav_testsBjörn Schießle2017-06-091-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | add missing parent::setUp that broke any other dav app test
| * | | | | | | add missing parent::setUp that broke any other dav app testGeorg Ehrke2017-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-09114-2180/+262
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #5287 from nextcloud/personal-page-gs-modeJoas Schilling2017-06-082-16/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | show input fields if they are not empty but disable them in global scale mode
| * | | | | | unify look of disabled display name / email address and the other input fieldsBjoern Schiessle2017-06-072-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | show input fields if they are not empty but disable them in global scale modeBjoern Schiessle2017-06-071-7/+29
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-08110-162/+446
| | | | | |
* | | | | | Merge pull request #5185 from nextcloud/error-spam-in-logMorris Jobke2017-06-071-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't try to generate logs for chunking paths
| * | | | | | Don't try to generate logs for chunking pathsJoas Schilling2017-05-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 00:42:56 +0000