Martin Artnik
e99e021479
Fix user smart annotations [SCI-7219]
2022-09-16 16:08:36 +02:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
Oleksii Kriuchykhin
fc77adf2bc
Fix toggling of checklist items with smart annotations [SCI-7070]
2022-08-10 14:48:47 +02:00
Oleksii Kriuchykhin
03ec4cb319
Setup user assignments relations for team, inventory and protocol [SCI-6818]
2022-05-17 14:32:14 +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
Oleksii Kriuchykhin
b67f2a21f5
Add default settings to existing reports [SCI-5619][SCI-5672]
2021-05-06 17:33:58 +02:00
Urban Rotnik
b9f77bf4fd
Fix missing user placeholder icon in export_all
2021-03-08 14:39:58 +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
cf3b0916f6
Fix flash messages on sign-in [SCI-5386]
2021-01-12 15:28:30 +01:00
Oleksii Kriuchykhin
58cce0f153
Improve task restoring and refactor flash messages [SCI-5341]
2021-01-04 17:00:23 +01:00
aignatov-bio
12fdea8d89
Add context menu to attahcments
2020-11-04 13:08:40 +01:00
Urban Rotnik
a259800590
Merge branch 'develop' into jg_sci_2228
2020-08-31 16:29:23 +02:00
aignatov-bio
34d6e903a4
Add assign items modal and update modal for task inventories
2020-04-23 15:24:40 +02:00
Oleksii Kriuchykhin
7a89cae56f
Fix TinyMCE images and avatars for export all [SCI-4107]
2019-12-05 13:27:17 +01:00
aignatov-bio
9950a23188
Replace base64 avatars with url
2019-10-22 12:27:13 +02:00
aignatov-bio
aaf76c0526
Fix avatars in comments and activities
2019-10-22 09:54:36 +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
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
9d926dc956
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
2019-07-05 16:56:05 +02:00
aignatov-bio
2793777463
Features/docx report ( #1873 )
...
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
2019-07-01 10:14:16 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments ( #1838 )
2019-06-14 16:20:13 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] ( #1787 )
...
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
Luka Murn
b78caef915
Fix the file preview modal so it supports WOPI_ENABLED == false
2019-05-10 16:41:11 +02:00
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163
...
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
2019-04-01 14:32:54 +02:00
Jure Grabnar
5de51f9c58
Prevent smart annotations accessing other teams when importing protocol
...
Closes SCI-3163
2019-03-20 12:58:22 +01:00
Oleksii Kriuchykhin
0930277c4e
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
2019-02-27 16:02:53 +01:00
Oleksii Kriuchykhin
d67abfda2c
Additional fixies for smart annotations [SCI-2880]
2018-11-26 15:17:18 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin
81d751974d
Fix helpers to use with export all [SCI-2793]
2018-10-22 14:32:10 +02:00
Oleksii Kriuchykhin
6669beaf0e
Change icons throughout the rest of application [SCI-2445]
2018-07-27 15:27:08 +02:00
Zmago Devetak
5a1615825d
removes unneeded comment
2018-07-11 09:29:10 +02:00
zmagod
8fe1977ca8
adds skip_user_status parameter to popover_for_user_name function in order to keep the functionality more extendable [fixes SCI-1334]
2018-07-10 15:34:07 +02:00
zmagod
87369ae16b
fixes ajax error in repositories [fixes SCI-2399]
2018-05-16 15:08:50 +02:00
mlorb
7df40e56c7
UI/UX restyle - fixes throughout application part one
2018-05-08 16:33:42 +02:00
zmagod
659a088058
refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]
2018-03-29 15:55:26 +02:00
gazvoda
88f03a0706
Merge pull request #735 from gazvoda/lg-SCI-1249-v2
...
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
lenart
e781dfc6a6
Truncate activity taking smart annotations into account fixes [SCI-1249]
2017-08-02 15:51:32 +02:00
zmagod
7b9410f02f
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 11:26:32 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
Mojca Lorber
107aa76e55
fix bug with audit trail - ajax error
2017-06-14 14:48:22 +02:00
Zmago Devetak
6cdf37041f
Merge pull request #663 from ZmagoD/zd_SCI_1328
...
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-13 08:57:09 +02:00
zmagod
e45c2ce560
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-08 13:41:27 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
Matej Zrimšek
19ffd77d32
Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]
2017-05-26 18:14:15 +02:00
Oleksii Kriuchykhin
157b1630b9
Add missing include for sinitize_input [SCI-1309]
2017-05-25 16:28:06 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
Zmago Devetak
9911c0d148
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
...
replace all ActionController::Base.helpers.sanitize calls with custom…
2017-05-11 14:30:26 +02:00
zmagod
80a0af8c9f
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
2017-05-11 11:36:47 +02:00
Oleksii Kriuchykhin
229693ec61
Fix root_url method unavailable in application_helper [SCI-1252]
2017-05-10 18:15:08 +02:00
