Commit graph

6522 commits

Author SHA1 Message Date
aignatov-bio
f729baf884 Fix cucumber tests 2019-11-13 15:10:37 +01:00
aignatov-bio
1488f75e26 Add activities 2019-11-13 13:57:04 +01:00
aignatov-bio
a356c290ea Fix markup 2019-11-12 11:32:43 +01:00
aignatov-bio
4a8eb041cb Fix markup 2019-11-12 11:31:26 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
aignatov-bio
cf2687f7e5 Merge branch 'ml-sci-4004' of https://github.com/mlorb/scinote-web into mlorb-ml-sci-4004 2019-11-07 13:03:02 +01:00
Alex Kriuchykhin
174a98778e
Bump version to 1.17.5 2019-11-06 11:17:18 +01:00
Alex Kriuchykhin
522d236e10
Merge pull request #2198 from okriuchykhin/ok_SCI_4053
Fix TinyMCE images in protocol cloning [SCI-4053]
2019-11-05 18:15:22 +01:00
Oleksii Kriuchykhin
b2eda231a0 Fix TinyMCE images in protocol clonning [SCI-4053] 2019-11-05 18:13:44 +01:00
Alex Kriuchykhin
95686a9275
Merge pull request #2197 from okriuchykhin/ok_SCI_4053
Fix TinyMCE image URLs in the editor [SCI-4053]
2019-11-05 13:46:48 +01:00
Oleksii Kriuchykhin
67fdda1eeb Fix TinyMCE image URLs in the editor [SCI-4053] 2019-11-05 13:38:47 +01:00
aignatov-bio
384b9b7cd8
Merge pull request #2196 from aignatov-bio/ai-sci-4050-update-avatars
Update avatars and small CSS fixes [SCI-4050]
2019-11-05 11:49:34 +01:00
aignatov-bio
b6292a029e Fix localization 2019-11-05 10:46:05 +01:00
aignatov-bio
ae0db3a7bc Update avatars and small CSS fixes 2019-11-05 10:43:02 +01:00
Mojca Lorber
16eddc0ad0 Save on click away, inline editing 2019-11-03 14:59:30 +01:00
Alex Kriuchykhin
ec66ab8654
Merge pull request #2190 from mlorb/ml-sci-4023
Small improvements in the avatar settings [SCI-4023]
2019-10-30 16:02:24 +01:00
Mojca Lorber
a3ded83292 Small css change 2019-10-30 15:42:11 +01:00
Mojca Lorber
88faeb5178 Change avatars again 2019-10-30 15:30:04 +01:00
Mojca Lorber
7b86a3932a Additional avatar small fixes 2019-10-30 15:23:14 +01:00
Alex Kriuchykhin
2e4f444f63
Merge pull request #2191 from okriuchykhin/ok_SCI_4047
Fix LinkedIn sign-up [SCI-4047]
2019-10-29 16:29:13 +01:00
Oleksii Kriuchykhin
ab691efdb2 Fix LinkedIn sign-up [SCI-4047] 2019-10-29 16:20:19 +01:00
aignatov-bio
717b70f75b
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
2019-10-29 14:11:39 +01:00
Mojca Lorber
a0873cb16d Small improvements in the avatar settings 2019-10-29 13:21:22 +01:00
Alex Kriuchykhin
b33ba9350a
Merge pull request #2189 from okriuchykhin/ok_SCI_4047
Fix ChromeDriver and Chrome versions for test environment [SCI-4047]
2019-10-29 11:55:09 +01:00
Alex Kriuchykhin
228cb2e31f
Merge pull request #2177 from okriuchykhin/ok_SCI_4035
Add storage volume to web service in production docker-compose config [SCI-4035]
2019-10-29 11:32:20 +01:00
Oleksii Kriuchykhin
91b4c54c58 Fix ChromeDriver and Chrome versions for test environment [SCI-4047] 2019-10-29 11:29:16 +01:00
Alex Kriuchykhin
e4ca0cdb5a
Merge pull request #2188 from biosistemika/dependabot/bundler/rubyzip-1.3.0
Bump rubyzip from 1.2.4 to 1.3.0
2019-10-29 10:51:57 +01:00
Alex Kriuchykhin
853d1a16bf
Merge pull request #2187 from biosistemika/dependabot/bundler/bootstrap-sass-3.4.1
Bump bootstrap-sass from 3.3.7 to 3.4.1
2019-10-29 10:50:23 +01:00
Alex Kriuchykhin
5703b56000
Merge pull request #2186 from biosistemika/dependabot/npm_and_yarn/lodash-es-4.17.15
Bump lodash-es from 4.17.11 to 4.17.15
2019-10-29 10:42:30 +01:00
Alex Kriuchykhin
ec079a302d
Merge pull request #2185 from biosistemika/dependabot/npm_and_yarn/eslint-utils-1.4.3
Bump eslint-utils from 1.3.1 to 1.4.3
2019-10-29 10:42:11 +01:00
Alex Kriuchykhin
336d336b53
Merge pull request #2184 from biosistemika/dependabot/npm_and_yarn/mixin-deep-1.3.2
Bump mixin-deep from 1.3.1 to 1.3.2
2019-10-29 10:41:44 +01:00
Alex Kriuchykhin
f5020d20e9
Merge pull request #2183 from biosistemika/dependabot/npm_and_yarn/lodash-4.17.13
Bump lodash from 4.17.11 to 4.17.13
2019-10-29 10:41:26 +01:00
Alex Kriuchykhin
5ff81115ad
Merge pull request #2182 from biosistemika/dependabot/npm_and_yarn/lodash.template-4.5.0
Bump lodash.template from 4.4.0 to 4.5.0
2019-10-29 10:41:03 +01:00
Alex Kriuchykhin
264ff64b37
Merge pull request #2181 from biosistemika/dependabot/npm_and_yarn/lodash.merge-4.6.2
Bump lodash.merge from 4.6.1 to 4.6.2
2019-10-29 10:40:21 +01:00
dependabot[bot]
462c4ed92f
Bump rubyzip from 1.2.4 to 1.3.0
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.4...v1.3.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:45 +00:00
dependabot[bot]
03f5b87b8e
Bump bootstrap-sass from 3.3.7 to 3.4.1
Bumps [bootstrap-sass](https://github.com/twbs/bootstrap-sass) from 3.3.7 to 3.4.1.
- [Release notes](https://github.com/twbs/bootstrap-sass/releases)
- [Changelog](https://github.com/twbs/bootstrap-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-sass/compare/v3.3.7...v3.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:37 +00:00
dependabot[bot]
4d2a369264
Bump lodash-es from 4.17.11 to 4.17.15
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:33 +00:00
dependabot[bot]
5e3888c1ec
Bump eslint-utils from 1.3.1 to 1.4.3
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.3.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:29 +00:00
dependabot[bot]
dd35738fbc
Bump mixin-deep from 1.3.1 to 1.3.2
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:26 +00:00
dependabot[bot]
5f640c64c2
Bump lodash from 4.17.11 to 4.17.13
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:26 +00:00
dependabot[bot]
934214e739
Bump lodash.template from 4.4.0 to 4.5.0
Bumps [lodash.template](https://github.com/lodash/lodash) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.4.0...4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:25 +00:00
dependabot[bot]
57fbba0728
Bump lodash.merge from 4.6.1 to 4.6.2
Bumps [lodash.merge](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-29 09:34:25 +00:00
Alex Kriuchykhin
ba3a5e5460
Merge pull request #2159 from mlorb/ml-sci-3816-v2
Fix reloading of datatables header again [SCI-3816]
2019-10-29 10:33:04 +01:00
Alex Kriuchykhin
16dc2d0fe0
Merge pull request #2130 from jbargu/jg_sci_3920
[SCI-3920] Add omniauth initializer
2019-10-29 10:29:26 +01:00
Oleksii Kriuchykhin
8de9fc7618 Add storage volume to web service in production docker-compose config [SCI-4035] 2019-10-24 14:10:47 +02:00
Urban Rotnik
169a381629
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download
Fix for downloading image [SCI-4008]
2019-10-22 15:12:11 +02:00
Urban Rotnik
a7d351dc38 Add file size check 2019-10-22 14:13:22 +02:00
Alex Kriuchykhin
e333e7c44a
Merge pull request #2173 from biosistemika/release_1_17_4
Merge release 1.17.4 to master
2019-10-22 13:21:02 +02:00
Alex Kriuchykhin
5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
2019-10-22 12:45:02 +02:00
aignatov-bio
0ad824c28f Fix structure sql 2019-10-22 12:30:18 +02:00