summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8015 from nextcloud/final-12.0.5v12.0.5Morris Jobke2018-01-241-2/+2
|\
| * Final 12.0.5Morris Jobke2018-01-241-2/+2
* | [tx-robot] updated from transifexNextcloud bot2018-01-24112-116/+122
|/
* increase the time we wait for smb notifications in the testRobin Appelman2018-01-231-2/+2
* [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 RC3Morris Jobke2018-01-221-2/+2
|/
* [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
|\
| * update icewind/smb to 2.0.4Robin Appelman2018-01-1911-61/+89
|/
* [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 RC2Morris Jobke2018-01-181-3/+4
|/
* [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 nextcloud/backport/7879/dont-disable-shipped-ap...Roeland Jago Douma2018-01-161-2/+2
|\
| * Keep all shipped apps enabled because they should be okayJoas Schilling2018-01-161-2/+2
* | Merge pull request #7817 from nextcloud/stable12-7767Roeland Jago Douma2018-01-162-8/+19
|\ \ | |/ |/|
| * Fix appmenu svg double invertJulius Härtl2018-01-122-8/+19
* | [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
|\ \ | |/ |/|
| * Log full exception in cron instead of only the messageMorris Jobke2018-01-121-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2018-01-12120-130/+160
* Merge pull request #7792 from nextcloud/stable12-7783-fix-empty-details-view-...Morris Jobke2018-01-114-14/+94
|\
| * Add acceptance test for renaming a file with the details view openDaniel Calviño Sánchez2018-01-112-0/+57
| * Fix empty details view after renaming a fileDaniel Calviño Sánchez2018-01-112-1/+31
| * Move adding test files to "beforeEach()"Daniel Calviño Sánchez2018-01-111-13/+6
|/
* Merge pull request #7779 from nextcloud/12-7778Roeland Jago Douma2018-01-111-0/+0
|\
| * Improve zip supportMorris Jobke2018-01-101-0/+0
* | Merge pull request #7786 from nextcloud/mount-type-federated-shares-stable12Roeland Jago Douma2018-01-111-0/+10
|\ \
| * | return correct mount type for federated sharesBjoern Schiessle2018-01-111-0/+10
|/ /
* / [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
|\
| * update icewind/smb to 2.0.3Robin Appelman2018-01-1017-90/+162
* | Merge pull request #7770 from nextcloud/stable12-7756Morris Jobke2018-01-101-1/+1
|\ \
| * | Fix SCSS processing when undoing theming valuesJulius Härtl2018-01-101-1/+1
| |/
* | Merge pull request #7777 from nextcloud/stable12-7769Morris Jobke2018-01-101-0/+1
|\ \ | |/ |/|
| * Set height for sidebar iconsJulius Härtl2018-01-101-0/+1
|/
* [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
|\
| * add option to use legacy v2 auth with s3Robin Appelman2018-01-095-1/+224
* | Merge pull request #7759 from nextcloud/7712_12Roeland Jago Douma2018-01-092-5/+5
|\ \
| * | Use correct L10N files for jsconfigRoeland Jago Douma2018-01-092-5/+5
| |/
* | Merge pull request #7757 from nextcloud/12-7605Morris Jobke2018-01-091-5/+32
|\ \ | |/ |/|
| * Add missing timeout multiplierDaniel Calviño Sánchez2018-01-091-2/+6
| * Wait for the shared link to be set in the acceptance testsDaniel Calviño Sánchez2018-01-091-1/+24