ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] ( #4969 )
...
* Update restore action for protocol templetes [SCI-7634]
* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
Anton
a4e622b903
Update export action in protocol repository [SCI-7901]
2023-02-16 11:39:54 +01:00
ajugo
cb332f163f
Update the Load protocol template to task modal [SCI-7591] ( #4870 )
...
* Update the Load protocol template to task modal [SCI-7591]
* Update the Load protocol template to task modal [SCI-7591]
* Load last protocol version from repository to task [SCI-7591]
* Fix find_by for load_table [SCI-7591]
2023-02-14 13:19:24 +01:00
Anton
ea9d2d8291
Merge branch 'develop' into features/protocol_versioning
2023-02-14 11:07:58 +01:00
Anton
dc5cfb9fc3
Add publish and delete action [SCI-7905]
2023-02-13 14:45:22 +01:00
Anton
743d901310
Add published view for protocol [SCI-7617]
2023-02-13 10:41:30 +01:00
Anton
3902310463
Update protocol view screen [SCI-7590]
2023-02-13 09:52:30 +01:00
Anton
b55f68c0dc
Update archive action for protocol templates [SCI-7898]
2023-02-09 14:10:07 +01:00
aignatov-bio
15d1efa408
Merge pull request #4894 from okriuchykhin/ok_SCI_7718
...
Add permission for protocol draft management [SCI-7718]
2023-02-09 11:34:22 +01:00
Oleksii Kriuchykhin
6ac64aaf34
Add permission for protocol draft management [SCI-7718]
2023-01-26 15:41:41 +01:00
Anton
466c25175f
Add manage actions to version modal [SCI-7520]
2023-01-26 12:39:11 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] ( #4725 )
2023-01-20 14:29:25 +01:00
Oleksii Kriuchykhin
3a85cdde0a
Improve handling of db locks [SCI-7703]
2023-01-17 17:30:20 +01:00
Anton
ba98075690
Add protocols filters front end [SCI-7517]
2023-01-04 10:34:49 +01:00
aignatov-bio
fa881253b6
Merge pull request #4672 from aignatov-bio/ai-sci-7531-fix-cross-team-redirections
...
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
2023-01-04 10:07:36 +01:00
aignatov-bio
7437af540b
Merge pull request #4701 from okriuchykhin/ok_SCI_7516
...
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-21 13:03:38 +01:00
Oleksii Kriuchykhin
5fea4722ac
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-19 15:39:32 +01:00
ajugo
5ab804c35a
Implement general protocol repository toolbar [SCI-7557] ( #4698 )
...
* Implement general protocol repository toolbar [SCI-7557]
* Move protocolsio page [SCI-7557]
2022-12-19 13:18:24 +01:00
Anton
2a8aaed7d1
Add actions toolbar to protocol repository [SCI-7521]
2022-12-06 15:54:50 +01:00
Anton
98572d9a2c
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
2022-12-01 14:55:23 +01:00
Oleksii Kriuchykhin
3b474fc9f0
Improve activity records creation in controllers [SCI-7505]
2022-11-24 15:19:17 +01:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
ajugo
83c78d660f
Added activity for update protocol name [SCI-7095] ( #4346 )
...
* Added activity for update protocol name [SCI-7095]
* Fix activity log for updated protocol name [SCI-7095]
* Fix activity log for updated protocol name [SCI-7095]
2022-08-11 14:09:01 +02:00
aignatov-bio
f1013c59fd
Merge pull request #4341 from aignatov-bio/ai-sci-7094-fix-protocol-description-save-in-repository
...
Fix protocol description save in protocol repository [SCI-7094]
2022-08-10 13:57:18 +02:00
Anton
f39e86d40b
Fix protocol description save in protocol repository [SCI-7094]
2022-08-10 13:46:50 +02:00
artoscinote
610ee6bdaa
Don't adjust step position in bulk deletion [SCI-7079] ( #4339 )
2022-08-10 12:05:24 +02:00
Anton
6131b6c0b7
Add new templates section and navigation [SCI-7017]
2022-07-26 13:53:51 +02:00
Alex Kriuchykhin
9aeb107635
Fix saving protocol to repository [SCI-6935] ( #4190 )
2022-07-06 11:45:04 +02:00
Anton
f3fdf25d2f
Add activity to bulk step deletion [SCI-6928]
2022-07-04 21:15:19 +02:00
Anton
5296b50c2f
Add delete all steps button [SCI-6921]
2022-06-24 11:21:47 +02:00
artoscinote
5c051ef8c1
Implement V2 protocols exporter [SCI-6876] ( #4142 )
...
* Implement V2 protocols exporter [SCI-6876]
* Implement new importer [SCI-6877]
2022-06-10 10:18:55 +02:00
Anton
e86a0610b2
Add metadata block in protocol repository [SCI-6869]
2022-06-06 13:56:22 +02:00
Anton
3910fa34f3
Remove protocol creation modal [SCI-6868]
2022-06-03 15:11:51 +02:00
Anton
61464b3780
Add new protocol view to repository [SCI-6858]
2022-06-02 11:05:25 +02:00
artoscinote
19a91fce66
Fix protocol layout issue [SCI-6312] ( #3712 )
2021-12-01 16:23:46 +01:00
artoscinote
9937d1d913
Add print feature to protocols [SCI-6028] ( #3700 )
...
* Add print feature to protocols [SCI-6028]
* Close tab after closing print dialog [SCI-6028]
* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
Oleksii Kriuchykhin
c26dcf4b23
Replace empty? with blank? [SCI-5579]
2021-07-23 11:56:28 +02:00
Oleksii Kriuchykhin
d315b1327b
Implement missing missing user smart annotation notifications [SCI-5575]
2021-03-19 17:11:19 +01:00
Urban Rotnik
7c312a844f
Fix updating updated_at on protocol while load/sync with repository
2020-09-29 15:37:40 +02:00
Urban Rotnik
d9b691103c
Add permission error message
2020-09-08 15:42:30 +02:00
Urban Rotnik
a2ade6e0ec
Merge branch 'develop' into features/new-task-layout
2020-05-15 14:27:56 +02:00
Urban Rotnik
de4e4ca967
Add before_action for team switch
2020-04-23 16:20:01 +02:00
aignatov-bio
fe718349da
Add recent protocol tab to load protocal from repository
2020-04-09 17:29:39 +02:00
aignatov-bio
0b04ca4012
Fix markup
2019-11-21 12:19:47 +01:00
aignatov-bio
56ae32323c
Add autosave for protocol keywords and user preferences
2019-11-20 14:57:53 +01:00
aignatov-bio
1488f75e26
Add activities
2019-11-13 13:57:04 +01:00
aignatov-bio
a9690482d1
Add autosave feature to text fields
2019-11-12 11:26:18 +01:00
Oleksii Kriuchykhin
584f2d07c0
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
2019-10-01 13:06:01 +02:00
aignatov-bio
6e5f078dea
Add activities for marvinJS [SCI-3630] ( #1950 )
...
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
2019-08-09 09:47:07 +02:00
Anton Ignatov
57a273d5d0
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
a1941a21dc
Futher refactoring of old Paperclip methods [SCI-3539]
2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin
9d926dc956
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
2019-07-05 16:56:05 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] ( #1800 )
...
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] ( #1808 )
...
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
2019-06-04 14:40:21 +02:00
Alex Kriuchykhin
df59c54bd4
Merge pull request #1776 from okriuchykhin/ok_SCI_3477
...
Fix protocol metadata editing in repository [SCI-3477]
2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin
488fc99dae
Fix protocol metadata editing in repository [SCI-3477]
2019-05-16 17:11:17 +02:00
Anton Ignatov
652fba0e23
Merge branch 'master-with-note-section'
2019-05-13 11:08:11 +02:00
Anton Ignatov
2e6bab4638
Fix smart anottation to protocols in repository
2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin
40550f92c9
Improve HTML data escaping in JSON endpoints [SCI-3403]
2019-05-08 17:38:24 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] ( #1689 )
...
* Update protocol repository for new description format
* move image clone method to concerns
2019-04-24 13:34:56 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format ( #1680 )
2019-04-19 14:44:40 +02:00
aignatov-bio
a1047f4597
Fix activities wording [SCI-3287] ( #1635 )
...
* Fix activities wording
* Adding project to export protocol
2019-04-04 10:45:35 +02:00
aignatov-bio
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] ( #1631 )
...
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +02:00
aignatov-bio
e6102c72c7
Adding missed activities [SCI-3253] ( #1614 )
...
* Adding missed activties
* Adding test for activities
2019-04-02 11:50:37 +02:00
Mojca Lorber
3c69225d6b
Change activities for task protocols
2019-03-29 15:09:20 +01:00
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
Mojca Lorber
c55e314ed5
Refactor upon the review requests
2019-03-20 21:34:47 +01:00
Mojca Lorber
cd7a87348f
Protocol activities refactoring, without tests
2019-03-19 16:12:07 +01:00
Urban Rotnik
2ea2700837
fixup! Fix failing tests
2019-03-15 10:30:51 +01:00
Urban Rotnik
b33e95e18a
New Protocols actions logging
2019-03-12 09:14:53 +01:00
Oleksii Kriuchykhin
3376fd012c
Improve error loggin in protocol import [SCI-3023]
2019-02-07 14:00:24 +01:00
Jure Grabnar
6ec2c99a28
Hound styling
2018-11-26 13:52:01 +01:00
Jure Grabnar
0086e4dcf3
Catch some of templates error when import protocols.io
2018-11-26 13:43:05 +01:00
Jure Grabnar
1c7a051551
Catch all errors on PIO import and show message
2018-11-23 20:47:48 +01:00
Zanz2
b26530a02f
Found a new, and more elegant fix inside controller with Luka
2018-08-28 14:48:23 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
okriuchykhin
fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250
...
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-26 14:19:49 +02:00
zmagod
c61efb0624
rename before_acton hook
2018-03-26 13:07:00 +02:00
Oleksii Kriuchykhin
ecd3c73772
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-25 13:36:24 +02:00
zmagod
c46da5cc67
fixes import protocol bug for guest user [fixes SCI-2197]
2018-03-19 16:10:28 +01:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011
...
Wrapping up the permissions [SCI-2011]
2018-03-06 07:10:40 +01:00
Zanz2
29aea1ebd2
refactored according to PR
2018-02-21 16:17:53 +01:00
Matej Zrimšek
b8b9707c06
Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.
2018-02-19 14:51:14 +01:00
Matej Zrimšek
7b07e7b347
Fixed protocol in repository permissions, and refactored it a bit.
2018-02-16 12:04:11 +01:00
Matej Zrimšek
6ba226d514
Added missing '?' to the canaid permission calls that were missing it.
2018-02-16 11:12:30 +01:00
Matej Zrimšek
5bda53eebf
Overall refactoring of all canaid permissions and code related to their calls.
2018-02-16 10:54:06 +01:00
Zanz2
c963c948a1
Fixed main issue, bad step structure now gets fixed to empty template
2018-02-15 23:28:20 +01:00
Zanz2
95501eb046
saving work for later
2018-02-15 20:01:36 +01:00
Matej Zrimšek
1182ce5da1
Fixed experiment level permission checks in the controllers.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
d6e7ef465c
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6
Grouped permissions for experiment with canaid gem (WIP).
2018-02-14 14:19:00 +01:00
Zanz2
367eff6401
re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches
2018-02-07 11:17:53 +01:00
Zanz2
dac59cf4d0
Refactored to PR, deleted unrelated things
2018-02-06 09:06:33 +01:00
Zanz2
e8f6dc0d24
Merge pull request #962 from Zanz2/missing_error_SCI1993
...
A red error messagge is now displayed when not selecting protocol [SCI-1993]
2018-01-26 16:00:15 +01:00
Zanz2
4ee51959eb
fixed hound
2018-01-26 09:56:59 +01:00
Zanz2
346f9feaef
Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html
2018-01-26 09:34:58 +01:00
Zanz2
24e772d7e5
Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816
2018-01-26 08:26:38 +01:00
Zanz2
fc541147c8
A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone
2018-01-25 15:54:38 +01:00
Zanz2
7fe1c20ebe
Finished the protocol reorder functions and implemented them
2018-01-24 09:31:43 +01:00
