ajugo
9f6887ddcc
Fix step element reordering at importing protocol [SCI-7529] ( #4677 )
2023-01-09 16:08:27 +01:00
Martin Artnik
4e779e70a4
Merge branch 'develop' into features/tiny_mce_6
2023-01-04 14:21:02 +01:00
Anton
ba98075690
Add protocols filters front end [SCI-7517]
2023-01-04 10:34:49 +01:00
aignatov-bio
9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen
...
CSS update for protocol import screen [SCI-7394]
2023-01-04 10:07:19 +01:00
ajugo
ae55935002
Add missing microinteractions on step editing [SCI-7575] ( #4711 )
2023-01-03 12:25:22 +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
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids
2022-12-08 15:58:11 +01:00
Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
Anton
2a8aaed7d1
Add actions toolbar to protocol repository [SCI-7521]
2022-12-06 15:54:50 +01:00
Anton
fdeb22c6cd
Update protocols layout [SCI-7515]
2022-12-05 14:02:13 +01:00
Anton
393bc03d47
CSS update for protocol import screen [SCI-7394]
2022-11-29 15:41:57 +01:00
Giga Chubinidze
43f8370a08
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 13:55:41 +04:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Martin Artnik
b67bea81b8
Remove legacy protocol links [SCI-7323]
2022-10-12 11:01:16 +02:00
Andrej
e05ad97498
Enable label print modal for smart annotations [SCI-7270]
2022-10-03 13:39:18 +02:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] ( #4385 )
...
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]
* Cleanup and refactor [SCI-7081]
* Clean up legacy plugins [SCI-7150]
* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +02:00
ajugo
12fc3b0b3b
Fix protocol repository issues [SCI-7003] ( #4343 )
...
* Fix protocol repository issues [SCI-7003]
* Remove unnecessary inRepository [SCI-7003]
2022-08-10 15:39:45 +02:00
Anton
6131b6c0b7
Add new templates section and navigation [SCI-7017]
2022-07-26 13:53:51 +02:00
artoscinote
39f5a017cf
Add print button to protocol in repository [SCI-6871] ( #4246 )
2022-07-15 10:10:18 +02:00
artoscinote
765e5b99bd
Protocol editing CSS fixes [SCI-6940] ( #4194 )
2022-07-12 10:43:01 +02:00
Anton
bf13708e31
Fix load/save protocol to repository [SCI-6759]
2022-06-27 13:14:45 +02:00
artoscinote
934023e9d8
Update print template to fit with new steps [SCI-6871] ( #4153 )
2022-06-10 10:41:57 +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
aignatov-bio
a8fe943658
Merge pull request #4140 from aignatov-bio/ai-sci-6868-remove-new-protocal-modal
...
Remove protocol creation modal [SCI-6868]
2022-06-05 22:41:57 +02:00
Anton
3910fa34f3
Remove protocol creation modal [SCI-6868]
2022-06-03 15:11:51 +02:00
Anton
2da1a380c3
Add view mode to protocol and step [SCI-6867]
2022-06-03 11:53:53 +02:00
Anton
61464b3780
Add new protocol view to repository [SCI-6858]
2022-06-02 11:05:25 +02:00
ajugo
f75265974e
Print protocol smart annotation and table improvements [SCI-6566] ( #3925 )
...
* Improve table printing in the print menu [SCI-6566]
* Open smart annotation in new tab for print view [SCI-6566]
* Unify naming of same parameter [SCI-6566]
* Fix typo [SCI-6566]
* Fix hound errors [SCI-6566]
2022-03-29 12:09:33 +02:00
ajugo
c570cef06c
Style corrections for printed protocol [SCI-6326] ( #3782 )
...
* Printed protocol display improvements [SCI-6326]
* Fix new line
* Fix hound [SCI-6326]
* Using image_tag helper [SCI-6326]
* Move pictures to asset folder [SCI-6326]
2022-01-14 15:02:04 +01:00
artoscinote
3f7f576b29
Print protocol fixes [SCI-6318] ( #3717 )
...
* Fix smart annotations [SCI-6318]
* Fix asset rendering [SCI-6316, SCI-6417]
* Copy fix [SCI-6315]
* Fix print protocol name handling [SCI-6318]
* CSS linter fixes
* Add support for handson tables [SCI-6318]
* Use partial for handsontable formulas [SCI-6318]
2021-12-03 13:44:18 +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
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579
2021-10-28 13:26:27 +02:00
Oleksii Kriuchykhin
c26dcf4b23
Replace empty? with blank? [SCI-5579]
2021-07-23 11:56:28 +02:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] ( #3391 )
...
* Add backend for bioeddie [SCI-5654]
* Add modal for bioeddie [SCI-5654]
* Add bio eddie editor to steps and results [SCI-5654]
* Fix markup and code styling
2021-06-23 19:48:44 +02:00
Oleksii Kriuchykhin
a307a16033
Fix handsontable assets inclusion in report templates [SCI-5692]
2021-05-04 16:05:19 +02:00
aignatov-bio
df4297f6f7
Merge branch 'develop' into features/local_file_previews
2021-03-08 11:30:47 +01:00
aignatov-bio
89ac76a766
Fix duplcated new step button [SCI-5474]
2021-02-26 12:29:31 +01:00
Mojca Lorber
62af5cc723
[SCI-5287] Show step collapse/expand on task
2020-12-22 15:50:27 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] ( #3018 )
...
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
aignatov-bio
c212d514d5
Fix delete asset in protocol repository
2020-11-25 13:13:06 +01:00
Mojca Lorber
8ee8f7b4d2
Expose the new step button on task
2020-11-05 16:14:40 +01:00
aignatov-bio
bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style
...
Update checkbox style at repository and protocol datatable [SCI-4579]
2020-10-27 10:22:56 +01:00
aignatov-bio
d6f8e156c1
Update checkbox style at repository and protocol datatable
2020-10-22 16:42:12 +02:00
Urban Rotnik
aa1520bfb8
Merge branch 'develop' into jg_sci_2228
2020-10-22 14:21:39 +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
Mojca Lorber
9dac4079f8
Replace old arrow with new one and remove redundant javascript for arrow collapsing
2020-09-04 14:43:30 +02:00
Mojca Lorber
24745203e1
Fix buttons visability on protocols page according to new styleguide
2020-09-03 17:05:25 +02:00
Urban Rotnik
a259800590
Merge branch 'develop' into jg_sci_2228
2020-08-31 16:29:23 +02:00
Mojca Lorber
00b668a4ba
Change title size to h1
2020-07-08 13:02:47 +02:00
Urban Rotnik
9d3874e343
Add margin to keywords container
2020-05-22 14:23:03 +02:00
Urban Rotnik
1c2883414b
Bring newStep top button back
2020-05-22 12:29:14 +02:00
aignatov-bio
bd742d388d
Small CSS improvments for mobile
2020-05-13 10:58:40 +02:00
aignatov-bio
4f941610b2
Small layout changes for protocol
2020-04-24 11:50:03 +02:00
aignatov-bio
da4b55ceea
Fix protocol and report create modals after dashboard redirect
2020-03-19 19:43:20 +01:00
aignatov-bio
95fca105eb
Add quickstart layout and create task modal
2020-02-28 14:34:34 +01:00
Mojca Lorber
981f8678df
Fix alerts style
2020-01-21 15:21:40 +01:00
aignatov-bio
68646276f5
Replace bootstrap styles for button
2020-01-07 16:13:34 +01:00
aignatov-bio
ef3814ccec
Add new buttons to protocols, tasks, experiments, projects
2020-01-06 10:40:20 +01:00
aignatov-bio
56ae32323c
Add autosave for protocol keywords and user preferences
2019-11-20 14:57:53 +01:00
aignatov-bio
b9a34fa809
Fix placeholder for authors
2019-11-15 16:23:48 +01:00
aignatov-bio
a9690482d1
Add autosave feature to text fields
2019-11-12 11:26:18 +01:00
Urban Rotnik
5812ebe4d5
Add permission check for button show
...
SCI-3936
2019-09-30 14:30:03 +02:00
Anton Ignatov
0adb016293
Fix missing expand all button
2019-09-18 12:33:48 +02:00
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
423528933e
Switch to global JS constants [SCI-3679]
2019-08-06 15:06:19 +02:00
Urban Rotnik
aa36d93bea
Add additional NewStep button
2019-07-26 11:01:36 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
aignatov-bio
7ac410e573
Fix visual bugs across ProtocolIo [SCI-3671] ( #1914 )
...
* Fix visual bugs across ProtocolIo
2019-07-10 13:00:32 +02:00
mlorb
23270393b0
Merge branch 'master' into ml-sci-3634
2019-07-09 14:38:00 +02:00
Mojca Lorber
7bb82e2fc2
Fix eternal protocols tab visuals
2019-07-09 14:35:40 +02:00
Mojca Lorber
989c10872c
Fixes visual bugs on protocols.io and home page
2019-07-04 18:22:51 +02:00
Jure Grabnar
dc7fee51fa
Add Show more protocols functionality to external protocols
...
Closes SCI-3646
2019-07-04 15:35:18 +02:00
Miha Mencin
4efb0b5a4a
SCI-3645 added descending sorting by name
2019-07-02 17:42:55 +02:00
Jure Grabnar
bc4b07cc0f
Refactor hardcoded protocol_source in SearchService
2019-06-28 02:26:31 +02:00
Jure Grabnar
1ccabf62b3
Add preview banner in external protocols
2019-06-28 01:38:33 +02:00
Jure Grabnar
d3afcbed50
Style card view on external protocols
...
Closes SCI-3535
2019-06-28 00:43:05 +02:00
Jure Grabnar
0a77cedaf8
Fix sorting of external protocols and start showing results
2019-06-27 22:48:56 +02:00
Jure Grabnar
8338892fc6
Update external protocols form to include sort_by
2019-06-27 21:26:28 +02:00
Urban Rotnik
9cb4454537
New implementation for attachments creation
2019-06-27 17:02:06 +02:00
Urban Rotnik
2761079479
Add modal for import
2019-06-27 16:46:02 +02:00
Jure Grabnar
b3c3b68dc2
Add external preview to External Protocols tab
...
Closes SCI-3563
2019-06-19 22:54:20 +02:00
Jure Grabnar
7adef9cc9e
Change sort buttons positions
...
Closes SCI-3534
2019-06-17 12:24:13 +02:00
Jure Grabnar
d103f8ffec
Finish external protocols screen
...
Closes SCI-3534
2019-06-17 12:24:12 +02:00
Jure Grabnar
0b60da9b4c
Add ExternalProtocols skeleton tab
2019-06-17 12:24:12 +02:00
aignatov-bio
5081546c78
Fix padding for protocol description ( #1782 )
2019-05-21 10:21:30 +02:00
Oleksii Kriuchykhin
488fc99dae
Fix protocol metadata editing in repository [SCI-3477]
2019-05-16 17:11:17 +02:00
aignatov-bio
71b3228310
Update protocol preview style [SCI-3416] ( #1729 )
...
* Update protocol appearance
2019-05-13 10:45:12 +02:00
aignatov-bio
634b58bd6a
Various UX improvements for note section [SCI-3444] ( #1742 )
...
* Various UX improvments for note section
2019-05-11 16:04:28 +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
Urban Rotnik
11a7a975af
Merge branch 'features/scinote-improvements' into master-with-note-section
2019-04-23 14:50:03 +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
f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
...
Improve the image file upload into RTE input fields [SCI-3131]
2019-04-10 14:04:06 +02:00
Jure Grabnar
613843d095
Temp commit
2019-04-04 16:58:55 +02:00
Jure Grabnar
26848ecaef
Refactor step position + 1 into a method
2019-04-03 13:07:30 +02:00
Jure Grabnar
171b2eeedc
Remove the title of protocol steps when empty
...
Closes SCI-3072
2019-03-25 09:36:56 +01:00
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
Anton Ignatov
07c2819163
refactoring tinymce image uploading
2019-03-20 14:46:54 +01:00
Matej Zrimšek
838455af0d
Fix protocols.io Date handling at import
2019-01-12 19:28:45 +01:00
Matej Zrimšek
b64df7d8cc
Fix additional Date and Time display formats
2019-01-08 06:29:37 +01:00
Alex Kriuchykhin
20e2cbf0ca
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
...
Fix smart annotations rendering issues [SCI-2880]
2018-11-28 09:47:20 +01:00
Alex Kriuchykhin
d475197e65
Merge pull request #1396 from okriuchykhin/ok_SCI_2882
...
Fix handsontable initialization [SCI-2882]
2018-11-26 15:19:23 +01:00
Jure Grabnar
7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
...
Protocols - import from protocols.io doesn't work
2018-11-26 14:56:25 +01:00
Oleksii Kriuchykhin
2e00f1546a
Fix handsontable initialization [SCI-2882]
2018-11-26 14:11:46 +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
Jure Grabnar
2834edb286
Add command/subprotocol/safety for PIO
2018-11-23 20:13:34 +01:00
Jure Grabnar
c00b08b101
Add sw_package and dataset component for PIO
2018-11-23 19:44:10 +01:00
Jure Grabnar
2c8a7f8eca
Add last_modified evaluation for PIO import
2018-11-23 17:51:47 +01:00
Jure Grabnar
87d5e5029a
Fix publish_date in PIO import
2018-11-23 17:37:26 +01:00
Jure Grabnar
76c2da4bae
Add uniq tables
2018-11-23 16:30:29 +01:00
Oleksii Kriuchykhin
b926cadba4
Fix smartannotations rendering issues [SCI-2880]
2018-11-23 15:07:08 +01:00
Oleksii Kriuchykhin
380a96dcce
Add caching for step and result fragments [SCI-2830]
2018-11-14 11:57:53 +01:00
Zanz2
0ed62b7375
refactored according to PR review
2018-08-21 11:35:22 +02:00
Zanz2
dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
2018-08-14 13:33:43 +02:00
Zanz2
45a4c1c598
changed the icons as per last comment in jira issue
2018-08-14 13:26:48 +02:00
Oleksii Kriuchykhin
38c36ab798
Fix modals handling with Turbolinks [SCI-2253]
2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin
b2bd1cb849
Upgrade to Turbolinks 5 [SCI-2253]
2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e
Change icons throughout the rest of application [SCI-2445]
2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin
a169639b3c
Fix uploaded file max size validation in JS [SCI-2590]
2018-07-05 15:23:26 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
mlorb
f02363dfce
fix error if user is not assigned to any teams
2018-05-25 17:14:22 +02:00
mlorb
c5e62207eb
fix bug with protocol preview does not open on protocols containing files
2018-05-24 11:51:27 +02:00
mlorb
c4ecfc4d38
Change icons throughout sciNote - navigation, project, task cards
2018-05-22 16:55:58 +02:00
mlorb
ed27a7a62a
some extra restyling/unifying off app
2018-05-11 18:02:17 +02:00
mlorb
7df40e56c7
UI/UX restyle - fixes throughout application part one
2018-05-08 16:33:42 +02:00
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244
2018-04-26 14:07:03 +02:00
Luka Murn
cb6fe50832
Merge branch 'master' into ux-release-1
...
Conflicts:
app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
mlorb
9e11f3b220
update buttons positions and wording throughout app
2018-04-25 13:57:12 +02:00
mlorb
c08d72be36
remove breadcrumbs throughout application
2018-04-17 17:00:04 +02:00
zmagod
233e73c709
adds asset preview link to repository row modal and to table row item [fixes SCI-2110]
2018-04-10 17:06:53 +02:00
Zanz2
cff2f933a0
removed byebug :D
2018-04-04 15:19:00 +02:00
Zanz2
ec743a7420
fixed the issue
2018-04-04 15:16:31 +02:00
Oleksii Kriuchykhin
3b7977ee3b
Merge latest changes from ux-release-1 [SCI-2217]
2018-04-04 14:20:34 +02:00
Zanz2
1606982966
found a hackish fix by doing a manual ajax call and some other things with jquery
2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
mlorb
4bf9369bc5
refactor buttons
2018-03-29 13:58:14 +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
c5728c4018
Merge branch 'master' into null_step_crash_sci2043
2018-03-05 16:37:24 +01:00
Zanz2
5c93bd9676
Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom
2018-02-16 14:14:51 +01:00
Zanz2
673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834
...
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
2018-02-16 12:52:51 +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
b9db39f87d
removing last commit
2018-02-16 00:00:53 +01:00
Zanz2
95501eb046
saving work for later
2018-02-15 20:01:36 +01:00
Zanz2
ad8f93b57f
Merge pull request #991 from Zanz2/missplaced_authors_sci1808
...
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
2018-02-15 16:53:39 +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
Zanz2
128f15f984
Merge pull request #990 from Zanz2/code_formatting_sci1822
...
Commands in protocols io steps are now properly formatted like code [SCI-1822]
2018-02-08 08:52:44 +01:00
Zanz2
49a4d9cf23
Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar
2018-02-07 15:50:42 +01:00
Zanz2
60aa1a0953
Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before
2018-02-07 15:12:03 +01:00
Zanz2
a6356d2420
Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines
2018-02-07 14:46:25 +01:00
Zanz2
efaf5ad721
Commands now get styled like code
2018-02-07 13:51:22 +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
70a972c264
Fixed pr and small oversight
2018-01-27 14:33:01 +01:00
Zanz2
2a287193b7
Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix
2018-01-27 13:50:35 +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
1d4ce42f23
fixed according to PR
2018-01-26 15:29:13 +01:00
Zanz2
98b3ddbdb0
Merge branch 'master' into images_not_imported_SCI1807
2018-01-26 15:13:40 +01:00
Zanz2
020e9ddc16
Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807
2018-01-26 11:08:47 +01:00
Zanz2
6f56f829da
Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title
2018-01-26 10:49: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
zanzdebian
8bd8c34c4d
Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)
2018-01-25 13:45:35 +01:00
Zmago Devetak
1e407bd9c5
removes unneeded classes
2018-01-25 11:00:48 +01:00
Zanz2
00ac774fde
Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result
2018-01-24 13:40:13 +01:00
zmagod
f8a3fca2db
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
2018-01-23 11:06:33 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor
...
Protocols.io code beautification and refactoring [SCI-1929]
2018-01-12 12:34:00 +01:00
Zanz2
3c6d37ce64
Fixed according to PR review
2018-01-11 18:37:36 +01:00
mlorb
99185871c4
fix naming things
2018-01-05 15:15:50 +01:00
Zanz2
83e1b04c7a
Fixed pull request
2017-12-24 01:49:04 +01:00
Zanz2
53561ffd84
Refactored according to PR
2017-12-15 20:39:15 +01:00
mlorb
806fcbce36
refactor update protocol in repository permission
2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e
refactor read protocol in repository permission
2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1
refactor create protocol permission
2017-12-14 14:18:14 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
...
Fixes bug with embedded images [SCI-1624]
2017-12-12 09:53:24 +01:00
Zanz2
11dc3be9d4
It is now possible to scroll down preview modal
2017-12-10 01:41:21 +01:00
Zanz2
d0a9198408
Fixed the styling
2017-12-10 01:20:08 +01:00
Zanz2
fcbd956d6e
Finished code beautification
2017-12-03 01:17:49 +01:00
Zanz2
835ac6910f
Code refactor part 1
2017-12-02 00:29:47 +01:00
zmagod
7442684846
fix protocol preview, remove unneeded functions, fix copy paste tokens
2017-11-28 14:16:20 +01:00
Zanz2
bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833
...
Fixed validations lengths and added workarounds for bugs [SCI-1833]
2017-11-24 17:55:20 +01:00
Zmago Devetak
027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651
...
export and import RTE images
2017-11-24 16:28:28 +01:00
zmagod
d200e355ed
follow @Ducz0r 's suggestions
2017-11-24 11:45:07 +01:00
Zanz2
dc5904aed9
Fixed this jira issue and added workarounds for bugs
2017-11-24 01:45:40 +01:00
Zanz2
764e5259d1
Fixed last review, and a bug i found
2017-11-22 23:38:22 +01:00
Zanz2
f577bf93b5
Fixed pull request review
2017-11-21 19:20:15 +01:00
Zanz2
d8c809ffd0
Reviewed pull request
2017-11-20 23:19:34 +01:00
Zanz2
cf66d94d45
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
2017-11-20 00:59:32 +01:00
Zanz2
a6009806c4
Fixed some oversights
2017-11-17 02:56:16 +01:00
Zanz2
fa25a6785b
Made the propper files and functionality for the text truncation to function
2017-11-17 02:43:32 +01:00
Zanz2
c44465817d
Added the functions and put in limitations from my validations files, changed controller name, added some locals
2017-11-16 20:03:44 +01:00
Zanz2
c3f6c2b34a
Found a bug where i forot to include protocol description in preview modal and fixed it
2017-11-14 19:46:51 +01:00
Zanz2
bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794
...
Made button green and added .json to supported file [SCI-1794]
2017-11-14 19:12:45 +01:00
Zanz2
6b9a10ffe4
Made validations for JSON format and .txt and .json files
2017-11-14 12:02:17 +01:00
Zanz2
7ec8d7c2b2
Made button green and added .json to supported file
2017-11-14 11:46:19 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import
...
Protocols io import
2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc
...
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
2017-11-13 10:07:01 +01:00
