Miha Mencin
|
882ec711fe
|
Merge pull request #2276 from biosistemika/master
Master
|
2019-12-20 17:39:46 +01:00 |
|
Miha Mencin
|
9df967fdc1
|
Merge pull request #2275 from biosistemika/hotfix/1.17.10
Hotfix/1.17.10
|
2019-12-20 17:38:52 +01:00 |
|
Miha Mencin
|
ea4dbbb97d
|
Bump version to 1.17.10
|
2019-12-20 17:37:49 +01:00 |
|
Alex Kriuchykhin
|
3e37d286c9
|
Merge pull request #2274 from okriuchykhin/ok_SCI_4171
Fix creation of new tasks on canvas [SCI-4171]
|
2019-12-19 16:21:53 +01:00 |
|
Oleksii Kriuchykhin
|
7694b2ac6d
|
Update Dockerfile [SCI-4171]
|
2019-12-19 15:54:06 +01:00 |
|
Oleksii Kriuchykhin
|
b945171f2f
|
Fix creation of new tasks on canvas [SCI-4171]
|
2019-12-19 15:48:25 +01:00 |
|
Alex Kriuchykhin
|
017b4a3913
|
Merge pull request #2273 from biosistemika/dependabot/bundler/rack-2.0.8
Bump rack from 2.0.7 to 2.0.8
|
2019-12-19 11:52:43 +01:00 |
|
dependabot[bot]
|
fd0816ec7e
|
Bump rack from 2.0.7 to 2.0.8
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)
Signed-off-by: dependabot[bot] <support@github.com>
|
2019-12-19 00:22:41 +00:00 |
|
mlorb
|
891baba1e7
|
Merge pull request #2269 from mlorb/ml-sci-4093
Add new button style [SCI-4093]
|
2019-12-18 10:39:52 +01:00 |
|
Mojca Lorber
|
46e7de0c25
|
Add new button style
|
2019-12-18 09:57:39 +01:00 |
|
Miha Mencin
|
8d22bf6f2e
|
Version bump to 1.17.9
|
2019-12-17 14:54:48 +01:00 |
|
Miha Mencin
|
1cf6d35e57
|
Merge pull request #2268 from biosistemika/release/1.17.9
Release/1.17.9
|
2019-12-17 14:53:06 +01:00 |
|
Miha Mencin
|
b67911c81a
|
Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9
|
2019-12-17 14:48:50 +01:00 |
|
Alex Kriuchykhin
|
792e6f2eb9
|
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
|
2019-12-12 16:12:40 +01:00 |
|
Oleksii Kriuchykhin
|
0094528a02
|
Improve connected accounts unlinking [SCI-4142]
|
2019-12-12 14:57:27 +01:00 |
|
Alex Kriuchykhin
|
91174437ee
|
Merge pull request #2261 from biosistemika/dependabot/bundler/puma-4.3.1
Bump puma from 4.1.1 to 4.3.1
|
2019-12-12 14:10:41 +01:00 |
|
dependabot[bot]
|
3940f4ccf8
|
Bump puma from 4.1.1 to 4.3.1
Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.1.1...v4.3.1)
Signed-off-by: dependabot[bot] <support@github.com>
|
2019-12-12 12:09:51 +00:00 |
|
Alex Kriuchykhin
|
d8c2b70365
|
Merge pull request #2259 from biosistemika/release-1-17-8
Merge release 1.17.8 to develop
|
2019-12-12 13:08:52 +01:00 |
|
Oleksii Kriuchykhin
|
07b5ab24c3
|
Switch to chromium-driver for cucumber tests
|
2019-12-11 11:20:58 +01:00 |
|
Oleksii Kriuchykhin
|
1aa334fdaa
|
Merge branch 'develop' into release-1-17-8
|
2019-12-11 10:55:00 +01:00 |
|
Alex Kriuchykhin
|
1953cc28d8
|
Merge pull request #2258 from biosistemika/release-1-17-8
Release 1 17 8
|
2019-12-11 10:33:18 +01:00 |
|
Miha Mencin
|
9914005524
|
Bump version to 1.17.8
|
2019-12-11 09:55:11 +01:00 |
|
Oleksii Kriuchykhin
|
ff4ef818fb
|
Implement SSO with Azure AD [SCI-4142]
|
2019-12-10 17:24:53 +01:00 |
|
aignatov-bio
|
4d3968a48a
|
Merge pull request #2249 from aignatov-bio/ai-sci-fix-comment-error
Remove edit initialization from comment view mode
|
2019-12-10 10:36:38 +01:00 |
|
aignatov-bio
|
5ba8e6507e
|
Merge branch 'release-1-17-8' into ai-sci-fix-comment-error
|
2019-12-10 10:36:30 +01:00 |
|
Alex Kriuchykhin
|
2e15548680
|
Merge pull request #2245 from okriuchykhin/ok_SCI_4107
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-10 10:35:09 +01:00 |
|
Alex Kriuchykhin
|
7a97f813b2
|
Merge pull request #2252 from biosistemika/SCI-4109-export-with-assigned-item-bugfix
SCI-4109 fix the file copying
|
2019-12-09 16:04:43 +01:00 |
|
aignatov-bio
|
c05991be94
|
Merge pull request #2253 from aignatov-bio/ai-sci-4144-fix-autosave-for-chemical-drawings
Fix autosave for marvinJS in tinyMCE [SCI-4144]
|
2019-12-09 16:03:56 +01:00 |
|
aignatov-bio
|
c4a87bed52
|
Fix autosave for marvinJS in tinyMCE
|
2019-12-09 11:23:01 +01:00 |
|
aignatov-bio
|
63edd3e877
|
Remove edit initialization from view mode
|
2019-12-06 13:26:47 +01:00 |
|
Oleksii Kriuchykhin
|
7a89cae56f
|
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-05 13:27:17 +01:00 |
|
Oleksii Kriuchykhin
|
03667f619f
|
Merge branch 'release-1-17-7' into develop
|
2019-12-05 13:03:39 +01:00 |
|
aignatov-bio
|
29f4b6fe79
|
Merge pull request #2248 from aignatov-bio/ai-sci-4125-search-doesnt-find-file-content
Fix file post process method [SCI-4125]
|
2019-12-05 12:48:03 +01:00 |
|
aignatov-bio
|
9fe6e7b538
|
Fix markup
|
2019-12-05 11:27:52 +01:00 |
|
aignatov-bio
|
ac545a7775
|
Fix GemFile lock
|
2019-12-05 11:26:42 +01:00 |
|
Oleksii Kriuchykhin
|
f675948fa6
|
Bump version to 1.17.7
|
2019-12-04 10:49:43 +01:00 |
|
aignatov-bio
|
6c057a86c9
|
Update git version
|
2019-12-03 13:31:13 +01:00 |
|
aignatov-bio
|
42dac51241
|
Fix markup
|
2019-12-03 10:38:21 +01:00 |
|
aignatov-bio
|
be87d50bfa
|
Remove YOMU serrver
|
2019-12-03 10:35:54 +01:00 |
|
aignatov-bio
|
d5f9604e1c
|
Fix file post process method
|
2019-12-03 10:17:47 +01:00 |
|
Miha Mencin
|
8caa88fc7e
|
Merge branch 'release-1-17-7' of github.com:biosistemika/scinote-web into release-1-17-7
|
2019-12-03 09:10:55 +01:00 |
|
Miha Mencin
|
80579043b2
|
Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7
|
2019-12-03 09:10:09 +01:00 |
|
aignatov-bio
|
d643a08a9c
|
Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task
Fix task activity page [SCI-4137]
|
2019-12-03 09:09:36 +01:00 |
|
aignatov-bio
|
f148ae8b24
|
Merge pull request #2242 from aignatov-bio/ai-sci-4136-fix-smart-annotation-on-autosave
Fix smart annotation for autosave [SCI-4136]
|
2019-12-03 09:09:16 +01:00 |
|
aignatov-bio
|
1a3dbc9521
|
Merge pull request #2241 from aignatov-bio/ai-sci-4135-fix-experiment-copy
Fix experiment copy [SCI-4135]
|
2019-12-03 09:09:05 +01:00 |
|
aignatov-bio
|
010a44650c
|
Fix task activity page
|
2019-12-02 16:04:50 +01:00 |
|
aignatov-bio
|
2d4104b0f2
|
Fix smart annotation for autosave
|
2019-12-02 15:53:42 +01:00 |
|
aignatov-bio
|
43ff9f6f26
|
Fix experiment copy
|
2019-12-02 15:34:42 +01:00 |
|
aignatov-bio
|
18b31875bb
|
Merge pull request #2240 from aignatov-bio/ai-sci-4133-fix-autosave-in-result
Fix autosave in steps and result [SCI-4133]
|
2019-12-02 10:20:45 +01:00 |
|
aignatov-bio
|
84e47f5b4c
|
Fix autosave in steps and result
|
2019-11-29 16:10:14 +01:00 |
|