scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
8161 commits 70 branches 179 tags 165 MiB
Commit graph

8161 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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