Alex Kriuchykhin
|
cb9fe04584
|
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters
Fix global activities filters [SCI-4785]
|
2020-07-23 10:09:36 +02:00 |
|
Alex Kriuchykhin
|
560f6e2c91
|
Merge pull request #2739 from biosistemika/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.13 to 4.17.19
|
2020-07-23 10:05:55 +02:00 |
|
aignatov-bio
|
b214d2df77
|
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch
Fix switch view margins [SCI-4815]
|
2020-07-23 08:57:20 +02:00 |
|
aignatov-bio
|
218096473a
|
Merge pull request #2752 from aignatov-bio/develop
Merge TinyMCE feature
|
2020-07-22 14:21:25 +02:00 |
|
aignatov-bio
|
1d3055011f
|
Merge branch 'features/tinymce-tables' into develop
|
2020-07-22 13:41:43 +02:00 |
|
aignatov-bio
|
04064bf874
|
Merge pull request #2751 from aignatov-bio/develop
Merge 2FA feature
|
2020-07-22 13:40:51 +02:00 |
|
aignatov-bio
|
53d62b0310
|
Fix tests
|
2020-07-22 13:16:27 +02:00 |
|
aignatov-bio
|
005bfb2ba7
|
Fix merge conflicts
|
2020-07-22 12:37:18 +02:00 |
|
aignatov-bio
|
ddfe8231d8
|
Merge branch 'features/2fa' into develop
|
2020-07-22 11:56:36 +02:00 |
|
Alex Kriuchykhin
|
ab9b5c6d64
|
Merge pull request #2736 from aignatov-bio/ai-sci-4779-tinymce-tables-edge-cases
Add tinymce table support to docx [SCI-4779]
|
2020-07-22 11:19:59 +02:00 |
|
Urban Rotnik
|
7019e42736
|
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email
Fix font size in dropdown [SCI-4816]
|
2020-07-20 15:50:10 +02:00 |
|
aignatov-bio
|
691b8ec327
|
Fix switch view margins
|
2020-07-20 15:17:24 +02:00 |
|
aignatov-bio
|
75930b99c3
|
Fix global activities filters
|
2020-07-20 15:01:00 +02:00 |
|
Alex Kriuchykhin
|
eb7fe360ff
|
Merge pull request #2729 from urbanrotnik/ur-sci-4853
Remove :not_shared permission level for TeamRepository entity [SCI-4853]
|
2020-07-20 11:49:07 +02:00 |
|
Alex Kriuchykhin
|
806f6e32eb
|
Merge pull request #2737 from mlorb/ml-sci-4838
Fix naming of filter field for repositories tables [SCI-4838]
|
2020-07-20 11:42:02 +02:00 |
|
Urban Rotnik
|
748dd7912b
|
Fix font size in dropdown
|
2020-07-20 11:36:25 +02:00 |
|
aignatov-bio
|
03abafa4be
|
Merge pull request #2732 from aignatov-bio/ai-sci-4848-add-fallback-option-to-2fa
Add recovery strategy for 2FA [SCI-4848]
|
2020-07-20 09:41:34 +02:00 |
|
mlorb
|
6ad1c6ee3d
|
Merge pull request #2734 from mlorb/ml-sci-4795
Add devise lockable [SCI-4795]
|
2020-07-17 18:39:40 +02:00 |
|
Mojca Lorber
|
532f6dfc03
|
Fix uniqueness
|
2020-07-17 16:37:32 +02:00 |
|
Mojca Lorber
|
d8794972d5
|
Change migration
|
2020-07-17 16:35:03 +02:00 |
|
dependabot[bot]
|
edb58026ac
|
Bump lodash from 4.17.13 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.19)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-07-17 01:05:52 +00:00 |
|
Mojca Lorber
|
9464d2753d
|
Fix naming of filter field for repositories tables
|
2020-07-15 10:52:47 +02:00 |
|
aignatov-bio
|
2aeb661be9
|
Fix markup
|
2020-07-15 09:47:29 +02:00 |
|
aignatov-bio
|
f77902f6d4
|
Add tinymce table support to docx
|
2020-07-15 09:44:25 +02:00 |
|
Mojca Lorber
|
b087a8cbce
|
Add migrations for devise lockable
|
2020-07-14 14:53:20 +02:00 |
|
Mojca Lorber
|
f7083a000a
|
Add devise lockable to user
|
2020-07-14 14:49:51 +02:00 |
|
Oleksii Kriuchykhin
|
41ceba11b8
|
Bumb version to 1.19.4
|
2020-07-14 14:23:41 +02:00 |
|
aignatov-bio
|
cadbc3e47b
|
Fix tests
|
2020-07-14 11:20:06 +02:00 |
|
Alex Kriuchykhin
|
7c946d326a
|
Merge pull request #2733 from aignatov-bio/ai-sci-revert-fontawesome-in-reports-to-cdn
Revert FontAwesome in reports to CDN
|
2020-07-14 09:48:50 +02:00 |
|
aignatov-bio
|
39b5651283
|
Revert FontAwesome in reports to CDN
|
2020-07-14 09:44:03 +02:00 |
|
Alex Kriuchykhin
|
8dd478ad61
|
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports
Improve pdf reports [SCI-4874]
|
2020-07-13 17:02:10 +02:00 |
|
aignatov-bio
|
c73998b6bf
|
Fix markup
|
2020-07-13 16:32:28 +02:00 |
|
aignatov-bio
|
fd07408868
|
Merge pull request #2713 from aignatov-bio/ai-sci-4814-add-ux-for-2fa
Add UX design to 2FA settings page [SCI-4814]
|
2020-07-13 16:29:28 +02:00 |
|
Alex Kriuchykhin
|
84c2022b55
|
Merge pull request #2731 from mlorb/ml-sci-4567-v2
Fix Settings pages titles [SCI-4567]
|
2020-07-13 16:28:45 +02:00 |
|
aignatov-bio
|
c592954400
|
Add UX
|
2020-07-13 16:05:23 +02:00 |
|
Mojca Lorber
|
212ba76c16
|
Fix Settings pages titles
|
2020-07-13 14:51:51 +02:00 |
|
aignatov-bio
|
f8c6d9f260
|
Fix markup
|
2020-07-13 14:31:57 +02:00 |
|
aignatov-bio
|
a7fac38fcb
|
Improve pdf reports
|
2020-07-13 14:29:59 +02:00 |
|
Urban Rotnik
|
07e2df8951
|
Remove :not_shared permission level for TeamRepository entity
|
2020-07-13 12:56:26 +02:00 |
|
aignatov-bio
|
7d20bf6fea
|
Add recovery screen
|
2020-07-13 09:51:04 +02:00 |
|
mlorb
|
6357cf86ba
|
Merge pull request #2728 from mlorb/ml-sci-4793-v2
Add check for search state
|
2020-07-10 16:37:30 +02:00 |
|
Mojca Lorber
|
cea9e6f956
|
Add check for search state
|
2020-07-10 15:39:01 +02:00 |
|
Alex Kriuchykhin
|
594d8031ce
|
Merge pull request #2726 from mlorb/ml-sci-4855
Remove search state load from repositories table [SCI-4855]
|
2020-07-10 13:07:44 +02:00 |
|
Mojca Lorber
|
39ae1ed25e
|
Fix search status
|
2020-07-10 12:52:07 +02:00 |
|
Alex Kriuchykhin
|
edf8fc6428
|
Merge pull request #2725 from aignatov-bio/ai-sci-4820-double-events-on-inventory
Disable inventories table initialization on turbolinks preview [SCI-4820]
|
2020-07-10 12:50:15 +02:00 |
|
Alex Kriuchykhin
|
a1f5070c15
|
Merge pull request #2727 from okriuchykhin/ok_SCI_4854
Fix issue with missing archived items on task page [SCI-4854]
|
2020-07-10 12:48:00 +02:00 |
|
Oleksii Kriuchykhin
|
c7fcc3f89b
|
Fix issue with missing archived items on task page [SCI-4854]
|
2020-07-10 11:43:06 +02:00 |
|
aignatov-bio
|
50714eb59d
|
Disable inventories table initialization on turbolinks preview
|
2020-07-10 11:05:27 +02:00 |
|
Mojca Lorber
|
21f0d431b0
|
Remove search state load from repositories table
|
2020-07-10 11:05:22 +02:00 |
|
Miha Mencin
|
12a8d50098
|
Merge pull request #2722 from okriuchykhin/ok_SCI_4845
Fix missing unshared inventories with snapshots in reports [SCI-4845]
|
2020-07-10 09:21:58 +02:00 |
|