scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 07:26:20 +08:00
Code Issues Projects Releases Packages Wiki Activity
2004 commits 43 branches 185 tags 169 MiB
Commit graph

473 commits

Author SHA1 Message Date
Zmago Devetak
9911c0d148 Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 
replace all ActionController::Base.helpers.sanitize calls with custom…
 2017-05-11 14:30:26 +02:00
okriuchykhin
328c9292b1 Merge pull request #606 from okriuchykhin/ok_SCI_1235 
Fix error messages display during file upload in steps and results [SCI-1235]
 2017-05-11 13:00:36 +02:00
zmagod
80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +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
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
Oleksii Kriuchykhin
52ad5ecdc2 Fix error messages display during file upload in steps and results [SCI-1235] 2017-05-09 17:13:47 +02:00
zmagod
04ee24d553 refactor 2017-05-09 14:05:21 +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
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
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
d6f303581f refactor 2017-05-08 12:56:33 +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
Oleksii Kriuchykhin
0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
zmagod
f079a097c5 removes TempFile after 7 days [fixes SCI-160] 2017-05-05 14:54:22 +02:00
Zmago Devetak
f3415abe3e Merge pull request #587 from ZmagoD/zd_SCI_1233 
fixes bug with empty checklist item [fixes SCI-1233]
 2017-05-05 10:11:52 +02:00
zmagod
f784844472 fixes bug with empty checklist item [fixes SCI-1233] 2017-05-04 16:15:00 +02:00
zmagod
8d0c22327b adds asc order to checklists [fixes SCI-1228] 2017-05-04 15:17:34 +02:00
zmagod
acc5594f1b add popup for approval to complete the Task [fixes SCI-1200] 2017-05-04 12:41:22 +02:00
zmagod
5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
Zmago Devetak
cc6c2942c2 Merge pull request #574 from ZmagoD/zd_SCI_1194_v2 
prevent to get nil as a param in checklist_item_annotation method [fi…
 2017-05-03 10:56:21 +02:00
zmagod
d5abb52909 refactor 2017-05-03 10:55:11 +02:00
Oleksii Kriuchykhin
cf7d0ea248 Fix dowloand of export zip files from local storage [SCI-1128] 2017-04-26 13:23:30 +02:00
zmagod
0456393317 prevent to get nil as a param in checklist_item_annotation method [fixes SCI-1194] 2017-04-25 16:22:10 +02:00
zmagod
ed24448817 adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203] 2017-04-25 14:24:05 +02:00
zmagod
1fefeee3d1 adds team space related methods 2017-04-25 13:44:31 +02:00
zmagod
66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
mlorb
54f1c7b3e8 Merge pull request #566 from mlorb/ml_sci_365 
New experiment redirection [SCI-365]
 2017-04-24 08:55:55 +02:00
zmagod
550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
Mojca Lorber
cf00ecd62e new experiment redirection 2017-04-20 17:55:28 +02:00
Mojca Lorber
0bae4657f6 add experiment level to user smart annotation notification 2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715 add experiment to activities 2017-04-20 13:16:11 +02:00
zmagod
0757563d02 adds step tiny_mce asset relation 2017-04-19 17:22:57 +02:00
mz3944
a0b5a94d67 Merge pull request #564 from mz3944/mz-SCI-856 
Case insensitive email invitation
 2017-04-19 09:36:46 +02:00
zmagod
37be04c09c add tiny_mce controller 2017-04-19 09:13:16 +02:00
Matej Zrimšek
bafdbf4082 Email is now case insensitive when inviting users by it. [fixes SCI-856] 2017-04-18 18:01:29 +02:00
mz3944
0ebf294844 Merge pull request #562 from mz3944/mz-SCI-1187 
Added general locale for cases when a name is optional and is not spe…
 2017-04-18 15:26:35 +02:00
Matej Zrimšek
a889174938 Name of result tables should be nil, as it can't be specified. [fixes SCI-1187] 2017-04-18 15:08:13 +02:00
Zmago Devetak
e1a30cc17c Merge pull request #558 from ZmagoD/zd_SCI_1192 
fixes broken users search method for smart annotation [fixes SCI-1192]
 2017-04-14 15:38:33 +02:00
zmagod
8af3858209 fix hound 2017-04-14 11:13:58 +02:00
zmagod
9ee971c24b fixes broken users search method for smart annotation [fixes SCI-1192] 2017-04-13 16:14:12 +02:00
Mojca Lorber
27c661d7c4 fix bug with changing user own role from admin to normal user 2017-04-12 16:56:10 +02:00
zmagod
90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod
e77df92017 fix samples_controller 2017-04-06 15:26:24 +02:00
zmagod
9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +02:00
zmagod
439cd0cd89 add notification to experiments 2017-04-06 14:55:18 +02:00
zmagod
046b608018 add notification for my_module/project comments 2017-04-06 14:07:22 +02:00