Mojca Lorber
|
86bc6adc2a
|
fix lost column updated name at sample page and bug with another user not able to view column dropdown
|
2017-05-11 11:16:12 +02:00 |
|
okriuchykhin
|
f239238064
|
Merge pull request #611 from okriuchykhin/ok_SCI_1252
Fix root_url method unavailable in application_helper [SCI-1252]
|
2017-05-11 11:15:00 +02:00 |
|
okriuchykhin
|
15f19b73fb
|
Merge pull request #610 from okriuchykhin/ok_SCI_1253
Add notifications counter badge to project card [SCI-1253]
|
2017-05-11 11:11:09 +02:00 |
|
okriuchykhin
|
000ca26452
|
Merge pull request #607 from okriuchykhin/ok_SCI_1243
Add specific classes to task card for analytics [SCI-1243]
|
2017-05-11 11:10:05 +02:00 |
|
osboxes.org
|
8c83b3a196
|
Added updated_at values and unnecessary migration rollback [fixes SCI-1145]
|
2017-05-11 11:08:36 +02:00 |
|
Oleksii Kriuchykhin
|
229693ec61
|
Fix root_url method unavailable in application_helper [SCI-1252]
|
2017-05-10 18:15:08 +02:00 |
|
Oleksii Kriuchykhin
|
a5926726ce
|
Add notifications counter badge to project card [SCI-1253]
|
2017-05-10 17:28:37 +02:00 |
|
Zmago Devetak
|
cb79a405c3
|
Merge pull request #609 from ZmagoD/zd_SCI_1248_v2
fixes input sanitize method [fixes SCI-1248]
|
2017-05-10 15:36:57 +02:00 |
|
zmagod
|
511f39e093
|
add constants
|
2017-05-10 15:33:33 +02:00 |
|
Zmago Devetak
|
fecb367b96
|
Merge pull request #608 from biosistemika/release-1.10.1
Merge release 1.10.1 into master
|
2017-05-10 15:15:22 +02:00 |
|
zmagod
|
2081e0a94b
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
|
2017-05-10 15:14:17 +02:00 |
|
zmagod
|
10db322307
|
fixes input sanitize method [fixes SCI-1248]
|
2017-05-10 14:57:11 +02:00 |
|
zmagod
|
a4032f5cc6
|
first run
|
2017-05-10 13:53:32 +02:00 |
|
Oleksii Kriuchykhin
|
08e7f09d07
|
Add specific classes to task card for analytics [SCI-1243]
|
2017-05-10 10:33:34 +02:00 |
|
ajugo
|
e7c970f287
|
Wording in activity for completion of checklist item [SCI-274] (#601)
|
2017-05-10 10:13:59 +02:00 |
|
okriuchykhin
|
f46c0dfaef
|
Merge pull request #603 from okriuchykhin/ok_SCI_152_v2
Improve view of badges on experiment canvas [SCI-152]
|
2017-05-10 09:46:02 +02:00 |
|
Zmago Devetak
|
ff0f85fce8
|
Merge pull request #592 from ZmagoD/zd_SCI_160
removes TempFile after 7 days [fixes SCI-160]
|
2017-05-10 09:32:18 +02:00 |
|
Zmago Devetak
|
13570ba5cb
|
Merge pull request #602 from ZmagoD/zd_SCI_1247
fixes pdf export and image size [fixes SCI-1247]
|
2017-05-10 09:31:55 +02:00 |
|
Oleksii Kriuchykhin
|
52ad5ecdc2
|
Fix error messages display during file upload in steps and results [SCI-1235]
|
2017-05-09 17:13:47 +02:00 |
|
Zmago Devetak
|
cd503580b2
|
Merge pull request #599 from ZmagoD/zd_SCI_1241
fix samples bug [SCI-1241]
|
2017-05-09 15:55:43 +02:00 |
|
mlorb
|
078eb7789f
|
Merge pull request #605 from mlorb/ml_sci_fix_bug_with_avatar_in_system_log
Fix bug with avatar in system log
|
2017-05-09 14:57:07 +02:00 |
|
Mojca Lorber
|
7ca62a16bb
|
fix hound
|
2017-05-09 14:55:23 +02:00 |
|
Mojca Lorber
|
e1475fbfef
|
fix bug with avatar in system log
|
2017-05-09 14:40:02 +02:00 |
|
osboxes.org
|
cd6bae6e35
|
Added migration to remove updated_at from Activity [fixes SCI-1145]
|
2017-05-09 14:14:01 +02:00 |
|
Oleksii Kriuchykhin
|
620a989a2f
|
Improve view of badges on experiment canvas [SCI-152]
|
2017-05-09 14:07:23 +02:00 |
|
zmagod
|
04ee24d553
|
refactor
|
2017-05-09 14:05:21 +02:00 |
|
zmagod
|
2d69896897
|
fixes pdf export and image size [fixes SCI-1247]
|
2017-05-09 13:59:59 +02:00 |
|
zmagod
|
df13478186
|
fix samples bug [SCI-1241]
|
2017-05-09 11:25:00 +02:00 |
|
okriuchykhin
|
ccc640f2bc
|
Merge pull request #593 from okriuchykhin/ok_SCI_1158
Add advanced search options [SCI-1158]
|
2017-05-09 10:23:34 +02:00 |
|
okriuchykhin
|
bd0b930382
|
Merge pull request #598 from okriuchykhin/ok_SCI_152
Add counters for users and comments on canvas [SCI-152]
|
2017-05-09 10:22:53 +02:00 |
|
Oleksii Kriuchykhin
|
7a61f5813c
|
Add comments to the code [SCI-152]
|
2017-05-09 10:22:01 +02:00 |
|
gazvoda
|
596b296c84
|
Merge pull request #597 from gazvoda/lg-SCI-1104
Added additional explanation text [fixes SCI-1104]
|
2017-05-09 08:41:52 +01:00 |
|
Oleksii Kriuchykhin
|
bd5a48b9c8
|
Improve code style [SCI-1158]
|
2017-05-08 18:00:14 +02:00 |
|
Oleksii Kriuchykhin
|
344b9c290a
|
Add counters for users and comments on canvas [SCI-152]
|
2017-05-08 17:32:55 +02:00 |
|
gazvoda
|
e98d6a4da6
|
Merge pull request #596 from gazvoda/lg-SCI-723
Added team icon on the first step of tutorial after the Team icon tex…
|
2017-05-08 14:57:56 +01:00 |
|
osboxes.org
|
c43eacdb98
|
Added additional explanation text [fixes SCI-1104]
|
2017-05-08 15:35:53 +02:00 |
|
gazvoda
|
e462482566
|
Merge pull request #595 from gazvoda/lg-SCI-1239
Corrected number of expiration days in message [fixes SCI-1239]
|
2017-05-08 13:52:23 +01:00 |
|
osboxes.org
|
ea0934a8cb
|
Added team icon on the first step of tutorial after the Team icon text [solves SCI-723]
|
2017-05-08 14:43:35 +02:00 |
|
okriuchykhin
|
f292dab3b5
|
Merge pull request #594 from okriuchykhin/ok_SCI_1029_v2
Change color of loading animation in reports [SCI-1029]
|
2017-05-08 13:35:00 +02:00 |
|
osboxes.org
|
ddbd568166
|
Corrected number of expiration days in message [fixes SCI-1239]
|
2017-05-08 13:08:53 +02:00 |
|
Zmago Devetak
|
4b816f5322
|
Merge pull request #568 from ZmagoD/zd_SCI_1119
Add images to fields with rich text formatting
|
2017-05-08 13:06:58 +02:00 |
|
zmagod
|
e5e0a9f7f3
|
fix typo
|
2017-05-08 13:03:35 +02:00 |
|
zmagod
|
d6f303581f
|
refactor
|
2017-05-08 12:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
3f60439948
|
Change color of loading animation in reports [SCI-1029]
|
2017-05-08 11:02:51 +02:00 |
|
ajugo
|
2973ead765
|
Missing files, comments, checklist in steps [fixes SCI-1224] (#591)
* Missing files, comments, checklist in steps [fixes SCI-1224]
* Code fixes
|
2017-05-08 10:44:15 +02:00 |
|
Zmago Devetak
|
e47bf8f013
|
Merge pull request #582 from ZmagoD/zd_SCI_1051
fix reports pdf for user annotation [SCI-1051]
|
2017-05-08 10:24:40 +02:00 |
|
Oleksii Kriuchykhin
|
a3f847a232
|
Fix hound [SCI-1158]
|
2017-05-08 10:22:54 +02:00 |
|
Oleksii Kriuchykhin
|
0ee7e11620
|
Add advanced search options [SCI-1158]
|
2017-05-05 16:41:23 +02:00 |
|
mlorb
|
4c85ac7bf5
|
Merge pull request #588 from mlorb/ml_sci_191
Add information how many samples are selected [SCI-191]
|
2017-05-05 15:24:16 +02:00 |
|
okriuchykhin
|
05d2d4380e
|
Merge pull request #590 from okriuchykhin/ok_SCI_1229
Fix importing users from file [SCI-1229]
|
2017-05-05 15:10:53 +02:00 |
|