Anton
afe5cdeede
Switch to inter font [SCI-8170]
2023-06-06 12:50:28 +02:00
Martin Artnik
673c1fbaa8
Fix layout overflow when navigator is open [SCI-8589]
2023-06-01 12:14:27 +02:00
artoscinote
6699533301
Merge pull request #5520 from G-Chubinidze/gc_SCI_8385
...
Empty screen revamp [sci-8385]
2023-05-31 16:35:11 +02:00
Soufiane
b40c750965
Turbolinks broken by default with a secure CSP [SCI-8583] ( #5529 )
...
* Fix broken Turbolinks with CSP nonce [SCI-8583]
2023-05-31 15:28:16 +02:00
Giga Chubinidze
68a0be9218
changed empty screen title
2023-05-31 02:09:21 +04:00
Giga Chubinidze
59bdd7d8d2
Empty screen revamp [SCI-8385]
2023-05-29 01:42:26 +04:00
G-Chubinidze
3ea85cb2ef
Remove old client_api code [SCI-8144] ( #5223 )
...
Remove obsolete client_api code
2023-05-24 12:45:31 +02:00
Anton
ecbd900362
Fix inventory page layout [SCI-8515]
2023-05-22 15:47:59 +02:00
Soufiane
8593132a35
CSP FIX: MarvinJS, AWS and New Relic [SCI-8500] ( #5449 )
...
* Use the actual value of the nonce for New relic [SCI-8500]
* Whitelist MarvinJs [SCI-8500]
* Whitelist used AWS bucket [SCI-8500]
2023-05-22 11:43:19 +02:00
aignatov-bio
2f372fd871
Merge pull request #5440 from aignatov-bio/ai-sci-8427-fix-mobile-view
...
Fix mobile view [SCI-8427]
2023-05-19 11:41:58 +02:00
Anton
45609461ce
Fix mobile view [SCI-8427]
2023-05-19 10:24:44 +02:00
Soufiane
351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] ( #5430 )
...
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
2023-05-18 14:20:20 +02:00
Andrej
100eab9cb0
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates
2023-05-18 10:56:10 +02:00
Anton
3bdd903623
Update navigation css [SCI-8438]
2023-05-17 14:18:16 +02:00
Anton
9b2ae96a43
Merge branch 'develop' into features/navigation-refactor-v2
2023-05-16 10:22:11 +02:00
Anton
e2a14c1853
Refactor Module page layout [SCI-8421]
2023-05-15 14:17:41 +02:00
Martin Artnik
cd7b365613
Project dropdown menu fixes [SCI-8393]
2023-05-05 15:47:53 +02:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] ( #5206 )
...
CSP and inline js refactor [SCI-8118][SCI-8119]
2023-05-03 11:31:17 +02:00
Martin Artnik
7af146a580
Fix team dropdown on automatic team change [SCI-8352]
2023-04-21 12:25:42 +02:00
Anton
7143c3ed5d
Add general layout for navigator [SCI-8046
...
]
2023-04-19 14:19:55 +02:00
Andrej
a33707bd5e
Reverse table header/row numbering for plate templates [SCI-8082]
2023-04-19 12:22:22 +02:00
Anton
e8b952f4fd
Revert "Revert "Improve breadcrumbs implementation [SCI-8087]""
...
This reverts commit 78d41d10a6
2023-04-19 10:53:39 +02:00
aignatov-bio
54cbcb4657
Merge pull request #5317 from aignatov-bio/ai-sci-7926-add-new-buttons-tyle
...
Add tailwind [SCI-7926]
2023-04-18 11:53:02 +02:00
Anton
bc2959dfb4
Add new button styles and tailwind [SCI-7926]
2023-04-18 11:36:12 +02:00
Anton
2bbc98c531
Fix signup page layout
2023-04-18 11:03:00 +02:00
Anton
acd6413ca3
Fix navigation sidebar [SCI-8288]
2023-04-14 11:38:28 +02:00
Anton
caf21959bd
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:54:03 +02:00
aignatov-bio
78d41d10a6
Revert "Improve breadcrumbs implementation [SCI-8087]"
2023-04-12 14:04:20 +02:00
Martin Artnik
867a2795e0
Fix remaining _pack asset helpers [SCI-8291]
2023-04-12 11:10:01 +02:00
sboursen-scinote
7a3d5e03f4
Refactore after review [SCI-8087]
2023-04-06 12:23:33 +02:00
sboursen-scinote
8ae354b180
Merge branch 'features/navigation-refactor' into sb_SCI-8087
2023-04-02 17:33:23 +02:00
sboursen-scinote
501279372c
Style the breadcrumbs [SCI-8087]
2023-03-30 21:56:38 +02:00
Anton
ed1c4bcb69
Replace webpacker with jsbundling-rails [SCI-7926]
2023-03-30 13:39:57 +02:00
Anton
854fc1764b
Refactor left/top navigation [SCI-8055]
2023-03-22 14:08:21 +01:00
aignatov-bio
33c880149c
Add new general account [SCI-7963] ( #5127 )
2023-03-16 12:54:24 +01:00
Martin Artnik
d71c14e2eb
Add missing prism.js includes to layout [SCI-7974]
2023-03-01 15:21:01 +01:00
ajugo
46a1c1b7d3
Add jquery to sing_in_halt layout [SCI-7932] ( #4979 )
2023-02-15 15:59:37 +01:00
Martin Artnik
ac9c569b39
Enable Lato font in TinyMCE iframe [SCI-7883]
2023-02-14 14:06:47 +01:00
ajugo
7e48ce70c9
Add handson table metadata to print protocol [SCI-7914] ( #4957 )
2023-02-14 11:15:42 +01:00
ajugo
442fd5e971
Fix protocol printing dialog [SCI-7889] ( #4933 )
2023-02-06 11:34:59 +01:00
Martin Artnik
c828d02b99
Merge branch 'develop' into features/tiny_mce_6
2022-12-07 14:07:43 +01:00
Andrej
ac7c873385
Session end implementation [SCI-7027]
2022-09-16 09:57:40 +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
Martin Artnik
910c36af08
Merge branch 'features/step-editing-improvements' into develop
2022-07-05 10:12:10 +02:00
artoscinote
a5ffb90a96
Fix multi modal support, add end of body data-hook to layout [SCI-6922] ( #4180 )
2022-07-04 13:54:22 +02:00
aignatov-bio
f94f0d2a1e
Add fontawesome incons to simple sign in [SCI-6791] ( #4166 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-06-21 13:07:33 +02:00
Anton
04e16cf6b5
Add text component [SCI-6808]
2022-05-11 09:51:47 +02:00
artoscinote
63e446a883
Remove auto tab close when printing [SCI-6341] ( #3727 )
2021-12-07 14:04:59 +01:00
artoscinote
561746158e
Further fix scoping of table styles [SCI-6315] ( #3720 )
2021-12-06 10:40:08 +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
aignatov-bio
7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] ( #3502 )
2021-08-23 13:58:16 +02:00
Oleksii Kriuchykhin
c26dcf4b23
Replace empty? with blank? [SCI-5579]
2021-07-23 11:56:28 +02:00
aignatov-bio
7752267808
Add styling for template values [SCI-5630] ( #3264 )
2021-05-03 15:17:09 +02:00
Oleksii Kriuchykhin
ecbf747499
Switch to base64 encoded assets in wiked_pdf templates
2021-04-22 14:52:41 +02:00
Oleksii Kriuchykhin
a9ac8452f2
Add dynamic form elements in report wizard step 1 [SCI-5591]
2021-04-06 13:56:24 +02:00
aignatov-bio
ecca155fab
Added layout for footer and header [SCI-5571]
2021-03-30 23:43:34 +02:00
Mojca Lorber
ce451f86a8
Fix projects breadcrumbs style [SCI-5349]
2021-02-10 23:33:16 +01:00
Alex Kriuchykhin
8ab7b94443
Fix error message at login with false credential [SCI-5412] ( #3102 )
2021-01-19 17:19:40 +01:00
Oleksii Kriuchykhin
696b8d19f0
Fix new project creation and archiving [SCI-5321][SCI-5326]
2021-01-05 14:14:01 +01:00
Oleksii Kriuchykhin
67b3f853d7
Merge branch 'develop' into features/folders
2020-12-18 14:51:21 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] ( #2995 )
...
* Add projects sidebar navigation [SCI-5178]
2020-12-08 16:07:26 +01:00
Oleksii Kriuchykhin
78e050ccc0
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
2020-11-27 14:27:24 +01:00
aignatov-bio
2294d396f9
Add comments sidebar layout
2020-11-18 16:26:01 +01:00
aignatov-bio
c56f7912ef
Update file preview
2020-10-29 14:23:32 +01:00
Oleksii Kriuchykhin
21fab4198c
Merge branch 'develop' into features/local
2020-10-01 11:52:59 +02:00
Oleksii Kriuchykhin
25a9f5c685
Add typeface-lato for shipping Lato fonts
2020-09-28 18:02:47 +02:00
aignatov-bio
f4a13a73cb
Refactor smart annotation front-end
2020-09-09 12:25:34 +02:00
aignatov-bio
15de84ff2f
Not include marvinJS library, if marvinJS disabled
2020-06-08 09:59:26 +02:00
Urban Rotnik
5c72200801
Remove tooltips settings for user
2020-04-28 12:44:47 +02:00
aignatov-bio
bdf4394d5f
Clean notifications partial from layouts
2020-02-13 09:52:45 +01:00
aignatov-bio
26783e64da
Fix protocols table CSS
2020-02-11 15:58:17 +01:00
Urban Rotnik
1ecea5216e
Add webpack libs for emojis and assets
2020-01-21 11:43:04 +01:00
aignatov-bio
6a67280f6a
Add new emoji picker
2020-01-21 10:50:55 +01:00
Oleksii Kriuchykhin
168ba9d1c6
Fix logo and flash messages in sign_in_halt layout [SCI-4243]
2020-01-15 18:04:07 +01:00
Oleksii Kriuchykhin
6c7f45fc20
Add simplified view for sign-in form [SCI-4098]
2019-11-28 17:00:43 +01:00
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
eaf9d59819
Merge branch 'activestorage_migration' into ok_SCI_3679
2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
423528933e
Switch to global JS constants [SCI-3679]
2019-08-06 15:06:19 +02:00
Oleksii Kriuchykhin
5e65b07bdc
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
2019-07-25 18:00:24 +02:00
Mojca Lorber
d07e04e511
Fix dooble flash_alerts load
2019-07-12 14:33:41 +02:00
Mojca Lorber
f8afc92606
Fix page redirect and add success flash msg after protocols.io import action
2019-07-11 09:50:39 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled ( #1872 )
2019-07-01 11:51:13 +02:00
Anton Ignatov
b5271bdd2c
Add remote api support
2019-05-08 15:00:36 +02:00
Anton Ignatov
2847ec7609
Add env variable and check for MarvinJS available
2019-04-28 17:08:18 +02:00
Anton Ignatov
40c1c9aef7
Add marvin js modal
2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin
9bbdc8fc89
Include tui image editor with webpack [SCI-2856]
2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin
80e525fd97
Improve image editor behaviour [SCI-2855]
2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410
Add tui.image-editor [SCI-2815]
2019-03-11 15:08:15 +01:00
aignatov-bio
8e905b67b2
System notification navbar menu drop down [SCI 2955] ( #1498 )
...
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
2019-02-19 11:08:59 +01:00
aignatov-bio
c598541e09
System notification modal window [SCI-2957 and SCI-2958] ( #1484 )
...
* Added new system notification modal
* Adding loading system notification on sign in
2019-02-15 13:07:29 +01:00
mlorb
4040b31143
Fix behavior when user has no teams
2018-12-10 15:42:05 +01:00
Luka Murn
586a442abc
Refactor the settings page, rename setting to tooltips_enabled
2018-09-05 16:36:32 +02:00
Zanz2
1bed2c2a3c
Partially fixed according to pull request review, added comments to code review
2018-08-31 12:11:51 +02:00
Zanz2
880582de25
Added just a data attribute, so i dont have to add it on other branch
2018-08-21 09:59:49 +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
Luka Murn
9637af51e6
Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout
...
Fix the sign in halt layout
2018-06-26 17:51:18 +02:00
zmagod
bb62fc3715
adds data-hook
2018-06-14 12:42:49 +02:00
Luka Murn
a66d65fb28
Fix the sign in halt layout
...
... so it's not dependant on common addon any more.
2018-06-12 14:47:15 +02:00
Luka Murn
4ba07fb082
Merge pull request #1186 from Ducz0r/lm-sci-2477-fix
...
Move sign-in flow layout to core [SCI-2477]
2018-06-01 15:08:44 +02:00
mlorb
0a8bfdb860
Reposition the arrow for opening/closing of Navigation
2018-06-01 13:18:49 +02:00
Luka Murn
20ffa57583
Move sign-in flow layout to core
...
Closes SCI-2477.
2018-06-01 09:11:48 +02:00
mlorb
2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405
2018-05-28 11:43:14 +02:00
mlorb
f791234ec7
changes on Zmago's request
2018-05-28 11:36:37 +02:00
mlorb
099cc29abb
fix tests
2018-05-28 09:29:46 +02:00
mlorb
f02363dfce
fix error if user is not assigned to any teams
2018-05-25 17:14:22 +02:00
zmagod
6512970b9c
adds flash_message div in manage repository column page
2018-05-25 14:36:15 +02:00
zmagod
c026044322
fixes flash message [fixes SCI-2142]
2018-04-25 07:32:49 +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
zmagod
cf7761daaa
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223
2018-04-06 12:56:39 +02:00
Oleksii Kriuchykhin
51860652c1
Refactor smart annotations modal [SCI-2223]
2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
mlorb
884eef9d07
Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118
2018-03-20 14:25:59 +01:00
zmagod
311b2dac5a
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142
2018-03-16 16:21:47 +01:00
mlorb
9fd845c478
fix failing cucumber tests
2018-03-14 17:55:04 +01:00
mlorb
9de998e85c
code left-side menu bar
2018-03-14 14:33:34 +01:00
zmagod
a6a25bbe08
add floating alert message
2018-03-13 16:33:48 +01:00
zmagod
51af74071c
remove comments and activity modal
2018-03-13 10:52:53 +01:00
zmagod
b036452d8c
adds background worker to cucumber tests
2017-11-08 11:59:01 +01:00
zmagod
62dfd6a713
adds wait_for_ajax function to cucumber tests [fixes SCI-1723]
2017-10-24 15:39:06 +02:00
zmagod
55332e2957
adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]
2017-10-03 16:01:33 +02:00
zmagod
88928be2d3
fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622]
2017-09-19 13:08:08 +02:00
zmagod
685cb42aac
fixes repository, protocols link, adds csfr token to request headers
2017-08-21 15:30:54 +02:00
zmagod
c5e32c4ea0
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch
2017-08-21 09:52:14 +02:00
zmagod
007f50a158
adds main stylesheet for global styles
2017-08-09 12:46:04 +02:00
Luka Murn
c6448264d0
Revert "Td sci 1492"
2017-08-07 11:47:21 +02:00
Luka Murn
ae5bccf709
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
zmagod
6ef19725f1
adds redux
2017-08-02 17:27:05 +02:00
zmagod
caae1e2fe8
adds intl, router, bootstrap to npm modules
2017-07-31 10:42:40 +02:00
Toni Dezman
ffda8b259b
adds Redux and changes to index.jsx page
2017-07-28 10:52:25 +02:00
Toni Dezman
1673d43993
adds react/settings controller and react/layout
2017-07-27 15:26:03 +02:00
Luka Murn
3e80f761b8
Add "about" modal, prepare hooks, VERSION system for addons
...
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
zmagod
72e13beee3
renamed organizations in views
2017-01-25 12:01:23 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
zmagod
a903772de8
style dropdown
2017-01-10 17:05:32 +01:00
Luka Murn
7835753d3c
Add atwho-users URL to <body>
2017-01-06 12:48:37 +01:00
Oleksii Kriuchykhin
cd3924afd3
Sanitize .html_safe marked strings which contain tags [SCI-102]
2017-01-05 13:04:19 +01:00
Mojca Lorber
beae54e278
remove already_authenticated alert flash
2016-11-23 14:55:41 +01:00
zmagod
01b27e9e6d
added getting started hoot to layout/application.html
2016-10-28 10:36:15 +02:00
zmagod
32f03ec94c
Add Deface hooks
2016-10-06 16:47:36 +02:00
Luka Murn
076b67620f
Migration GitLab -> GitHub
2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8
Initial commit.
2016-02-12 16:52:43 +01:00
