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

156 commits

Author SHA1 Message Date
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