scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-20 08:01:47 +08:00
Code Issues Projects Releases Packages Wiki Activity
14937 commits 31 branches 181 tags 166 MiB
Commit graph

159 commits

Author SHA1 Message Date
aignatov-bio
45764498ed
Merge pull request #5612 from sboursen-scinote/sb_SCI-8641 
Stretched image on the empty dashboard screen [SCI-8641]
 2023-06-16 12:39:58 +02:00
Alex Kriuchykhin
2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02:00
sboursen-scinote
a1b62b22b1 Fix image size and position in no-teams-jumbotron [SCI-8641] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-16 08:39:26 +02:00
Martin Artnik
7b0921ea65 Remove non-existant font.css include [SCI-8646] 2023-06-15 15:38:22 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Alex Kriuchykhin
976c29c136
Add CSP nonce to JQuery bundle inclusion [SCI-8609] (#5588) 2023-06-13 14:47:28 +02:00
Anton
4c71ecced6 Fix icon fonts issues 2023-06-12 14:55:01 +02:00
Martin Artnik
7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +02:00
Soufiane
77de460182
Due date flyout on dashboard calendar [SCI-8600] (#5554) 
* Change the scope of the DatePicker datetime format in global activities [SCI-8600]
 2023-06-09 09:24:32 +02:00
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
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
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +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
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
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
Martin Artnik
ac9c569b39 Enable Lato font in TinyMCE iframe [SCI-7883] 2023-02-14 14:06:47 +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
Anton
04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02: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
Alex Kriuchykhin
8ab7b94443
Fix error message at login with false credential [SCI-5412] (#3102) 2021-01-19 17:19:40 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +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
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
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
a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod
bb62fc3715 adds data-hook 2018-06-14 12:42:49 +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
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