aboutsummaryrefslogtreecommitdiffstats
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-2310-2/+78
|
* Merge pull request #7981 from nextcloud/12.0.5-rc3-prepv12.0.5RC3Morris Jobke2018-01-221-2/+2
|\ | | | | 12.0.5 RC3
| * 12.0.5 RC3Morris Jobke2018-01-221-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-222-0/+2
|
* [tx-robot] updated from transifexNextcloud bot2018-01-21148-144/+178
|
* [tx-robot] updated from transifexNextcloud bot2018-01-202-0/+4
|
* Merge pull request #7962 from nextcloud/smb-2.0.4-12Roeland Jago Douma2018-01-1911-61/+89
|\ | | | | [12] update icewind/smb to 2.0.4
| * 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-19108-106/+108
|
* Merge pull request #7937 from nextcloud/12.0.5-rc2-prepv12.0.5RC2Morris Jobke2018-01-181-3/+4
|\ | | | | 12.0.5 RC2
| * 12.0.5 RC2Morris Jobke2018-01-181-3/+4
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-1814-0/+16
|
* [tx-robot] updated from transifexNextcloud bot2018-01-1722-0/+34
|
* Merge pull request #7888 from ↵Roeland Jago Douma2018-01-161-2/+2
|\ | | | | | | | | nextcloud/backport/7879/dont-disable-shipped-apps-on-errors-12 [stable12] Keep all shipped apps enabled because they should be okay
| * Keep all shipped apps enabled because they should be okayJoas Schilling2018-01-161-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #7817 from nextcloud/stable12-7767Roeland Jago Douma2018-01-162-8/+19
|\ \ | |/ |/| [stable12] Fix preview when theming changes invertion of icons
| * Fix appmenu svg double invertJulius Härtl2018-01-122-8/+19
| | | | | | | | | | | | | | | | | | 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-1666-126/+134
| |
* | [tx-robot] updated from transifexNextcloud bot2018-01-1520-10/+78
| |
* | [tx-robot] updated from transifexNextcloud bot2018-01-146-0/+8
| |
* | Merge pull request #7821 from nextcloud/12-7818Roeland Jago Douma2018-01-121-2/+2
|\ \ | |/ |/| [stable12] Log full exception in cron instead of only the message
| * Log full exception in cron instead of only the messageMorris Jobke2018-01-121-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [tx-robot] updated from transifexNextcloud bot2018-01-12120-130/+160
|
* Merge pull request #7792 from ↵Morris Jobke2018-01-114-14/+94
|\ | | | | | | | | nextcloud/stable12-7783-fix-empty-details-view-after-renaming-a-file [stable12] Fix empty details view after renaming a file
| * Add acceptance test for renaming a file with the details view openDaniel Calviño Sánchez2018-01-112-0/+57
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * 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>
* Merge pull request #7779 from nextcloud/12-7778Roeland Jago Douma2018-01-111-0/+0
|\ | | | | [stable12] Improve zip support
| * Improve zip supportMorris Jobke2018-01-101-0/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7786 from nextcloud/mount-type-federated-shares-stable12Roeland Jago Douma2018-01-111-0/+10
|\ \ | | | | | | return correct mount type for federated shares
| * | 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-114-4/+8
|/
* 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>
* | Merge pull request #7770 from nextcloud/stable12-7756Morris Jobke2018-01-101-1/+1
|\ \ | | | | | | [stable12] Fix SCSS processing when undoing theming values
| * | Fix SCSS processing when undoing theming valuesJulius Härtl2018-01-101-1/+1
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #7777 from nextcloud/stable12-7769Morris Jobke2018-01-101-0/+1
|\ \ | |/ |/| [stable12] Set height for sidebar icons
| * Set height for sidebar iconsJulius Härtl2018-01-101-0/+1
|/ | | | | | This makes sure they are properly scaled in IE11 Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2018-01-106-0/+20
|
* Merge pull request #7758 from nextcloud/12-7570v12.0.5RC1Roeland Jago Douma2018-01-095-1/+224
|\ | | | | [stable12] add option to use legacy v2 auth with s3
| * add option to use legacy v2 auth with s3Robin Appelman2018-01-095-1/+224
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7759 from nextcloud/7712_12Roeland Jago Douma2018-01-092-5/+5
|\ \ | | | | | | [stable12] Use correct L10N files for jsconfig
| * | Use correct L10N files for jsconfigRoeland Jago Douma2018-01-092-5/+5
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7757 from nextcloud/12-7605Morris Jobke2018-01-091-5/+32
|\ \ | |/ |/| [stable12] Wait for the shared link to be set in the acceptance tests
| * Add missing timeout multiplierDaniel Calviño Sánchez2018-01-091-2/+6
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Wait for the shared link to be set in the acceptance testsDaniel Calviño Sánchez2018-01-091-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking on "Share link" in the "Sharing" tab of the Files app an input field with the link appears. That input field already exists in the DOM, although empty, before clicking on "Share link", and when that is done the proper value is set and then the input field is shown. In the acceptance tests "getValue()" can return the value of hidden elements too, so as long as an element exists its value is returned without waiting for the field to be visible. Due to this if the test code runs too fast the "I write down the shared link" step could be executed before the proper value was set, so the shared link got in that case would be an empty value, and this would lead to failures when the following steps were executed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Fix typo in callback nameDaniel Calviño Sánchez2018-01-091-2/+2
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #7740 from nextcloud/12.0.5-rc1-prepRoeland Jago Douma2018-01-091-2/+2
|\ \ | |/ |/| 12.0.5 RC1
| * 12.0.5 RC1Morris Jobke2018-01-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 06:31:54 +0000