summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* increase the time we wait for smb notifications in the testRobin Appelman2018-01-231-2/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2018-01-234-0/+8
|
* [tx-robot] updated from transifexNextcloud bot2018-01-212-0/+2
|
* update icewind/smb to 2.0.4Robin Appelman2018-01-1911-61/+89
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2018-01-19106-106/+106
|
* [tx-robot] updated from transifexNextcloud bot2018-01-172-0/+4
|
* Merge pull request #7817 from nextcloud/stable12-7767Roeland Jago Douma2018-01-161-0/+13
|\ | | | | [stable12] Fix preview when theming changes invertion of icons
| * Fix appmenu svg double invertJulius Härtl2018-01-121-0/+13
| | | | | | | | | | | | | | | | | | This fixes a regression caused by 9b668d0, where the css filters to preview color inversion of the app menu was applied by default. This commit makes the css filters sensitive on what the current state of the app menu is. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-01-162-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2018-01-1510-4/+52
| |
* | [tx-robot] updated from transifexNextcloud bot2018-01-144-0/+4
|/
* [tx-robot] updated from transifexNextcloud bot2018-01-124-16/+38
|
* Fix empty details view after renaming a fileDaniel Calviño Sánchez2018-01-112-1/+31
| | | | | | | | | | | "FileList._updateDetailsView" expects either a file name (as a string) or a file model (as an "OCA.File.FileInfoModel"), but when called through "updateInList" an "OC.Files.FileInfo" object was given instead. As the given attribute was not a model "_updateDetailsView" treated it as a file name and tried to get the model for that file, which failed and caused the details view to be emptied. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Move adding test files to "beforeEach()"Daniel Calviño Sánchez2018-01-111-13/+6
| | | | | | | | | | | | All the tests in the "Renaming files" section added the test files, although those calling "doRename()" added them by setting a path for the file too. However, the path is ignored in the other tests, so adding the files can be unified and moved to "beforeEach()". This would be needed, for example, to show the details view for a file before calling "doRename()". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* return correct mount type for federated sharesBjoern Schiessle2018-01-111-0/+10
| | | | | | fix https://github.com/nextcloud/server/issues/6584 Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* [tx-robot] updated from transifexNextcloud bot2018-01-112-0/+4
|
* Merge pull request #7774 from nextcloud/smb-2.0.3-12Morris Jobke2018-01-1017-90/+162
|\ | | | | [12] update icewind/smb to 2.0.3
| * update icewind/smb to 2.0.3Robin Appelman2018-01-1017-90/+162
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Fix SCSS processing when undoing theming valuesJulius Härtl2018-01-101-1/+1
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2018-01-104-0/+8
|
* add option to use legacy v2 auth with s3Robin Appelman2018-01-091-0/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #7708 from nextcloud/stable12-7599Morris Jobke2018-01-092-3/+6
|\ | | | | [stable12] don't show recurring msg when pages result was turned off
| * don't show recurring msg when pages result was turned offArthur Schiwon2018-01-052-3/+6
| | | | | | | | | | | | and only as debug level otherwise. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #7684 from nextcloud/backport-ie-fix-invertMorris Jobke2018-01-091-5/+0
|\ \ | | | | | | [stable12] Fix inverted app icons on IE11
| * | Remove css invert since we are using svg filters for nowJulius Härtl2018-01-031-5/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #7674 from nextcloud/12_7644Morris Jobke2018-01-092-46/+1
|\ \ \ | | | | | | | | [stable12] Do no run SyncJob in cron
| * | | Do no run SyncJob in cronRoeland Jago Douma2018-01-032-46/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7184 The SyncJob can be very resource intensive. Since it requests all users on the system to create the system addressbook. In order to do this it creates a vcard for every user and updates the addressbook. There is no need for this job since the proper signals are emitted and handled in the carddav backend to update the addressbook live. Worst comes to worst there is always the occ command to bring the address book in sync again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #7666 from ↵Morris Jobke2018-01-093-1/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable12-7527-fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen [stable12] Fix drag shadow not visible when dragging a file on a narrow screen
| * | | Fix drag shadow not visible when dragging a file on a narrow screenDaniel Calviño Sánchez2018-01-023-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file from the file list is dragged a drag shadow (a copy of the file row that follows the cursor position) is created. The drag shadow element is created as a direct child of the body element, so it needs a higher "z-index" than the one used for the file list to be visible. In narrow screens the "#app-content" uses a "z-index" of 1000 in order to be visible over the "#navigation-bar" when they overlap, so the "z-index" of the drag shadow must be at least 1000 to be visible over the file list. Instead of updating the hardcoded "z-index" it was removed and replaced by CSS rules for ".dragshadow" elements to ease theming. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #7742 from ↵Morris Jobke2018-01-092-1/+40
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable12-7716-hide-favourite-icon-in-details-view-if-favourite-action-is-not-available [stable12] Hide favourite icon in details view if favourite action is not available
| * | | Hide favourite icon in details view if favourite action is not availableDaniel Calviño Sánchez2018-01-082-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the favourite icon in the details view is clicked the "Favorite" action is triggered. However, if the action name given to "triggerAction" is not found then the "Download" action is triggered instead. As the "Favorite" action is not available in some file lists (like "Recents") the "Download" action was executed instead in those cases, which was a strange behaviour. Now the favourite icon is hidden if its action is not available. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-0912-0/+22
| | | |
* | | | Merge pull request #7694 from nextcloud/stable12-7611Roeland Jago Douma2018-01-081-3/+5
|\ \ \ \ | |/ / / |/| | | [stable12] Don't attempt to translate login names to uids when uids are provided
| * | | test adoption for stable12Arthur Schiwon2018-01-051-3/+5
| | |/ | |/| | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-082-0/+2
| | |
* | | Merge pull request #7717 from nextcloud/stable12-7662Roeland Jago Douma2018-01-071-7/+10
|\ \ \ | | | | | | | | [stable12] throw ServerNotAvailableException when LDAP is caught shutting down
| * | | throw ServerNotAvailableException when LDAP is caught shutting downArthur Schiwon2018-01-051-7/+10
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-076-0/+10
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-01-0622-134/+214
|/ / /
* | | Merge pull request #7688 from ↵Morris Jobke2018-01-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable12-fix-scss-webroot-and-url-rewrite [Stable12] fix scss webroot and url rewrite
| * | | Fix faulty path in theming scss generationJulius Härtl2018-01-051-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2018-01-0518-0/+94
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-01-04292-552/+3414
|/
* Merge pull request #7567 from nextcloud/stable-12_fix7428Morris Jobke2017-12-201-0/+16
|\ | | | | Respect sharing options when searching for Sharees
| * Don't show users which e-mail address match if they belong to a group we may ↵Tobia De Koninck2017-12-191-0/+16
| | | | | | | | | | | | not share with Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* | check userExists later, saves lookups for appData_INSTANCEID useridsArthur Schiwon2017-12-191-1/+1
|/ | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #7558 from nextcloud/12-7427Morris Jobke2017-12-183-13/+21
|\ | | | | [stable12] Fix email buttons for white theme
| * Fix email buttons for white themeMorris Jobke2017-12-183-13/+21
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | fix dav unit testsBjoern Schiessle2017-12-121-3/+3
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | CardDAV convertor check should not be to wideRoeland Jago Douma2017-12-111-2/+5
|/ | | | | | | | Case: email is set to null, but the avatar is set. In the old case the email would set $emptyValue but $noImage would still be false. This we would set the empty string as email. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>