Luka Murn
|
f4c9863814
|
Merge pull request #292 from Ducz0r/lm-sci-664-fix-2
Reload whole page after user is invited from team invite users modal [SCI-664]
|
2016-11-15 17:15:53 +01:00 |
|
Luka Murn
|
29f0557d3c
|
Prevent CORS when importing protocols
|
2016-11-15 17:06:39 +01:00 |
|
Luka Murn
|
83160a487b
|
Fix importer so it supports rendering & importing rich text format
Closes SCI-674.
|
2016-11-15 16:57:53 +01:00 |
|
Oleksii Kriuchykhin
|
410837e6cf
|
Fix project canvas interactivity in the tutorial [SCI-670]
|
2016-11-15 16:53:20 +01:00 |
|
Luka Murn
|
263244ad83
|
Reload whole page after user is invited from team invite users modal
Closes SCI-664.
|
2016-11-15 16:21:32 +01:00 |
|
Luka Murn
|
d425a7ad05
|
Merge pull request #283 from Ducz0r/lm-sci-650-fix
Update invited user form so it works if user inputs empty team name [SCI-650]
|
2016-11-15 15:59:52 +01:00 |
|
Luka Murn
|
eb4d031b79
|
Fix destroying of users in relation to notifications
|
2016-11-15 15:56:32 +01:00 |
|
Luka Murn
|
04749c3b2c
|
Allow inviting of existing, unconfirmed users
Closes SCI-676.
|
2016-11-15 15:04:31 +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 |
|
okriuchykhin
|
01b01939f3
|
Merge pull request #277 from okriuchykhin/ok_SCI_571
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
|
2016-11-15 12:05:20 +01:00 |
|
Luka Murn
|
7c03037643
|
Merge pull request #286 from Ducz0r/lm-sci-655-fix
Save first time tutorial Activity-s without callbacks [SCI-655]
|
2016-11-15 12:00:35 +01:00 |
|
mlorb
|
69df418d0c
|
Merge pull request #289 from mlorb/ml_sci_656_vol2
Profile changes for gamification [SCI-656] vol2
|
2016-11-15 11:27:53 +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 |
|
Mojca Lorber
|
607f1381d0
|
fix mobile view
|
2016-11-15 10:58:15 +01:00 |
|
Luka Murn
|
e733da728c
|
Fix a bug where user could be assigned to same project twice
Closes SCI-675.
|
2016-11-15 10:44:32 +01:00 |
|
Zmago Devetak
|
fddd7f662b
|
Merge pull request #281 from ZmagoD/zd_SCI_660
hide flash after 5 sec [fixes SCI-660]
|
2016-11-15 10:33:45 +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 |
|
mlorb
|
d3ee7f546c
|
Merge pull request #285 from mlorb/ml_sci_656
Profile changes for gamification [SCI-656]
|
2016-11-14 16:36:14 +01:00 |
|
Mojca Lorber
|
6afc5c5a4b
|
fix position of buttons in text result
|
2016-11-14 16:31:48 +01:00 |
|
Luka Murn
|
fa6d8d3020
|
Save first time tutorial Activity-s without callbacks
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
|
2016-11-14 15:55:44 +01:00 |
|
Mojca Lorber
|
7002fc3f2f
|
fix hound
|
2016-11-14 15:10:37 +01:00 |
|
Mojca Lorber
|
615cd3c278
|
profile changes for gamification
|
2016-11-14 15:04:18 +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 |
|
okriuchykhin
|
091cb0005e
|
Merge pull request #280 from okriuchykhin/ok_SCI_658
Show only protocols from Protocol Management in users statistics [SCI-658]
|
2016-11-14 09:40:12 +01:00 |
|
okriuchykhin
|
009d3b0510
|
Merge pull request #282 from okriuchykhin/ok_SCI_649
Fixes edit avatar link area [SCI-649]
|
2016-11-14 09:31:05 +01:00 |
|
Luka Murn
|
861e7cf72d
|
Update invited user form so it works if user inputs empty team name
Closes SCI-650
|
2016-11-11 17:27:32 +01:00 |
|
Oleksii Kriuchykhin
|
2fb3041784
|
Fixes edit avatar link area [SCI-649]
|
2016-11-11 13:17:44 +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 |
|
zmagod
|
59f7bdb54e
|
hide flash after 5 sec [fixes SCI-660]
|
2016-11-11 12:30:48 +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 |
|
Oleksii Kriuchykhin
|
ab895ae864
|
Show only protocols from Protocol Management in users statistics [SCI-658]
|
2016-11-11 12:14:57 +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 |
|
Oleksii Kriuchykhin
|
b9f982ead7
|
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
|
2016-11-11 10:07:34 +01:00 |
|
Oleksii Kriuchykhin
|
d2491a18a4
|
Tutorial Save Protocol step added [SCI-571]
|
2016-11-11 10:06:18 +01:00 |
|
Luka Murn
|
5727158495
|
Hotfix to nicely render comments form on Firefox as well
|
2016-11-11 09:47:37 +01:00 |
|
Luka Murn
|
b42922d32c
|
Add autosize functionality to all textareas
Closes SCI-637
|
2016-11-11 09:09:41 +01:00 |
|
Luka Murn
|
55f9633d1d
|
Add jQuery.autosize plugin
|
2016-11-11 09:09:41 +01:00 |
|
okriuchykhin
|
ac0a449522
|
Merge pull request #271 from okriuchykhin/ok_SCI_570_v2
Added step numbers in intro tutorial [SCI-570]
|
2016-11-11 09:08:47 +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 |
|
Luka Murn
|
0e065026bd
|
Closes SCI-648
|
2016-11-10 16:18:17 +01:00 |
|
Mojca Lorber
|
fbaffbcaab
|
add formatted text in reports
|
2016-11-10 15:20:40 +01:00 |
|
Luka Murn
|
564274a588
|
Set invited_by field to invited users
|
2016-11-10 14:45:24 +01:00 |
|