Matej Zrimšek
|
4b0f47675a
|
Fixes experiment button not being clicable in project overview page. [SCI-849]
|
2017-01-05 14:42:52 +01:00 |
|
Oleksii Kriuchykhin
|
6487bd788a
|
Add additional whitelisted tags [SCI-102]
|
2017-01-05 14:40:38 +01:00 |
|
Luka Murn
|
b614ce714b
|
Restyle atwho dropdown
|
2017-01-05 14:06:48 +01:00 |
|
Oleksii Kriuchykhin
|
0ecb6904d4
|
Add user input sanitizing in the models [SCI-102]
|
2017-01-05 13:31:35 +01:00 |
|
Oleksii Kriuchykhin
|
835e982292
|
SAnitize AJAX calls in controllers and datatables [SCI-102]
|
2017-01-05 13:12:22 +01:00 |
|
Oleksii Kriuchykhin
|
cd3924afd3
|
Sanitize .html_safe marked strings which contain tags [SCI-102]
|
2017-01-05 13:04:19 +01:00 |
|
Oleksii Kriuchykhin
|
9c4191a1e0
|
Initial code commit [SCI-102]
|
2017-01-05 13:04:19 +01:00 |
|
Luka Murn
|
a78bb79618
|
Temp commit
|
2017-01-05 12:07:17 +01:00 |
|
Luka Murn
|
eb64162633
|
Remove Gem dependency, add atwho as regular vendor/js
|
2017-01-05 12:06:59 +01:00 |
|
Luka Murn
|
e12907c9b9
|
Remove original atwho css, apply our own
|
2017-01-05 10:52:28 +01:00 |
|
Luka Murn
|
09ef3b3ad5
|
Merge pull request #378 from Ducz0r/lm-sci-802-fix
Add tooltips to samples column dropdown [SCI-802]
|
2017-01-04 11:30:04 +01:00 |
|
Luka Murn
|
2c5b27ce81
|
Change "Update" to "Save"
Closes SCI-802.
|
2017-01-04 11:29:34 +01:00 |
|
mlorb
|
59751ec41e
|
Merge pull request #373 from mlorb/ml_sci_709
Add Protocol Preview to Protocol repository [SCI-709]
|
2017-01-04 11:28:55 +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 |
|
Luka Murn
|
23e60e0d01
|
Add Gems for smart annotations (atwho)
|
2017-01-04 10:51:55 +01:00 |
|
Luka Murn
|
cedc6c5074
|
Merge pull request #382 from Ducz0r/lm-sci-166-fix
Re-add tags index controller action to render tags [SCI-166]
|
2017-01-04 10:48:09 +01:00 |
|
Luka Murn
|
6402acc102
|
Merge pull request #377 from Ducz0r/lm-sci-820-fix
Fix 2 bugs with comments editing [SCI-820]
|
2017-01-04 10:47:29 +01:00 |
|
zmagod
|
87ffa7f03b
|
fixes X-WOPI-ServerVersion bug
|
2017-01-04 10:02:08 +01:00 |
|
Luka Murn
|
37cd6417c8
|
Merge pull request #374 from Ducz0r/lm-sci-808-814-fix
Fix some bugs on sample groups & types page [SCI-808, SCI-814]
|
2017-01-04 09:50:26 +01:00 |
|
Mojca Lorber
|
fe37ac3b6d
|
fix hound 2
|
2017-01-03 17:46:30 +01:00 |
|
Mojca Lorber
|
0011474ea3
|
fix hound
|
2017-01-03 17:43:55 +01:00 |
|
Mojca Lorber
|
a0704cd873
|
remove duplicated includes of css and js
|
2017-01-03 17:33:01 +01:00 |
|
zmagod
|
8cd092b521
|
update schema
|
2017-01-03 16:51:02 +01:00 |
|
zmagod
|
a434649f42
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
|
2017-01-03 16:35:25 +01:00 |
|
Mojca Lorber
|
c476faca30
|
fix hound
|
2017-01-03 11:04:09 +01:00 |
|
Mojca Lorber
|
e555535dfb
|
add edit button to protocol preview modal
|
2017-01-03 10:04:14 +01:00 |
|
zmagod
|
01c086b667
|
fixes routes.rb indentation
|
2017-01-03 09:49:18 +01:00 |
|
Luka Murn
|
af9e272b2a
|
Re-add tags index controller action to render tags
Closes SCI-166.
|
2017-01-03 09:39:41 +01:00 |
|
Zmago Devetak
|
5d0e80a5e1
|
Merge pull request #369 from ZmagoD/zd_SCI_812
fixes bug with samples sorting [fixes SCI-812]
|
2017-01-03 08:56:59 +01:00 |
|
okriuchykhin
|
7f99449f63
|
Merge pull request #371 from okriuchykhin/ok_SCI_819
Fix an issue with sample editing and type/group dropdowns [SCI-819]
|
2016-12-30 15:52:13 +01:00 |
|
Oleksii Kriuchykhin
|
c77c83752e
|
Remove unused css class link-look [SCI-819]
|
2016-12-30 15:50:43 +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 |
|
okriuchykhin
|
2474eac37d
|
Merge pull request #367 from okriuchykhin/ok_SCI_818
Fix sample info popup [SCI-818]
|
2016-12-30 15:43:28 +01:00 |
|
okriuchykhin
|
e826791429
|
Merge pull request #365 from okriuchykhin/ok_SCI_807
Fix buttons disappear when deleting columns in samples [SCI-807]
|
2016-12-30 15:43:13 +01:00 |
|
okriuchykhin
|
68ac3486c7
|
Merge pull request #381 from okriuchykhin/ok_SCI_275
Add task name to project activity [SCI-275]
|
2016-12-30 15:32:08 +01:00 |
|
okriuchykhin
|
73478d7b5e
|
Merge pull request #372 from okriuchykhin/ok_SCI_816
Fix flash message display in samples table [SCI-816]
|
2016-12-30 15:30:14 +01:00 |
|
okriuchykhin
|
cce57d066c
|
Merge pull request #370 from okriuchykhin/ok_SCI_817
Fix issue with long samples column names in import modal [SCI-817]
|
2016-12-30 15:29:32 +01:00 |
|
okriuchykhin
|
e8955b0304
|
Merge pull request #375 from okriuchykhin/ok_SCI_361
Add sorting to Project's experiments overview [SCI-361]
|
2016-12-30 15:28:53 +01:00 |
|
okriuchykhin
|
b29e041e27
|
Merge pull request #380 from okriuchykhin/ok_SCI_766
Add description to Clone actions [SCI-766]
|
2016-12-30 15:28:32 +01:00 |
|
okriuchykhin
|
36f07b908a
|
Merge pull request #379 from okriuchykhin/ok_SCI_632
Fix XSS vulnerability in protocol keywords [SCI-632]
|
2016-12-30 15:28:05 +01:00 |
|
Oleksii Kriuchykhin
|
f076226b3f
|
Add task name to project activity [SCI-275]
|
2016-12-29 16:31:48 +01:00 |
|
Oleksii Kriuchykhin
|
d898f8993f
|
Add description to Clone actions [SCI-766]
|
2016-12-29 15:33:49 +01:00 |
|
Oleksii Kriuchykhin
|
d798f1b120
|
Fix XSS vulnerability in protocol keywords [SCI-632]
|
2016-12-29 15:15:29 +01:00 |
|
Oleksii Kriuchykhin
|
e156dbc987
|
Implement flash message hiding through module pattern [SCI-816]
|
2016-12-28 14:52:03 +01:00 |
|
Luka Murn
|
2304742d87
|
Add tooltips to samples column dropdown
Closes SCI-802.
|
2016-12-27 08:45:23 +01:00 |
|
Luka Murn
|
b931b20f02
|
Fix 2 bugs with comments editing
Closes SCI-820.
|
2016-12-23 20:41:23 +01:00 |
|
Luka Murn
|
fbc2be890c
|
Fix search on hidden columns in samples table
Closes SCI-813.
|
2016-12-23 19:56:54 +01:00 |
|
Oleksii Kriuchykhin
|
4d3e002c81
|
Add sorting to Project's experiments overview [SCI-361]
|
2016-12-23 15:40:01 +01:00 |
|