summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-2012-22/+28
| |_|/ |/| |
* | | Revert "dont die if we try to access the shared cache while setting up the ↵Robin Appelman2017-06-191-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | shared storage" Revent accidental push This reverts commit ed8903404768f5957ddf39f5979741b18000f69d.
* | | dont die if we try to access the shared cache while setting up the shared ↵Robin Appelman2017-06-191-1/+8
| |/ |/| | | | | | | | | storage Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-06-1910-0/+18
| |
* | Merge pull request #5442 from Bekcpear/stable12Morris Jobke2017-06-171-13/+15
|\ \ | | | | | | Fix upload remaining time and uploadrate value
| * | Fix upload remaining time and uploadrate valueYaojin Qian2017-06-161-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The upload remaining time is always 'a few second' whatever a big or a small file uploading. This commit fixes it. The `new Date().getMilliseconds()` only return a three digits number. When time arrived the next second, the millisecond start from ZERO again. So `new Date().getTime()` is the righe choice. And remaining time variables shoule be initialized when the file starts uploading, otherwise the remaining time of a new upload will always be 'Infinity years' until you refresh the page. 2. The unit of `data.bitrate` is bit, but the argument unit of `humanFileSize` function is byte, so it should be divided by 8. Signed-off-by: Yaojin Qian <i@ume.ink>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-1752-52/+158
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-06-1640-24/+94
| |
* | Backport of #5384 to stable12Joas Schilling2017-06-152-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to find local users by their email address Signed-off-by: Joas Schilling <coding@schilljs.com> Make sure to only add system users once Signed-off-by: Joas Schilling <coding@schilljs.com> Add unit test Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12Lukas Reschke2017-06-151-16/+68
|\ \ | | | | | | [stable12] Ldap attempt reconnect stable12
| * | fix pagingArthur Schiwon2017-05-301-3/+4
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | make sure used ldap connection resource is always up to dateArthur Schiwon2017-05-301-6/+8
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | moved to something a little less invasive. back to passing CR around.bline2017-05-301-36/+40
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | special case for controlPagedResultResponse. It would be nice if there was a ↵bline2017-05-301-33/+78
| | | | | | | | | | | | | | | | | | generic way to pass by reference with call_user_func_array.. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #5301 from ↵Morris Jobke2017-06-142-0/+12
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares [stable12] allow users to send PropPatch request when calendar is group-shared with them
| * | | allow users to send PropPatch request when calendar is group-shared with themGeorg Ehrke2017-06-082-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #5299 from ↵Morris Jobke2017-06-145-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue [stable12] urldecode group principals in Cal- and CardDAV backend
| * | | | urldecode group principals in Cal- and CardDAV backendGeorg Ehrke2017-06-125-0/+20
| |/ / / | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-15134-80/+860
| | | |
* | | | Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12Morris Jobke2017-06-142-0/+3
|\ \ \ \ | | | | | | | | | | [stable12] Make file name input tooltip error text change
| * | | | Make new file file tooltip error text changePhil Davis2017-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Davis <phil@jankaritech.com>
| * | | | Make rename file tooltip error text changePhil Davis2017-05-221-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Davis <phil@jankaritech.com>
* | | | | Merge pull request #5401 from nextcloud/translate-oauth2Morris Jobke2017-06-141-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Translate OAuth2 in stable12
| * | | | | Translate OAuth2 in stable12Joas Schilling2017-06-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #5386 from ↵Joas Schilling2017-06-142-3/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/stable12-allow-to-share-to-local-users-via-email [stable12] Prevent sending second WWW-Authenticate header
| * | | | | Prevent sending second WWW-Authenticate headerLukas Reschke2017-06-132-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard. Fixes https://github.com/nextcloud/server/issues/5088 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1454-124/+160
| | | | | |
* | | | | | 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-1311-19/+362
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-26/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | 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>