scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
1493 commits 70 branches 179 tags 165 MiB
Commit graph

1228 commits

Author SHA1 Message Date
zmagod 4f7d62e79d removes unneeded annotations [fixes SCI-915] 2017-01-20 11:33:10 +01:00
Matej Zrimšek 5d65627808 Fixed sample editing in samples table. [SCI-914] 2017-01-20 11:10:17 +01:00
Mojca Lorber 3789769af3 add dynamic length for sample type/group field when adding new sample 2017-01-20 09:53:44 +01:00
zmagod 9550c6dd35 fixes highlight.js 2017-01-19 17:09:25 +01:00
Mojca Lorber 6653f0d4c1 small fixes 2017-01-19 16:42:14 +01:00
Mojca Lorber 6de83ff53b fix hound 2017-01-19 15:58:40 +01:00
Mojca Lorber 4ea154410a add to fields with rich text formatting 2017-01-19 15:27:24 +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
Mojca Lorber 44de927cf4 display smart annotations in reports - without rich text fields 2017-01-19 14:22:54 +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
zmagod 2cbb8ba41a removed unneeded comments 2017-01-19 12:54:48 +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
okriuchykhin 7f6ceef9e9 Merge pull request #422 from okriuchykhin/ok_SCI_897 
Remove sample type and group from smart annotation [SCI-897]
 2017-01-18 16:26:25 +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
Oleksii Kriuchykhin e45749d3b2 Remove sample type and group from smart annotation [SCI-897] 2017-01-18 14:46:53 +01:00
Mojca Lorber f656a1093d fix hound 2017-01-18 14:40:24 +01:00
Mojca Lorber 6155a458e7 update search 2017-01-18 14:22:19 +01:00
Mojca Lorber dde9854bf1 update protocol import/export and clone 2017-01-18 14:22:19 +01:00
Mojca Lorber 3b92ab9f36 add names to tables from protocol steps in reports 2017-01-18 14:22:19 +01:00
Mojca Lorber b3c423c582 add table name in protocol step 2017-01-18 14:22:18 +01:00
okriuchykhin 8a220c2351 Merge pull request #414 from okriuchykhin/ok_SCI_887 
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
 2017-01-18 13:50:22 +01:00
Oleksii Kriuchykhin 55d0e82fcd Change If statement to ternary operator [SCI-887] 2017-01-18 13:43:21 +01:00
Oleksii Kriuchykhin a490a12fb1 Add truncation of image description in the preview [SCI-873] 2017-01-18 13:28:56 +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
okriuchykhin 9dfa30fbb4 Merge pull request #418 from okriuchykhin/ok_SCI_855_v2 
Remove previous fix for popups [SCI-855]
 2017-01-18 11:00:54 +01:00
Oleksii Kriuchykhin 12eb1df69f Remove previous fix for popups [SCI-855] 2017-01-18 10:59:00 +01:00
Zmago Devetak 1b9f7db385 Merge pull request #405 from ZmagoD/zd_SCI_832 
Visualization of User smart annotation after saving the field
 2017-01-18 09:36:42 +01:00
okriuchykhin 781a68e0d5 Merge pull request #415 from okriuchykhin/ok_SCI_888 
Add missed space in the string [SCI-888]
 2017-01-18 09:34:51 +01:00
zmagod cb0483a6e6 refactor 2017-01-18 08:34:29 +01:00
Oleksii Kriuchykhin ea8f6a8c6b Fix issue in report editor [SCI-102] 2017-01-17 14:21:59 +01:00
Matej Zrimšek 3085452ec9 Fixed some hound alerts. [SCI-884] 2017-01-17 11:04:16 +01:00
Matej Zrimšek d3c33c9dca Refactored smart annotation JS. [SCI-884] 2017-01-17 10:05:41 +01:00
Luka Murn ffc2b56dff Fix String quotes 2017-01-17 08:28:41 +01:00
Luka Murn 2f48409fdd Merge pull request #409 from Ducz0r/lm-sci-813-fix-v2 
Fix filter not working correctly with hidden custom columns [SCI-813]
 2017-01-17 08:17:52 +01:00
Oleksii Kriuchykhin 0ce71884a5 Add missed space in the string [SCI-888] 2017-01-16 17:09:41 +01:00
Oleksii Kriuchykhin 50edaef4ff Do not show archived projects, experiments and tasks in smart annotations [SCI-887] 2017-01-16 16:55:10 +01:00
Luka Murn 16955dcee6 Fix Hound errors. 2017-01-16 15:58:37 +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
okriuchykhin 02bfd19d1c Merge pull request #385 from okriuchykhin/ok_SCI_102 
Fix XSS on activites and throghout the rest of app [SCI-102]
 2017-01-16 11:41:38 +01:00
mlorb 88cc87d168 Merge pull request #408 from mlorb/ml-sci-847-v2 
Adjust columns width in samples table header after selecting sample group [SCI-847]
 2017-01-16 10:52:00 +01:00
Luka Murn a0e9e5afa8 Merge pull request #402 from mz3944/mz-sci-848-v2 
Unable to delete samples [SCI-848]
 2017-01-16 10:47:13 +01:00
Luka Murn 0fd9660eb7 Merge pull request #403 from Ducz0r/lm-sci-876-fix 
Year difference problems with notifications [SCI-876]
 2017-01-14 10:01:38 +01:00
Luka Murn 1acf258c70 Fix minor Zmagohound comment 2017-01-14 10:00:52 +01:00
Mojca Lorber 9f1a49847e fix table header again 2017-01-13 18:54:43 +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
Luka Murn ba567284ed Fix filter not working correctly with hidden custom columns 
Closes SCI-813.
 2017-01-13 17:03:19 +01:00
Mojca Lorber 5f7e0b2227 adjust columns width in samples table header after selecting sample group 2017-01-13 15:59:47 +01:00
okriuchykhin 1ae5e6f8a7 Merge pull request #406 from okriuchykhin/ok_SCI_855 
Fix compatibility of fixed samples table header and modal-tooltip [SCI-855]
 2017-01-13 15:56:37 +01:00
Oleksii Kriuchykhin a190ef36ff Extend comment to make more clear [SCI-855] 2017-01-13 12:43:43 +01:00
zmagod 1b2fa78e42 adds user preview to user smart annotation [fixes SCI-832] 2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin 097209bd9d Fix compatibility of fixed samples table header and modal-tooltip [SCI-855] 2017-01-13 11:34:05 +01:00
Mojca Lorber bc6fbc5f91 fix hound 2017-01-13 11:18:44 +01:00
Mojca Lorber 4250088447 fix broken scrolling functionality in samples table 2017-01-13 11:07:33 +01:00
Oleksii Kriuchykhin f567d0307e Fix includes [SCI-102] 2017-01-12 17:02:01 +01:00
Oleksii Kriuchykhin 75031e17b9 Remove double sanitization from views [SCI-102] 2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin 69b65c27f8 Remove input sanitization in the models [SCI-102] 2017-01-12 16:20:37 +01:00
Luka Murn bc03a26d4b Also fix this new year issue on comments display 2017-01-12 15:06:12 +01:00
Luka Murn 8b01f912a0 Fix new year problems with activities 
Closes SCI-876.
 2017-01-12 14:47:15 +01:00
Matej Zrimšek 93a8e0bdae Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848] 2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin 0350f2f792 Add html escaping to name filelds in the views [SCI-102] 2017-01-12 11:03:14 +01:00
zmagod 1840fdb7e5 cleanup js 2017-01-12 09:52:29 +01:00
Oleksii Kriuchykhin d05c16b0ba Added auto_link wrapper with custom sanitization [SCI-102] 2017-01-11 17:02:17 +01:00
mz3944 aba12b9b2c Merge pull request #401 from mz3944/mz-sci-878 
Protocol repository - user cannot download files
 2017-01-11 16:25:45 +01:00
Oleksii Kriuchykhin 0546716a0b Improve user input sanitization, fix bugs [SCI-102] 2017-01-11 15:50:11 +01:00
okriuchykhin 404952336d Merge pull request #400 from okriuchykhin/ok_SCI_846 
Fixes sorting of custom columns in samples datatable [SCI-846]
 2017-01-11 15:34:02 +01:00
mlorb fe1ef97523 Merge pull request #398 from mlorb/ml_sci_843 
Adjust samples tables height when in edit mode selecting sample type/group [SCI-843]
 2017-01-11 15:33:52 +01:00
Mojca Lorber 3a3f20a215 fix bug with different approach 2017-01-11 15:25:10 +01:00
zmagod 065e1a7120 fix hound 2017-01-11 15:06:00 +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
Matej Zrimšek 30a9c283fb Added back bullets to images in protocol preview in protocol repository. 2017-01-11 14:15:07 +01:00
Matej Zrimšek 852dc2eb7e Added file downloading to protocol preview in protocol repository. [SCI-878] 2017-01-11 14:14:12 +01:00
Oleksii Kriuchykhin 094d0f0f71 Fixes sorting of custom columns in samples datatable [SCI-846] 2017-01-11 13:21:38 +01:00
okriuchykhin 8d4b2d7373 Merge pull request #399 from okriuchykhin/ok_SCI_811_v2 
Fix changed sample type and sample group in sample edit [SCI-811]
 2017-01-11 11:37:38 +01:00
mlorb 90e644ddd9 Merge branch 'master' into ml_sci_843 2017-01-11 11:35:41 +01:00
mlorb f0842389b2 Merge pull request #396 from mlorb/ml_sci_851 
Change color of clickable names when row is selected in datatables [SCI-851]
 2017-01-11 11:21:31 +01:00
mlorb b898c792c4 Merge pull request #395 from mlorb/ml_sci_847 
Adjust columns width in table header after selecting sample type/group [SCI-847]
 2017-01-11 10:43:12 +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
Oleksii Kriuchykhin a3d9e25feb Fix changed sample type and sample group in sample edit [SCI-811] 2017-01-10 16:51:51 +01:00
Mojca Lorber 577e526fec adjust samples tables height when in edit mode selecting sample type or group 2017-01-10 16:31:20 +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
Luka Murn 0cf5afa499 Merge pull request #376 from Ducz0r/lm-sci-813-fix 
Fix search on hidden columns in samples table [SCI-813]
 2017-01-10 11:27:56 +01:00