scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
8549 commits 69 branches 179 tags 165 MiB
Commit graph

8549 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 51d69f9442
Merge pull request #2839 from okriuchykhin/ok_SCI_4978 
Move some consequence executon into background process [SCI-4978]
 2020-09-14 14:39:53 +02:00
Urban Rotnik 5d9523704e Merge branch 'jg_sci_2228' of github.com:jbargu/scinote-web into jg_sci_2228 2020-09-14 11:33:04 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio 19079cf977
Merge pull request #2837 from aignatov-bio/ai-sci-4998-fix-status-dropdown-for-disabled-options 
Disable button when condition not fulfilled [SCI-4998]
 2020-09-11 12:29:20 +02:00
aignatov-bio 5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
aignatov-bio 4b8f940c41
Merge pull request #2824 from aignatov-bio/ai-sci-4949-update-css-for-smart-annotation 
Refactor smart annotation front-end [SCI-4949]
 2020-09-10 13:11:43 +02:00
mlorb 3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580 
Fix buttons visability on reports page according to new styleguide [SCI-4580]
 2020-09-10 09:32:16 +02:00
Urban Rotnik 82e01e5232
Merge pull request #2836 from urbanrotnik/ur-sci-4992 
Fix canvas task due date and status alignment [SCI-4992]
 2020-09-09 15:16:34 +02:00
Mojca Lorber d055d6e241 Fix quotes again 2020-09-09 14:43:12 +02:00
Urban Rotnik 78c9394b1f Fix aligment due date and status on canvas card 2020-09-09 14:33:25 +02:00
Mojca Lorber eeb8f4a97a Disable 'complete step' button on locked task 2020-09-09 14:32:37 +02:00
aignatov-bio 7a86bb47c5 Add styling and highligh 2020-09-09 14:17:19 +02:00
Urban Rotnik 0ae39678d4
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state 
Add error message for locked task, update some permission checks[SCI-4982]
 2020-09-09 14:04:08 +02:00
Urban Rotnik 8b10cde6b4 Fix DeepScan error 2020-09-09 13:51:11 +02:00
aignatov-bio 946b961b1a
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses 
Add front-end checks for statuses [SCI-4975]
 2020-09-09 13:21:04 +02:00
Urban Rotnik 45a09e5a3c Fix tests 2020-09-09 13:17:07 +02:00
aignatov-bio 661220890f Update error handling 2020-09-09 12:25:34 +02:00
aignatov-bio f4a13a73cb Refactor smart annotation front-end 2020-09-09 12:25:34 +02:00
aignatov-bio 5d9d7d6a12
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions 
Add description for conditions [SCI-4983]
 2020-09-09 11:33:48 +02:00
Urban Rotnik 9419a16df5
Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication 
Remove notes duplication [SCI-4988]
 2020-09-09 11:29:10 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
aignatov-bio 7763d11634 Fix markup 2020-09-09 11:24:54 +02:00
Urban Rotnik 9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
mlorb 159cef0494
Merge pull request #2830 from mlorb/ml-sci-4952 
Update smart annotation appearance in the text [SCI-4952]
 2020-09-09 10:28:37 +02:00
Mojca Lorber ea1510bcdd Fix quotes 2020-09-09 10:27:32 +02:00
aignatov-bio 84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575 
Replace old arrow with new one [SCI-4575]
 2020-09-09 09:05:39 +02:00
aignatov-bio 9a771da7f7
Merge pull request #2821 from mlorb/ml-sci-4578 
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
 2020-09-09 09:05:26 +02:00
aignatov-bio ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572 
Change step checklist and table edit mode [SCI-4572]
 2020-09-09 09:02:56 +02:00
aignatov-bio bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
aignatov-bio 687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks 
Add completed/uncompleted methods to my_module [SCI-4972]
 2020-09-09 08:20:36 +02:00
Oleksii Kriuchykhin 99d136918c Merge branch 'develop' into features/pwa 2020-09-08 16:34:28 +02:00
Alex Kriuchykhin c413ac21a1
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses 
Add API endpoints for workflows [SCI-4831]
 2020-09-08 16:23:05 +02:00
dependabot[bot] 9a5905baf2
Bump http-proxy from 1.17.0 to 1.18.1 
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-09-08 14:22:28 +00:00
Alex Kriuchykhin f9e78a1acc
Merge pull request #2822 from biosistemika/dependabot/npm_and_yarn/node-sass-4.13.1 
Bump node-sass from 4.12.0 to 4.13.1
 2020-09-08 16:21:41 +02:00
Alex Kriuchykhin 7eb43a16d5
Merge pull request #2806 from okriuchykhin/ok_SCI_4859 
Add secondary-navigation-title-name data hook [SCI-4859]
 2020-09-08 16:19:42 +02:00
Urban Rotnik c628fb2598 Remove duplicated notes section in reports 2020-09-08 16:10:24 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Oleksii Kriuchykhin bee550531f Merge branch 'develop' into master 2020-09-08 15:05:56 +02:00
Oleksii Kriuchykhin f471219499 Bump version to 1.19.7 2020-09-08 15:05:36 +02:00
aignatov-bio 97db1e0e1c Fix tests 2020-09-08 14:57:26 +02:00
aignatov-bio 4083ed1755 Fix tests 2020-09-08 14:52:23 +02:00
Alex Kriuchykhin a938db8271
Merge pull request #2831 from okriuchykhin/ok_SCI_4880_v2 
Improve step reposition after deletion [SCI-4880]
 2020-09-08 13:13:27 +02:00
Oleksii Kriuchykhin dd347aa834 Improve step reposition after deletion [SCI-4880] 2020-09-08 11:48:06 +02:00
aignatov-bio e1255bf942 Remove duplicate action 2020-09-08 09:50:26 +02:00
aignatov-bio 0be99c12c2 revert changes 2020-09-08 09:45:42 +02:00
aignatov-bio ee333a982a Revert back state logic 2020-09-08 09:45:42 +02:00
aignatov-bio bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
Mojca Lorber 0eb81065b3 Fix tests 2020-09-08 09:39:15 +02:00