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

877 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin
2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
mlorb
39b01bc8ed fix in app help window does not close in some cases 2018-11-21 10:19:41 +01:00
mlorb
e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Luka Murn
9632d1cd01 Set tooltips initialization to comply with turbolinks 
Also add custom styling options as another data attribute.
 2018-10-02 13:49:19 +02:00
Luka Murn
c12f77d1d1 Fix styling (ESLint) on tooltip_helper.js 2018-10-02 11:25:51 +02:00
Luka Murn
63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
 2018-09-24 16:23:53 +02:00
Zanz2
87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +02:00
Zanz2
5b955da74c makes tooltip behaviour more reliable and less erratic 2018-09-16 21:34:36 +02:00
Zanz2
07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Luka Murn
f9d771d01a
Add minor comment 2018-09-13 14:50:00 +02:00
Luka Murn
99c156de94 Fix (hopefully) the TinyMCE files from being cached 
Closes SCI-2717.
 2018-09-12 15:28:21 +02:00
Zanz2
a0c6a0c407 changed name of data attribute 2018-09-07 15:33:38 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
36cca3d6aa Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax 2018-08-21 11:11:25 +02:00
Zanz2
91f112dc38 Saving minor changes, deleted comments, stuck at drag n drop 2018-08-20 13:45:43 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Zanz2
8c492e1491 started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute 2018-08-17 16:03:49 +02:00
Zanz2
e1cadfc75e saving work, removed testing buttons 2018-08-17 11:52:10 +02:00
Zanz2
637c7dfb19 modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic 2018-08-17 11:33:44 +02:00
Zanz2
a09834db6a testing, made new popover designs 2018-08-16 16:10:19 +02:00
Zanz2
d2373980d4 Testing out new popover 2018-08-16 15:07:59 +02:00
Zanz2
9fd02e71c9 initial popover/tooltip config 2018-08-16 13:04:42 +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
5c999300b5 Fix avatar upload validators [SCI-2253] 2018-07-27 17:26:46 +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
zmagod
e654725d9e fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +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
Zmago Devetak
a8981d7039
Merge pull request #1201 from ZmagoD/zd_SCI_2421 
fixes bug with tinymce/at.js [fixes SCI-2421]
 2018-06-13 11:14:17 +02:00
Zmago Devetak
6cab1746cd
Merge pull request #1202 from ZmagoD/zd_SCI_2392 
prevents asset preview modal to close on click [fixes SCI-2392]
 2018-06-13 08:41:41 +02:00
mlorb
40f3365596 fix bug with truncating string 2018-06-11 14:47:25 +02:00
zmagod
32a09f9780 prevents asset preview modal to close on click [fixes SCI-2392] 2018-06-11 13:03:11 +02:00
zmagod
374a16abad fixes bug with tinymce/at.js [fixes SCI-2421] 2018-06-11 10:18:35 +02:00
zmagod
712a3c7ff6 fixes css, changes spinner in preview modal 2018-05-16 10:40:49 +02:00
zmagod
e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
zmagod
38869ec037 adds title on disabled download file link 2018-05-10 09:47:10 +02:00
zmagod
66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod
0afe461962 fixes download link 2018-04-26 17:00:51 +02:00
mlorb
f97477f3f0 some extra button styling 2018-04-26 15:19:05 +02:00
mlorb
763d934aa7 fix buttons again 2018-04-26 15:02:24 +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
zmagod
c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
Luka Murn
fa603b54b8
Merge pull request #930 from okriuchykhin/ok_SCI_1860 
Remove tutorial [SCI-1860]
 2018-04-12 14:46:20 +02:00
Luka Murn
9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +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
ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19: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
8ee98b7cf0 Update Capybara and dependencies [SCI-2217] 2018-04-04 14:13:37 +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
Oleksii Kriuchykhin
a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod
a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
zmagod
2b55cd7090 rename variables 2018-03-02 14:14:27 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod
bd1345d560 fixes bug with assets upload on task result page, 
adds ctrl+v listener to upload images from clipboard, adds image preview modal
 2018-02-06 15:39:19 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
89230bd730 Fix about modal [SCI-1875] 2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin
afb579bef1 Fix invite users dropdown [SCI-1893] 2017-12-21 16:49:10 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747 
Improve server side assets validation display for steps [SCI-1747]
 2017-12-04 14:12:43 +01:00
Oleksii Kriuchykhin
745dac09a7 Improve clean-up of dropped files [SCI-1747] 2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin
e35031dd9a Small code fixies [SCI-1747] 2017-11-28 11:34:57 +01:00
zmagod
d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Mojca Lorber
ff998a6c98 change text for avatar size on my profile page 2017-11-15 14:21:04 +01:00
Oleksii Kriuchykhin
631b41cdaa Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551] 2017-10-19 11:38:23 +02:00
Mojca Lorber
a0f7030a70 fix bug with tinyMCE text validaton 2017-09-07 14:54:12 +02:00
Zmago Devetak
69919359f1 Merge pull request #738 from ZmagoD/zd_SCI_1452 
fixes issue with smart annotations in repositories [fixes SCI-1452]
 2017-07-12 14:50:29 +02:00
zmagod
baaec67399 fixes issue with smart annotations in repositories [fixes SCI-1452] 2017-07-10 16:22:32 +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
6dd85d6c39 fixes drag'n drop bug in results on safari [fixes SCI-1370] 2017-06-14 09:45:49 +02:00
Luka Murn
e26337d5ee Merge pull request #671 from biosistemika/custom-repositories 
Merge custom-repositories into master
 2017-06-09 18:46:47 +02:00
zmagod
33b996ffee refactor 2017-06-09 09:49:57 +02:00
zmagod
c6bb20039b adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285] 2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Matej Zrimšek
2c6ad4aa05 Refactored modal popups for repositories to make them general. [fix 1269] 2017-06-05 14:13:24 +02:00
zmagod
67d902db52 refactor 2017-06-05 10:43:58 +02:00
Matej Zrimšek
c82fd66146 Removed unneeded utility JS function. [SCI-1269] 2017-06-02 17:52:04 +02:00
Matej Zrimšek
791bb934ca Remove repository modal logic (WIP). [SCI-1269] 2017-06-02 17:50:33 +02:00
Matej Zrimšek
20265ddd69 Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487] 2017-05-17 18:18:57 +02:00
Matej Zrimšek
79ec3b5e4c Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
Matej Zrimšek
901558c733 Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487] 2017-05-15 18:20:42 +02:00
zmagod
9bec7dd96e Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248 2017-05-15 14:49:37 +02:00
zmagod
a4032f5cc6 first run 2017-05-10 13:53:32 +02:00
Oleksii Kriuchykhin
52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
okriuchykhin
bd0b930382 Merge pull request #598 from okriuchykhin/ok_SCI_152 
Add counters for users and comments on canvas [SCI-152]
 2017-05-09 10:22:53 +02:00
Oleksii Kriuchykhin
344b9c290a Add counters for users and comments on canvas [SCI-152] 2017-05-08 17:32:55 +02:00
Zmago Devetak
4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
zmagod
5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
ajugo
081aa4aea7 Merge pull request #570 from rekonder/aj-SCI-1088 
My profile - avatar size fix [SCI-1088]
 2017-05-03 12:27:05 +02:00
Matej Zrimšek
8ad52354eb Used locales instead of hardcoded values for intro.js tutorial popup. 2017-04-25 16:03:50 +02:00
Matej Zrimšek
e8bc9542cc Removed some unneeded intro.js tutorial code. 2017-04-25 16:03:50 +02:00
Matej Zrimšek
a6573bd508 Next button is now always focused when navigating through tutorial steps. [fixes SCI-719] 2017-04-25 16:03:50 +02:00
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
Mojca Lorber
49574e7a06 remove behavior of not allowing the empty tables in steps 2017-04-25 10:21:16 +02:00
rekonder
b93edac3b9 My profile - avatar size fixes [SCI-1088] 2017-04-25 10:02:00 +02:00
zmagod
66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod
550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
zmagod
c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
Oleksii Kriuchykhin
181d981a51 Add image preview to protocol repository [SCI-877] 2017-04-12 16:05:38 +02:00
Zmago Devetak
5c9954bb89 Merge pull request #450 from ZmagoD/zd_SCI_939 
Refactor "organizations" to "teams"
 2017-02-01 13:12:02 +01:00
okriuchykhin
9909f9dcff Merge pull request #456 from okriuchykhin/ok_SCI_951 
Fix missing preview images in task and protocol management [SCI-951]
 2017-01-27 14:42:41 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Oleksii Kriuchykhin
0f860496a7 Fix image preview after saving of report [SCI-951] 2017-01-26 14:42:14 +01:00
Mojca Lorber
13d1cc5171 fix entering new smart anotations 2017-01-26 13:50:32 +01:00
zmagod
8c035a1981 renames organization in assets 2017-01-25 12:12:27 +01:00
Oleksii Kriuchykhin
365eef506c Fixes merge conflicts with smart-annotations branch 2017-01-24 15:20:50 +01:00
mlorb
02f314ce60 Merge pull request #443 from mlorb/ml_sci_919_v2 
Remove table of content and customize link target [SCI-919]
 2017-01-24 14:39:47 +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
Mojca Lorber
4dc7998fdd Remove table of content and customize link target 2017-01-24 13:10:01 +01:00
Mojca Lorber
eb40513ada remove functionalities from rich text formatting 2017-01-24 09:44:37 +01:00
zmagod
9c3bc8dac7 fixes checklist item user popover bug [fixes SCI-907] 2017-01-23 09:47:04 +01:00
Zmago Devetak
c1e7cc83a7 Merge pull request #434 from ZmagoD/zd_SCI_915 
Text is deleted when entering smart annotation in rich text editor
 2017-01-20 13:01:29 +01:00
Zmago Devetak
7bd368e002 Merge pull request #431 from ZmagoD/zd_add_code_highlight 
Fixes code highlight and smart annotations experiments bug
 2017-01-20 12:59:21 +01:00
zmagod
71453398b1 bugfix 2017-01-20 11:33:49 +01:00
zmagod
4f7d62e79d removes unneeded annotations [fixes SCI-915] 2017-01-20 11:33:10 +01:00
zmagod
9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
Matej Zrimšek
54f8b01341 Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894] 2017-01-19 15:26:28 +01:00
Oleksii Kriuchykhin
890c5e3c3d Add “no results found” message in smart annotation [SCI-886] 2017-01-19 13:42:58 +01:00
Zmago Devetak
039a8d7da6 Merge pull request #426 from ZmagoD/zd_add_tinyMCE 
Add tiny mce
 2017-01-19 12:57:55 +01:00
mz3944
da604d2619 Merge pull request #427 from mz3944/mz-sci-908 
Some smart annotations refactoring [SCI-908]
 2017-01-19 12:15:20 +01:00
zmagod
f2d5066dc7 fix some bugs 2017-01-19 11:37:59 +01:00
Matej Zrimšek
5d86bbb812 Smart annotations improved documentation. [SCI-908] 2017-01-19 10:56:02 +01:00
Matej Zrimšek
fec83e8c45 Smart annotations refactoring. [SCI-908] 2017-01-19 10:55:43 +01:00
zmagod
2ccafdd670 bug fix 2017-01-19 10:12:01 +01:00
zmagod
27d3868f37 fix bugs 2017-01-19 09:40:39 +01:00
zmagod
88d7cb200e removed quill 2017-01-18 23:06:14 +01:00
zmagod
65fa631b1c adding tinyMce first run 2017-01-18 22:40:08 +01:00
okriuchykhin
18d329fb42 Merge pull request #423 from okriuchykhin/ok_SCI_896 
Make search work for full names in smart annotations [SCI-896]
 2017-01-18 17:58:52 +01:00
Oleksii Kriuchykhin
6555fd02b6 Make search work for full names in smart annotations [SCI-896] 2017-01-18 16:57:51 +01:00
mz3944
b5e38afb64 Merge pull request #416 from mz3944/mz-sci-884 
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
 2017-01-18 16:13:19 +01:00
Matej Zrimšek
dbbb709bf2 Smart annotations minor refactoring. [SCI-884, SCI-889] 2017-01-18 16:04:39 +01:00
Matej Zrimšek
24458fe590 Smart annotations filter switching fixed/hacked. [SCI-884, SCI-889] 2017-01-18 15:29:48 +01:00
Luka Murn
cf72da5635 Merge branch 'improved-files-handling' into 'master' 
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
 2017-01-18 11:29:40 +01:00
Matej Zrimšek
d3c33c9dca Refactored smart annotation JS. [SCI-884] 2017-01-17 10:05:41 +01:00
Luka Murn
a2935c6620 Add sample info modal popup to sample smart annotations 
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').

Closes SCI-892.
 2017-01-16 15:52:02 +01:00
Matej Zrimšek
2877126dc6 Fixed selected search filter button style. [SCI-884] 2017-01-16 12:52:03 +01:00
Matej Zrimšek
15d7944302 Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889] 2017-01-13 18:51:05 +01:00
zmagod
1840fdb7e5 cleanup js 2017-01-12 09:52:29 +01:00
zmagod
3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
zmagod
a4aa933151 refactor smart annotation parser helper 2017-01-11 10:34:14 +01:00
zmagod
a903772de8 style dropdown 2017-01-10 17:05:32 +01:00
zmagod
fc76a4ae6d Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834 2017-01-10 14:22:04 +01:00
zmagod
89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
zmagod
e0e998a0d8 add smart annotation parser helper 2017-01-10 14:14:21 +01:00
zmagod
6efcf49927 working version of dropdown filter 2017-01-10 14:14:21 +01:00
zmagod
53d20df449 added xregexp 2017-01-10 14:14:21 +01:00
zmagod
94262b56ef prepare data for atwho 2017-01-10 14:14:21 +01:00
Oleksii Kriuchykhin
4c9c9037ed Enable image preview after editing protocol and disable preview modal animation [SCI-868] 2017-01-09 17:19:46 +01:00
Luka Murn
0ee5b98977 Refactor code a bit, add dismiss button to header 2017-01-07 09:59:52 +01:00
Oleksii Kriuchykhin
aa2b573278 Enable image preview while editing steps and code style improvements [SCI-694] 2017-01-06 15:58:23 +01:00
Luka Murn
7835753d3c Add atwho-users URL to <body> 2017-01-06 12:48:37 +01:00
Luka Murn
b614ce714b Restyle atwho dropdown 2017-01-05 14:06:48 +01:00
Luka Murn
a78bb79618 Temp commit 2017-01-05 12:07:17 +01:00
Luka Murn
3bee9d2e12 Save an (yet unworking) version of user smart annotations 
Used so other devs can start working on smart annotations.
 2017-01-04 10:54:02 +01:00
Oleksii Kriuchykhin
0d01a4b2bd Remove unneeded function from utils.js [SCI-819] 2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
4065be9e4e Fix marking of selected option [SCI-819] 2016-12-30 15:50:43 +01:00
Oleksii Kriuchykhin
e22ff6f8bb Fix an issue with sample editing and type/group dropdowns [SCI-819] 2016-12-30 15:50:43 +01:00
Luka Murn
5beaa26224 Update utils.js 
Closes SCI-811.
 2016-12-22 10:03:00 +01:00
Luka Murn
af6bf2aee1 Fix jQuery selector, make it work for new samples 2016-12-21 16:23:09 +01:00
Luka Murn
e52277bdad Fix sample types & groups when editing sample in samples table 
Closes SCI-811.
 2016-12-21 13:15:55 +01:00
Zmago Devetak
c8631077df Merge pull request #361 from biosistemika/improved-sample-table 
Improved sample table
 2016-12-16 15:37:54 +01:00
Zmago Devetak
daee14bed5 Merge pull request #343 from ZmagoD/zd_SCI_780 
fixed step description links [fixes SCI-780]
 2016-12-15 13:12:25 +01:00
zmagod
50c9dd3f59 fixed typo 2016-12-14 14:40:56 +01:00
zmagod
2426539715 fixes long names in columns dropdown [fixes SCI-784] 2016-12-13 14:54:37 +01:00
zmagod
b56913cc87 refactor 2016-12-12 16:21:38 +01:00
Matej Zrimšek
54de13de82 Upon redirection when clicking the new sample type or group link, you're automatically in adding mode. [Fixes SCI-701] 2016-12-09 17:22:09 +01:00
Matej Zrimšek
0b12c87b09 Restyled new sample type and group dropdown links. Some minor refactoring of related code and docs. [Fixes SCI-701] 2016-12-09 16:44:50 +01:00
zmagod
e23be6cc0e fixed step description links [fixes SCI-780] 2016-12-09 15:26:41 +01:00
Matej Zrimšek
aea679ec11 Added links for creating new sample type and group when creating new sample. [fixes SCI-701] 2016-12-09 11:39:12 +01:00
zmagod
9f1e436623 limits max size of all uploaded files at the one time [fixes SCI-740] 2016-12-07 09:02:04 +01:00
Matej Zrimšek
1db926101d Minor refactoring. 2016-11-23 10:48:43 +01:00
Matej Zrimšek
6bc2603157 Fixed tutorial overlay unexpectedly blurring the screen when not running the tutorial. [fixes SCI-707] 2016-11-23 10:36:09 +01:00
Oleksii Kriuchykhin
d7aa155860 Disable keyboard navigation in tutorial [SCI-703] 2016-11-22 14:14:42 +01:00
Oleksii Kriuchykhin
cc86ff268f Reload page after exit from tutorial [SCI-703] 2016-11-22 13:49:57 +01:00
mz3944
c5bc3a4dc6 Merge pull request #303 from mz3944/mz_and_new_tutorial_steps_SCI_571_v2 
Added additional tutorial step for showing protocol link. Tutorial st…
 2016-11-21 16:06:45 +01:00
Oleksii Kriuchykhin
d6f5f6b9bf Changes default behaviour for absolute urls in Quill [SCI-684] 2016-11-21 14:18:08 +01:00
Matej Zrimšek
f13cc5be0e Added additional tutorial step for showing protocol link. Tutorial steps 1-3 are now completelly handled in JS and not in HTML (preferred way). 2016-11-17 18:03:49 +01:00
Luka Murn
26d04b1f3c Merge branch 'rich-text-formatting' into 'master' 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/themes/scinote.scss
 2016-11-17 16:39:33 +01:00
Matej Zrimšek
c8eb82cc85 Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
0e97bfc002 Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
c64146904a Refactored and added back button for tutorial for steps 19-20. Updated tutorial steps count. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
47c1308ba6 Refactored and added back button for tutorial for step 18. Tutorial function now also works with one page step. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
00ed91e856 Refactored and added back button for tutorial for steps 16-17. Tutorial now exits upon page leave. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
4ee7baabec Enriched tutorial function description. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
f4206ea3d0 No warning popup is shown when running tutorial. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
3f8d3d5939 Refactored and added back button for tutorial for steps 6-11. 2016-11-17 14:46:04 +01:00
Matej Zrimšek
74e58b044f Tutorial refactored using one method, for steps 1-5. 2016-11-17 14:46:04 +01:00
Luka Murn
d1701bd7ae Merge pull request #276 from Ducz0r/lm-sci-637 
Automatically resize textarea elements [SCI-637]
 2016-11-17 09:58:36 +01:00
Luka Murn
a3bbf94643 Add a smart_text_area tag & implement it throughout application 
This fixes the mentioned issues @mlorb mentioned.
Closes SCI-637.
 2016-11-16 17:57:01 +01:00
Mojca Lorber
4d681bb63c change strip html function 2016-11-11 12:34:57 +01:00
Mojca Lorber
3b7af3e66c fix validation logic 2016-11-11 11:42:16 +01:00
Luka Murn
b42922d32c Add autosize functionality to all textareas 
Closes SCI-637
 2016-11-11 09:09:41 +01:00
Luka Murn
0e065026bd Closes SCI-648 2016-11-10 16:18:17 +01:00
Luka Murn
6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
Matej Zrimšek
ece89da391 Removed ruby constants duplicates in JS, because of caching problems. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
05acf5a725 Replaced all Ruby constants instances in JS to be called from JS. 2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Matej Zrimšek
234918a76d Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits. 2016-09-21 19:48:18 +02:00
Matej Zrimšek
c6a23aab98 Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408] 2016-09-21 19:37:36 +02:00
Matej Zrimšek
c2f0106993 Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408] 2016-09-16 15:56:44 +02:00
zmagod
e1d871dcdb clear undefind from experiment name and refactor sidebar in reports [fixes SCI-448] 2016-09-14 11:11:35 +02:00
Zmago Devetak
1368716aa0 Merge pull request #130 from ZmagoD/zd_SCI_348 
project overview - updating (or creating new) experiment details
 2016-09-08 12:49:35 +02:00
Matej Zrimšek
6eca3661bf Some JS error refactoring and accordingly updated error rendering when experiment description is too long. 2016-09-08 12:43:31 +02:00
Matej Zrimšek
b0ad6d0753 Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407]. 2016-09-06 23:26:00 +02:00
Zmago Devetak
1a19753df9 Merge pull request #128 from ZmagoD/zd_SCI_105 
Trim long words in reports [fixes SCI-105]
 2016-09-06 10:10:06 +02:00
zmagod
28fa00c30c trim long words in reports [fixes SCI-105] 2016-09-01 15:45:39 +02:00
Matej Zrimšek
4fdf478426 Minor refactoring. 2016-08-31 17:57:06 +02:00
Luka Murn
5cb79f6282 Fix the default parameters in JS 
This was causing major issues in IE.
 2016-08-31 14:04:45 +02:00
Matej Zrimšek
782d384e26 Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step). 2016-08-25 22:26:53 +02:00
Matej Zrimšek
e4a6a3944e Added deleting of files on S3 server when editing/removing a file. Some refactoring. 2016-08-17 18:13:35 +02:00
Matej Zrimšek
ccdccc5cf1 Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring. 2016-08-17 18:11:13 +02:00
Matej Zrimšek
c87ba5b45c Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page. 2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring. 2016-08-17 18:08:21 +02:00
Matej Zrimšek
b70f49f4e0 Some additional refinements. 2016-08-17 18:00:04 +02:00
Matej Zrimšek
86880f0299 Additional changes, refactoring and improvements. 2016-08-17 17:57:54 +02:00
Matej Zrimšek
01aad1764c Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring. 2016-08-17 17:54:45 +02:00
Matej Zrimšek
e2f94caa96 Step creation is now completelly validated on client-side also, to avoid front-end problems after server-side validation. This was needed as lots of issues were caused by this. Also step creation user experience is enriched and refactoring of related code was done. 2016-08-17 17:54:06 +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