summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-14118-228/+256
|
* Merge pull request #5296 from ↵Morris Jobke2017-06-132-0/+11
|\ | | | | | | | | nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar [stable12] allow PropPatch requests to contact_birthdays
| * allow PropPatch requests to contact_birthdaysGeorg Ehrke2017-06-082-0/+11
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #5063 from ↵Morris Jobke2017-06-131-0/+26
|\ \ | | | | | | | | | | | | nextcloud/backport-4969-activity-external-user-avatars [stable12] Fix username and avatar for external users
| * | Fix username and avatar for external usersJoas Schilling2017-05-231-0/+26
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5379 from ↵Morris Jobke2017-06-1314-33/+487
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable12-5310-fix-tag-label-removed-when-share-view-is-opened [stable12] Fix tag label removed when share view is opened
| * | | Extract toggle visibility of a SystemTagsInfoView to its own viewDaniel Calviño Sánchez2017-06-136-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-132-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-132-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-131-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-134-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-131-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-132-0/+123
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #5387 from nextcloud/backport-5367Morris Jobke2017-06-132-2/+7
|\ \ \ \ | | | | | | | | | | [stable12] Fix unknown share token error message
| * | | | Fix unknown share tokenJoas Schilling2017-06-132-2/+7
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #5388 from nextcloud/stable12-5378Morris Jobke2017-06-131-1/+1
|\ \ \ \ | | | | | | | | | | [stable12] no themed icon when dragging folder
| * | | | Fix #5349, no themed icon when dragging folderPatrik Kernstock2017-06-131-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | | Merge pull request #5389 from nextcloud/stable12-5305Morris Jobke2017-06-138-8/+93
|\ \ \ \ | | | | | | | | | | [stable12] 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 #5382 from nextcloud/global-scale-settings-stable12Morris Jobke2017-06-132-2/+2
|\ \ \ \ | | | | | | | | | | [stable12] fix "add to your nextcloud" input field
| * | | | fix 'add to your nextcloud' input field, this is not an email addressBjoern Schiessle2017-06-132-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #5385 from nextcloud/stable12-revert-5259Morris Jobke2017-06-133-8/+0
|\ \ \ \ | |/ / / |/| | | [stable12] Revert "allow admin to disable groups on personal page"
| * | | Revert "allow admin to disable groups on personal page"Morris Jobke2017-06-133-8/+0
|/ / / | | | | | | | | | | | | | | | This reverts commit 28e1a9da6cd3bce3cc843727d54094db4969dd7b. See #5259
* | | Merge pull request #5365 from nextcloud/backport-5343Morris Jobke2017-06-132-1/+3
|\ \ \ | | | | | | | | [stable12] filter missing groups in share provider
| * | | filter missing groups in share providerRobin Appelman2017-06-132-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5303 from nextcloud/fix_5047-nc12Joas Schilling2017-06-131-2/+15
|\ \ \ \ | |/ / / |/| | | [stable12] 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 #5354 from nextcloud/backport-5315-stable12Joas Schilling2017-06-131-1/+1
|\ \ \ | | | | | | | | [stable12] execute eval in global scope, addresses #5314
| * | | execute eval in global scope, addresses #5314Arthur Schiwon2017-06-121-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 #5355 from nextcloud/stable12-5167Joas Schilling2017-06-133-4/+4
|\ \ \ \ | | | | | | | | | | [stable12] l10n improvements from transifex
| * | | | Update setupchecks.jsrakekniven2017-06-123-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 #5120 from ↵Morris Jobke2017-06-121-1/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/backport-5118-use-language-of-recipient-not-admin [stable12] 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>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-13124-280/+266
| | | | |
* | | | | Merge pull request #5272 from nextcloud/stable12-5271Morris Jobke2017-06-122-5/+9
|\ \ \ \ \ | | | | | | | | | | | | [stable12] 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 #5353 from nextcloud/stable12-5344Morris Jobke2017-06-121-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [stable12] 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 #5352 from nextcloud/fix_running_only_dav_tests_stable12Lukas Reschke2017-06-121-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [stable12] add missing parent::setUp that broke any other dav app test
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 11:43:58 +0000