39d1428ab3
Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
...
[stable12] Fix vertical alignment of loading icon and status message in Theming app
2017-08-08 18:42:31 +02:00
3f8e3fbb6b
Merge pull request #5946 from nextcloud/12-5897
...
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
e11dcfcf9e
Merge pull request #5966 from nextcloud/backport-oracle
...
[stable12] Fix oracle db
2017-08-08 16:34:25 +02:00
c119f66e75
Merge pull request #5937 from nextcloud/backend-can-be-wrong---sometimes
...
display error icon on non-success
2017-08-08 16:18:56 +02:00
2abc49968e
Merge pull request #5914 from nextcloud/12-5913
...
[stable12] Fix anchor name for federated sharing settings
2017-08-08 10:41:47 +02:00
bf4283bce8
Merge pull request #5945 from nextcloud/stable12_5836
...
[stable12] Empty search no longer works
2017-08-08 10:41:05 +02:00
bcea6a041f
Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction
...
[stable12] Use same lightness calculation as the SCSS compiler for theming
2017-08-08 10:40:37 +02:00
3313c682bf
Merge pull request #5925 from derkostka/patch-1
...
[stable12] Removed cast to integer in getSize
2017-08-08 10:40:09 +02:00
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
75d5989a8b
[tx-robot] updated from transifex
2017-08-08 00:08:19 +00:00
c91e39a4ca
Fix code style
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:06 +02:00
bb96c79bc7
Remove superfluous selector part
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
6fe6c0545e
Align vertically loading icon and status message
...
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
21ad25465d
Do not use the same rules for loading icon than for upload icon
...
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case; in general the loading icon is
used in a totally different way than the upload icon and thus it should
not share its CSS rules.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:58:05 +02:00
4dd8c4b538
Remove ignored rules
...
The removed rules were either always overriden by other rules or never
used due to not matching any element.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 14:43:57 +02:00
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
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
06a9357a49
[tx-robot] updated from transifex
2017-08-06 00:08:33 +00:00
3640898e80
Bump version to 12.0.5
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-05 12:59:53 +02:00
b521ef1bf0
[tx-robot] updated from transifex
2017-08-05 00:08:19 +00:00
e0ce8a7640
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-08-04 15:39:56 +02:00
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
3474d73cae
Revert "[stable12] theming lightness correction"
2017-08-04 15:38:56 +02:00
9b57d33631
Merge pull request #5977 from nextcloud/stable12-theming-lightness-correction
...
[stable12] theming lightness correction
2017-08-04 15:38:08 +02:00
0fabfaba69
Merge pull request #5976 from nextcloud/12.0.1rc5
...
v12.0.1RC5
2017-08-04 15:35:57 +02:00
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
4805ea24ad
v12.0.1RC5
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-04 11:11:10 +02:00
91b6d903f7
[tx-robot] updated from transifex
2017-08-04 00:08:27 +00:00
3a111adc33
Add a method to compare empty strings with an expression
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:41:03 +02:00
4f31860fd6
Fix repair step for oracle...
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:54 +02:00
d6e902fd03
Fix last failures with oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:46 +02:00
ae55fefcf6
Fix querybuilder and functionbuilder tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:35 +02:00
bb30b876ae
Fix ILIKE regex for oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:26 +02:00
c9430fbb77
Fix auth provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:17 +02:00
54a4aa9315
Use selectAlias()
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:10 +02:00
d6b888461d
Can not insert auto increment on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:00 +02:00
18ba973c13
Fix missing escape on column and table name
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:51 +02:00
5d7cab245f
Fix clob comparison
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:41 +02:00
ee51c49bd7
Allow to specify the table space on occ
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:33 +02:00
5eef54c636
Quote aliases as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:21 +02:00
daa3cfcb70
Oracle does not support PDO::FETCH_KEY_PAIR
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:37:06 +02:00
690ef25928
[tx-robot] updated from transifex
2017-08-03 00:08:15 +00:00
cf16087585
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 20:57:12 +02:00
ecc82fc1e6
[tx-robot] updated from transifex
2017-08-02 00:08:21 +00:00
1ef19bb0ec
Send an email once a file/folder is shared with a user
...
* only if user has set an email address
* only for user shares (no group shares for now)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-01 15:17:32 +02:00
e73f46e344
Empty search no longer works
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 13:29:17 +02:00
e34114072e
now, with less CSS
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-08-01 03:23:58 +02:00
9f346fecf1
[tx-robot] updated from transifex
2017-08-01 00:08:35 +00:00
e62363275d
display error icon on non-success
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-31 15:22:25 +02:00
b3e2f57f98
[tx-robot] updated from transifex
2017-07-31 00:08:12 +00:00
Morris Jobke
Joas Schilling
Nextcloud bot
Daniel Calviño Sánchez
Lukas Reschke
Julius Härtl
Roeland Jago Douma
Maxence Lange