Commit Graph

39660 Commits

Author SHA1 Message Date
Morris Jobke 3313c682bf Merge pull request #5925 from derkostka/patch-1
[stable12] Removed cast to integer in getSize
2017-08-08 10:40:09 +02:00
Joas Schilling cb4c37498d Merge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-is-missing
[stable12] Don't throw an error when the table doesn't exist
2017-08-08 10:30:45 +02:00
Nextcloud bot 75d5989a8b
[tx-robot] updated from transifex 2017-08-08 00:08:19 +00:00
Joas Schilling 0476de0674
Don't throw an error when the table doesn't exist
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-07 09:43:45 +02:00
Lukas Reschke bfca9fbf11 Merge pull request #5989 from nextcloud/final-version-bump-stable12
Bump version to 12.0.1.5
2017-08-06 20:25:21 +02:00
Nextcloud bot 06a9357a49
[tx-robot] updated from transifex 2017-08-06 00:08:33 +00:00
Lukas Reschke 3640898e80
Bump version to 12.0.5
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-05 12:59:53 +02:00
Nextcloud bot b521ef1bf0
[tx-robot] updated from transifex 2017-08-05 00:08:19 +00:00
Lukas Reschke b500f8fbe9 Merge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightness-correction
Revert "[stable12] theming lightness correction"
2017-08-04 15:39:15 +02:00
Lukas Reschke 3474d73cae Revert "[stable12] theming lightness correction" 2017-08-04 15:38:56 +02:00
Lukas Reschke 9b57d33631 Merge pull request #5977 from nextcloud/stable12-theming-lightness-correction
[stable12] theming lightness correction
2017-08-04 15:38:08 +02:00
Lukas Reschke 0fabfaba69 Merge pull request #5976 from nextcloud/12.0.1rc5
v12.0.1RC5
2017-08-04 15:35:57 +02:00
Julius Härtl 796f0f9333
Use same lightness calculation as the SCSS compiler for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 12:13:33 +02:00
Lukas Reschke 4805ea24ad
v12.0.1RC5
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-04 11:11:10 +02:00
Nextcloud bot 91b6d903f7
[tx-robot] updated from transifex 2017-08-04 00:08:27 +00:00
Nextcloud bot 690ef25928
[tx-robot] updated from transifex 2017-08-03 00:08:15 +00:00
Nextcloud bot ecc82fc1e6
[tx-robot] updated from transifex 2017-08-02 00:08:21 +00:00
Nextcloud bot 9f346fecf1
[tx-robot] updated from transifex 2017-08-01 00:08:35 +00:00
Nextcloud bot b3e2f57f98
[tx-robot] updated from transifex 2017-07-31 00:08:12 +00:00
Lukas Reschke 0a369747a0 Merge pull request #5924 from nextcloud/12.0.1rc4
12.0.1RC4
2017-07-30 15:39:19 +02:00
Nextcloud bot a6499afb5b
[tx-robot] updated from transifex 2017-07-30 00:08:13 +00:00
Sebastian Kostka 09b120c6da [Stable 12] Removed cast to integer in getSize
Fixes - Wrong or no sizes of files/folders #5031 for 32-bit systems a direct cast to integer causes problems.
Backport from #5744

Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
2017-07-29 07:40:13 +02:00
Nextcloud bot 820a74e71b
[tx-robot] updated from transifex 2017-07-29 00:08:40 +00:00
Lukas Reschke 4b325da037
12.0.1RC4
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-28 16:03:36 +02:00
Lukas Reschke 7425316b29 Merge pull request #5919 from nextcloud/add-brackets-on-concat-method
Add brackets around concat statements so comparing the result works a…
2017-07-28 15:35:49 +02:00
Joas Schilling b8bd5808e8
Add brackets around concat statements so comparing the result works as intended
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-28 11:34:35 +02:00
Nextcloud bot ee4804b1da
[tx-robot] updated from transifex 2017-07-28 00:08:14 +00:00
Morris Jobke 2476a5f0e3 Merge pull request #5902 from nextcloud/oc-migration
Add a repair step to drop the account_terms table on oc migration
2017-07-27 17:25:21 +02:00
Morris Jobke 2f153fe4e6 Merge pull request #5896 from nextcloud/12-5895
[stable12] Fix show password button for password change
2017-07-27 13:26:17 +02:00
Joas Schilling 690efbd4eb
Use the existing array of OC versions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-27 12:30:24 +02:00
Lukas Reschke 4b58eccf61
This is RC3
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-27 11:49:16 +02:00
Joas Schilling d06d86a719
Add a repair step to drop the account_terms table on oc migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-27 11:38:55 +02:00
Nextcloud bot 569892d3c0
[tx-robot] updated from transifex 2017-07-27 00:08:13 +00:00
Morris Jobke 1f82223883 Fix show password button for password change
* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 22:57:56 +02:00
Morris Jobke 2290255bb2 Merge pull request #5883 from nextcloud/12-5871
[stable12] Enable postgres on drone again
2017-07-26 22:31:20 +02:00
Lukas Reschke 7c0e1c4860 Merge pull request #5889 from nextcloud/stable12-overlay-on-show-password
fix overlay on show password
2017-07-26 16:55:34 +02:00
Morris Jobke c929e3ad26 Merge pull request #5875 from nextcloud/stable12-edu-edition
[stable12] Add new bundle
2017-07-26 16:47:32 +02:00
Maxence Lange c87002105d fix overlay on show password
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-26 16:18:57 +02:00
Morris Jobke 6b79d77dd2 Enable postgres on drone again
* use proper password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 14:17:53 +02:00
Lukas Reschke 7568b04705 Add new bundle
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-26 11:47:15 +02:00
Nextcloud bot 2902677ccf
[tx-robot] updated from transifex 2017-07-26 00:08:14 +00:00
Lukas Reschke f386fbfe1e Merge pull request #5851 from nextcloud/make-it-rc2
v12.0.1 RC2
2017-07-25 10:28:17 +02:00
Nextcloud bot 79522f4078
[tx-robot] updated from transifex 2017-07-25 00:08:13 +00:00
Lukas Reschke 886a8d12c3 v12.0.1 RC2
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 16:16:57 +02:00
Morris Jobke aea95e48f8 Merge pull request #5858 from nextcloud/12-5850
[stable12] proper logo height in emails for Outlook
2017-07-24 16:16:16 +02:00
Morris Jobke f45e4471f0 Remove unneeded styles
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-24 13:46:17 +02:00
Lukas Reschke 3353dbfab4 Adjust to height=120
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-24 13:46:09 +02:00
Nextcloud bot 65dba8a558
[tx-robot] updated from transifex 2017-07-24 00:08:13 +00:00
Roeland Jago Douma 4ec8cac3ec Merge pull request #5830 from nextcloud/12-5812
[stable12] Fix for mb strlen
2017-07-23 14:05:17 +02:00
Nextcloud bot 12590bf3d8
[tx-robot] updated from transifex 2017-07-23 00:08:07 +00:00