Commit Graph

39904 Commits

Author SHA1 Message Date
Daniel Calviño Sánchez 340a774fe2 Add getter for the timeout multiplier
In some cases the acceptance tests have to explicitly wait for something
to happen without using the "find" method from the actor; in those cases
the timeout multiplier needs to be taken into account too, so the test
cases must be able to retrieve it from the actor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-10 13:34:38 +02:00
Roeland Jago Douma 745ad2f323
Fix copy from jailed storage
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 08:07:00 +02:00
Nextcloud bot 79f4b8566b
[tx-robot] updated from transifex 2017-08-10 00:08:24 +00:00
Morris Jobke d9301a5b07 Fix redis-cluster support on drone
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 23:04:29 +02:00
Morris Jobke 2e115921a0 Update syntax to drone 0.8
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-09 12:30:25 +02:00
Nextcloud bot 72029627fc
[tx-robot] updated from transifex 2017-08-09 00:08:30 +00:00
Morris Jobke cd095bb0b8 Merge pull request #5978 from nextcloud/12-5908
[stable12] Add css class for toogle preview icon
2017-08-08 19:23:35 +02:00
Morris Jobke c78a209e72 Merge pull request #5979 from nextcloud/12-5738
[stable12] Improve spelling in LDAP
2017-08-08 19:23:12 +02:00
Morris Jobke 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
Morris Jobke 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
Morris Jobke e11dcfcf9e Merge pull request #5966 from nextcloud/backport-oracle
[stable12] Fix oracle db
2017-08-08 16:34:25 +02:00
Morris Jobke 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
Morris Jobke 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
Morris Jobke bf4283bce8 Merge pull request #5945 from nextcloud/stable12_5836
[stable12] Empty search no longer works
2017-08-08 10:41:05 +02:00
Morris Jobke 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
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
Daniel Calviño Sánchez c91e39a4ca Fix code style
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:06 +02:00
Daniel Calviño Sánchez bb96c79bc7 Remove superfluous selector part
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez 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
Daniel Calviño Sánchez 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
Daniel Calviño Sánchez 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
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
Julius Härtl 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
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
Allan Nordhøy ac977dd3a1 Improve spelling in LDAP
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-04 12:17:04 +02:00
Morris Jobke 1f189d6769 Add css class for toogle preview icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-04 12:15:51 +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
Joas Schilling 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
Joas Schilling 4f31860fd6
Fix repair step for oracle...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:54 +02:00
Joas Schilling d6e902fd03
Fix last failures with oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:46 +02:00
Joas Schilling ae55fefcf6
Fix querybuilder and functionbuilder tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:35 +02:00
Joas Schilling bb30b876ae
Fix ILIKE regex for oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:26 +02:00
Joas Schilling c9430fbb77
Fix auth provider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:17 +02:00
Joas Schilling 54a4aa9315
Use selectAlias()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:10 +02:00
Joas Schilling d6b888461d
Can not insert auto increment on oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:40:00 +02:00
Joas Schilling 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
Joas Schilling 5d7cab245f
Fix clob comparison
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:41 +02:00
Joas Schilling 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
Joas Schilling 5eef54c636
Quote aliases as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-03 16:39:21 +02:00