Zmago Devetak
|
d3234bc52f
|
Merge pull request #284 from biosistemika/zd_SCI_662
fixes description label [fixes SCI-662]
|
2016-11-16 14:16:57 +01:00 |
|
zmagod
|
7953372d83
|
add description label
|
2016-11-16 13:59:35 +01:00 |
|
Luka Murn
|
8302a87671
|
Update Gemfile
|
2016-11-16 10:07:18 +01:00 |
|
mlorb
|
59952e400c
|
Merge pull request #290 from mlorb/ml_sci_669
add validation for result text field [SCI-669]
|
2016-11-15 13:09:37 +01:00 |
|
Mojca Lorber
|
c089832909
|
add validation for result text field
|
2016-11-15 12:55:32 +01:00 |
|
mlorb
|
c996df7476
|
Merge pull request #287 from mlorb/ml_sci_665
Fix position of buttons in text result [SCI-665]
|
2016-11-15 11:27:04 +01:00 |
|
Zmago Devetak
|
914bd42448
|
Merge pull request #278 from ZmagoD/zd_search_bug_with_rich_text_editor
strips the html tags from fearch query
|
2016-11-15 10:30:29 +01:00 |
|
Mojca Lorber
|
6afc5c5a4b
|
fix position of buttons in text result
|
2016-11-14 16:31:48 +01:00 |
|
zmagod
|
67c508a891
|
fixes description label [fixes SCI-662]
|
2016-11-14 13:47:20 +01:00 |
|
zmagod
|
3728a6cef9
|
fixed sql regex
|
2016-11-14 12:32:41 +01:00 |
|
mlorb
|
b0b2484fdf
|
Merge pull request #279 from mlorb/ml_sci_638_vol2
Fix validation problems for rich text fields [SCI-638]
|
2016-11-11 12:37:02 +01:00 |
|
Mojca Lorber
|
4d681bb63c
|
change strip html function
|
2016-11-11 12:34:57 +01:00 |
|
Zmago Devetak
|
a5637a65a0
|
Merge pull request #274 from ZmagoD/zd_SCI_639
Customize the library SCI-639
|
2016-11-11 12:15:23 +01:00 |
|
mlorb
|
1ca452db7b
|
Merge pull request #273 from mlorb/ml_sci_640
Add rich text formatting on results and remove markdown [SCI-640]
|
2016-11-11 12:06:13 +01:00 |
|
mlorb
|
d42adff77e
|
Merge pull request #275 from mlorb/ml_sci_642
Add formatted text in reports [SCI-642]
|
2016-11-11 12:04:19 +01:00 |
|
Mojca Lorber
|
4b7fa440f6
|
fix hound
|
2016-11-11 12:03:01 +01:00 |
|
Mojca Lorber
|
3b7af3e66c
|
fix validation logic
|
2016-11-11 11:42:16 +01:00 |
|
zmagod
|
630724df2b
|
strips the html tags from fearch query
|
2016-11-11 11:41:23 +01:00 |
|
Luka Murn
|
acd8ce8932
|
Merge pull request #270 from Ducz0r/lm-sci-644
Convert all large text input fields into text areas (10000 characters)
|
2016-11-11 09:07:25 +01:00 |
|
Mojca Lorber
|
1facd2cefe
|
fix validation problems
|
2016-11-10 17:20:17 +01:00 |
|
Mojca Lorber
|
fbaffbcaab
|
add formatted text in reports
|
2016-11-10 15:20:40 +01:00 |
|
Mojca Lorber
|
d2ae11f1af
|
fix hound
|
2016-11-10 14:16:54 +01:00 |
|
zmagod
|
df43614f00
|
swithced quill gem to master branch
|
2016-11-10 14:15:39 +01:00 |
|
Mojca Lorber
|
3e162b3a93
|
remove redcarpet gem - markdown
|
2016-11-10 14:11:32 +01:00 |
|
zmagod
|
7c7106d8ff
|
included updated guill-rails version [fixes SCI-639]
|
2016-11-10 14:04:22 +01:00 |
|
Mojca Lorber
|
456c6d1ad6
|
Copy rich text functionality to text results
|
2016-11-10 12:19:59 +01:00 |
|
mlorb
|
19433850c8
|
Merge pull request #272 from mlorb/ml-sci-638
Integrate library with default settings [SCI-638]
|
2016-11-09 17:10:19 +01:00 |
|
Mojca Lorber
|
c44e25d72e
|
add gemfile.lock
|
2016-11-09 17:08:50 +01:00 |
|
Mojca Lorber
|
ab0879e8d6
|
Integrate library with default settings
|
2016-11-09 13:09:53 +01:00 |
|
Luka Murn
|
d44a757b25
|
Add textareas to checklist name & items
Closes SCI-644
|
2016-11-08 11:50:29 +01:00 |
|
Luka Murn
|
55d8fea359
|
Make all comment edit fields textareas
|
2016-11-08 11:29:55 +01:00 |
|
okriuchykhin
|
fd805f4072
|
Merge pull request #259 from okriuchykhin/ok_SCI_605
Added additional activities [SCI-605]
|
2016-11-07 10:01:16 +01:00 |
|
Oleksii Kriuchykhin
|
fe6724431e
|
Futher improvement of samples assign/unassign logging [SCI-605]
|
2016-11-07 09:29:56 +01:00 |
|
Oleksii Kriuchykhin
|
a1bfacef86
|
Improved samples assign/unassign logging [SCI-605]
|
2016-11-03 17:59:32 +01:00 |
|
mlorb
|
4c311c1664
|
Merge pull request #266 from mlorb/ml_avatar_marge_conflict
fix merge conflict problem with avatar on profile page
|
2016-11-03 16:18:24 +01:00 |
|
Mojca Lorber
|
a234c4c9d9
|
fix merge conflict problem with avatar on profile page
|
2016-11-03 15:23:09 +01:00 |
|
Oleksii Kriuchykhin
|
3d25da5db7
|
Fixed bug with protocol loading from file [SCI-605]
|
2016-11-03 14:15:22 +01:00 |
|
Mojca Lorber
|
dec08c47cf
|
Merge branch 'mlorb-ml_sci_610'
|
2016-11-02 14:08:05 +01:00 |
|
Mojca Lorber
|
44b51d087a
|
merging
|
2016-11-02 14:06:20 +01:00 |
|
Oleksii Kriuchykhin
|
e8d20dfc01
|
Added additional activities [SCI-605]
|
2016-11-02 10:43:36 +01:00 |
|
Zmago Devetak
|
6e022699eb
|
Merge pull request #256 from ZmagoD/add_getting_started_flash_hook
Added getting started hoot to layout/application.html
|
2016-10-28 16:19:20 +02:00 |
|
okriuchykhin
|
8821cfb5fc
|
Merge pull request #255 from okriuchykhin/ok_SCI_566
Added statistics block in users profile [SCI-566]
|
2016-10-28 14:27:15 +02:00 |
|
Luka Murn
|
d67d36612b
|
Add addons folder
|
2016-10-28 11:02:33 +02:00 |
|
zmagod
|
01b27e9e6d
|
added getting started hoot to layout/application.html
|
2016-10-28 10:36:15 +02:00 |
|
Mojca Lorber
|
91ec201fd0
|
make image clickable
|
2016-10-27 16:18:31 +02:00 |
|
Oleksii Kriuchykhin
|
d28edfb488
|
Added statistics block in users profile [SCI-566]
|
2016-10-27 13:44:27 +02:00 |
|
Mojca Lorber
|
888aa31aed
|
fix hound
|
2016-10-27 11:18:11 +02:00 |
|
Mojca Lorber
|
5719d4c61f
|
show edit avatar on mouse hover, add background and center image
|
2016-10-27 11:09:30 +02:00 |
|
Mojca Lorber
|
8309df0aaf
|
fix hound
|
2016-10-26 13:51:05 +02:00 |
|
Mojca Lorber
|
878952f072
|
change edit avatar in profile
|
2016-10-26 13:41:17 +02:00 |
|