summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5305 from nextcloud/add-quota-to-files-viewMorris Jobke2017-06-138-8/+93
|\ | | | | Add quota to the files view
| * Do not show icon for quota barMorris Jobke2017-06-132-5/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Remove unused elementJoas Schilling2017-06-131-2/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Put the quota bar to the bottomMorris Jobke2017-06-133-8/+15
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Adjust the unit testJoas Schilling2017-06-131-0/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Remove the colored cornersJoas Schilling2017-06-131-0/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add an event so apps can add hidden fields to the files pageJoas Schilling2017-06-132-1/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Only set the active item when there is one (not the case for quota)Joas Schilling2017-06-131-1/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Content will come from the external appJoas Schilling2017-06-131-1/+0
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Remove useless translation and make it better on unlimitedJoas Schilling2017-06-131-5/+8
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Style quota entry in files viewJan-Christoph Borchardt2017-06-133-17/+38
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Add quota to the files viewJoas Schilling2017-06-134-0/+41
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5369 from nextcloud/fix-user-group-name-escapingMorris Jobke2017-06-131-2/+6
|\ \ | | | | | | Fix escaping of user and group names in "shared by" message
| * | Fix escaping of user and group names in "shared by" messageJoas Schilling2017-06-131-2/+6
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5373 from ↵Lukas Reschke2017-06-131-4/+0
|\ \ | | | | | | | | | | | | nextcloud/i-like-you-all-but-would-like-you-more-if-you-dont-ignore-red-ci-states Remove duplicate dependencies entry
| * | Remove duplicate dependencies entryLukas Reschke2017-06-131-4/+0
| | | | | | | | | | | | | | | | | | :see_no_evil: Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #5364 from nextcloud/fix-stringsMorris Jobke2017-06-131-1/+1
|\ \ \ | | | | | | | | fix config switch description
| * | | fix config switch description, this is only about searching for users, to ↵Bjoern Schiessle2017-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | enable/disable the possibility to publish users data we have a seperate config switch below Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #5370 from nextcloud/update-third-party-refLukas Reschke2017-06-131-0/+0
|\ \ \ \ | |_|/ / |/| | | Update third-party ref
| * | | Update third-party refLukas Reschke2017-06-131-0/+0
|/ / / | | | | | | | | | | | | | | | Ref https://github.com/nextcloud/3rdparty/pull/52 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #5302 from nextcloud/fix_5047Joas Schilling2017-06-131-2/+15
|\ \ \ | |_|/ |/| | use the email address configured in Nextcloud as sender instead of the users email address
| * | use the email address configured in Nextcloud as sender instead of the users ↵Bjoern Schiessle2017-06-081-2/+15
| | | | | | | | | | | | | | | | | | email address Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #5343 from nextcloud/share-filter-missing-groupsLukas Reschke2017-06-132-1/+3
|\ \ \ | |_|/ |/| | filter missing groups in share provider
| * | filter missing groups in share providerRobin Appelman2017-06-122-1/+3
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docsMorris Jobke2017-06-1213-62/+30
|\ \ | | | | | | Version and dependency are now required
| * | Add missing version requirement to OAuth2 appJoas Schilling2017-05-222-2/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Version and dependency are now requiredJoas Schilling2017-05-2211-60/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-13124-280/+266
| | |
* | | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 05:55:38 +0000