Commit graph

10394 commits

Author SHA1 Message Date
Alex Kriuchykhin
957ac92669
Merge pull request #2735 from urbanrotnik/ur-sci-4824-status-button
New task flow buttons and actions [SCI-4824] [SCI-4833]
2020-07-23 16:20:41 +02:00
Urban Rotnik
025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
aignatov-bio
d044f7616b Redirect to sign in after recover password 2020-07-23 15:48:51 +02:00
Alex Kriuchykhin
8b24a0f704
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error
Add blacklist for dashboard activities [SCI-4730]
2020-07-23 15:21:51 +02:00
Alex Kriuchykhin
26cfa001c8
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test
Add test for canvas_controller [SCI-4769]
2020-07-23 15:18:01 +02:00
Alex Kriuchykhin
d4408f6af7
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
Add pagination to results page [SCI-4732]
2020-07-23 14:45:10 +02:00
aignatov-bio
ac1915351d
Merge pull request #2748 from aignatov-bio/ai-sci-4886-add-permission-checks-to-docx
Add scopes and permission checks for docx report [SCI-4886]
2020-07-23 14:26:53 +02:00
aignatov-bio
a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
Urban Rotnik
9bcf1a5df5 Add blacklist for dashboard activities 2020-07-23 14:22:58 +02:00
Urban Rotnik
aecd6b228b
Merge pull request #2744 from urbanrotnik/ur-sci-4764-increase-characters-limit-for-rte
Increase chars limit for RTE [SCI-4764]
2020-07-23 12:58:36 +02:00
Urban Rotnik
077f5eefdb
Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value
Fix undefined text cell [SCI-4890]
2020-07-23 12:56:43 +02:00
aignatov-bio
04a6a2a250 Small fixes 2020-07-23 11:35:22 +02:00
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
Urban Rotnik
51ca828399 Fix undefined text cell 2020-07-22 17:27:36 +02:00
Urban Rotnik
6bb760c0a9 Remove cucumber test for complete/uncomplete step 2020-07-22 16:50:10 +02:00
Urban Rotnik
512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
Urban Rotnik
aacee14fc6 Add Status button 2020-07-22 15:30:47 +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
c13730ee8d
Merge pull request #2740 from mlorb/ml-sci-4833
Implement Status labels on a Task card [SCI-4823]
2020-07-22 11:32:45 +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
Alex Kriuchykhin
d114808416
Merge pull request #2742 from okriuchykhin/ok_SCI_4825
Prepare database structure and relations for statuses phase one [SCI-4825]
2020-07-21 16:53:48 +02:00
Oleksii Kriuchykhin
809e0c7d77 Fix tests for MyModule [SCI_4825] 2020-07-21 16:20:19 +02:00
Oleksii Kriuchykhin
fa62b33a42 Add status implications checks to the permissions [SCI-4825] 2020-07-21 16:00:09 +02:00
aignatov-bio
e170917b10 Add scopes and permission checks for docx report 2020-07-21 14:11:42 +02:00
Urban Rotnik
3232b4d6bf Add test for canvas_controller 2020-07-21 13:49: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
Urban Rotnik
9dffc27428 Increase chars limit for RTE 2020-07-20 13:33:38 +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
Oleksii Kriuchykhin
7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +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
aignatov-bio
e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber
10e607c281 Implement Status labels on a Task card 2020-07-17 14:48:45 +02:00
aignatov-bio
6ceb4abfb5 Add constant for results limit 2020-07-17 11:12:39 +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
aignatov-bio
7c4bfad09b Add pagination to results page 2020-07-16 15:47:19 +02:00
Mojca Lorber
9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00