Matej Zrimšek
f78c80b148
Added possibility to add uncompleted steps to report. [closes SCI-414]
2017-05-17 13:25:21 +02:00
Oleksii Kriuchykhin
f28df506f9
Fix bug in counting search results for assets [SCI-1284]
2017-05-17 09:08:40 +02:00
Matej Zrimšek
ba693c65a8
Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Zmago Devetak
39203a16f4
Merge pull request #622 from ZmagoD/zd_SCI_1261
...
fixes remove user action on project [fixes SCI-1261]
2017-05-15 15:28:39 +02:00
Zmago Devetak
a151bbdd7d
Merge pull request #623 from ZmagoD/zd_SCI_974
...
adds persistence to experiments order in project overview [fixes SCI-…
2017-05-15 15:28:18 +02:00
okriuchykhin
16325db1c6
Merge pull request #621 from okriuchykhin/ok_SCI_1263
...
Fix sorting in reports [SCI-1263]
2017-05-15 09:57:35 +02:00
zmagod
c35e2a4860
adds persistence to experiments order in project overview [fixes SCI-974]
2017-05-15 09:54:37 +02:00
okriuchykhin
8e523782d9
Merge pull request #619 from okriuchykhin/ok_SCI_617
...
Fixes error when cloning experiments with long names [SCI-617]
2017-05-12 16:53:38 +02:00
okriuchykhin
a8bbc3c3ba
Merge pull request #615 from okriuchykhin/ok_SCI_1008
...
Fix task and step ordering in reports [SCI-1008]
2017-05-12 16:44:57 +02:00
zmagod
b6367981c7
fixes remove user action on project [fixes SCI-1261]
2017-05-12 16:18:53 +02:00
Oleksii Kriuchykhin
5a2d618b1d
Fix sorting in reports [SCI-1263]
2017-05-12 16:04:19 +02:00
Oleksii Kriuchykhin
79efb34191
Fixes error when clonning experiments with long names [SCI-617]
2017-05-12 11:07:11 +02:00
Zmago Devetak
0dc4addd6c
fix typo
2017-05-12 10:10:50 +02:00
Oleksii Kriuchykhin
bb8c7c342c
Add additional info to samples info modal [SCI-960]
2017-05-11 22:20:06 +02:00
Oleksii Kriuchykhin
0ef9c7eff6
Fix task ordering in reports [SCI-1008]
2017-05-11 15:30:19 +02:00
okriuchykhin
ab0d882be1
Merge pull request #614 from okriuchykhin/ok_SCI_1254
...
Fix step actions in reports [SCI-1254]
2017-05-11 14:44:36 +02:00
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
Oleksii Kriuchykhin
fe134419a3
Fix step actions in reports [SCI-1254]
2017-05-11 13:51:43 +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
zmagod
b398bb7516
add step annotations methods in steps_action concerns
2017-04-06 13:06:20 +02:00
zmagod
f16607579f
refactor steps annotation
2017-04-06 13:03:13 +02:00
zmagod
bb437bd8c5
adds notification to results annotation
2017-04-06 09:33:49 +02:00
zmagod
d331911ffe
completed step annotations
2017-04-06 08:42:16 +02:00
zmagod
99c116f257
first run
2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin
42ccefe2ce
Remove logs table and old unused logging code [SCI-1127]
2017-03-30 11:47:57 +02:00
Zmago Devetak
2b35b34eb8
Merge pull request #529 from ZmagoD/zd_SCI_1135
...
fixes alert messages in samples [fixes SCI-1135]
2017-03-29 14:57:11 +02:00
zmagod
0096f9dc14
refactor
2017-03-29 09:32:23 +02:00
zmagod
9ce95470b3
fixes alert messages in samples [fixes SCI-1135]
2017-03-28 15:14:05 +02:00
zmagod
0996c14449
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
2017-03-27 10:41:58 +02:00
zmagod
2235fd3fb7
adds view if download expires
2017-03-27 10:38:28 +02:00
mlorb
3beb179f87
Merge pull request #514 from biosistemika/ml_sci_1089
...
Add error messages to sample group/type edit/delete actions [SCI-1089]
2017-03-27 09:57:32 +02:00
zmagod
4635a3320d
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-24 16:09:28 +01:00
zmagod
023b3213e8
fixes email link [fixes SCI-765]
2017-03-24 12:10:07 +01:00
zmagod
94732c6d18
adds delayed zip generator
2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin
2edebb282a
Add team_id field to assets and tables [SCI-1046]
2017-03-23 10:36:55 +01:00
zmagod
4385c68f5f
adds zip_export utility first run
2017-03-21 16:15:11 +01:00
zmagod
d8955d1a78
fixes breadcrumbs in office file [fixes SCI-1111]
2017-03-20 13:48:45 +01:00
Mojca Lorber
83fa8570d7
refactoring
2017-03-17 17:52:15 +01:00
zmagod
5cc6cd094e
refactor
2017-03-17 16:47:58 +01:00
zmagod
307fef17d8
fixes owner id if empty
2017-03-15 18:01:15 +01:00
Zmago Devetak
1afb4c9a42
Merge pull request #515 from ZmagoD/file_owner_id_bug
...
fixes bug with wopi contorller
2017-03-15 17:40:07 +01:00
zmagod
c5156f5ca3
fixes bug with wopi contorller
2017-03-15 17:33:36 +01:00
Mojca Lorber
4792bd87b9
fix error message when editing custom column on locked task
2017-03-15 14:09:44 +01:00
zmagod
856a4611c6
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-14 15:58:08 +01:00
zmagod
15b1712a3d
fixes bug with organization
2017-03-14 13:29:59 +01:00
zmagod
df2abe5d17
fixed typo
2017-03-13 13:51:31 +01:00
zmagod
7b16e5643e
fix assets preprocesor for wopi files
2017-03-13 13:20:49 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
okriuchykhin
2a33391f4b
Merge pull request #511 from okriuchykhin/ok_SCI_1090
...
Refactoring of the comments using STI [SCI-1090]
2017-03-10 10:50:43 +01:00
Oleksii Kriuchykhin
456934464a
Remove unneeded validation calls [SCI-1090]
2017-03-09 17:20:27 +01:00
zmagod
1d42d46c02
fixes bug with step comments
2017-03-09 16:02:52 +01:00
zmagod
3057965940
fix bug with filenames
2017-03-09 11:48:50 +01:00
zmagod
9939d8df06
refactor
2017-03-09 10:51:54 +01:00
zmagod
49f91184da
fixes locals
2017-03-09 09:55:15 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Luka Murn
800df7a26b
Also make button icons work when rendering them via JS
...
Closes SCI-1073.
2017-03-08 13:55:10 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Oleksii Kriuchykhin
4868ec5331
Remove task completion duplicated code [SCI-1075]
2017-02-28 17:07:59 +01:00
okriuchykhin
8e18ff44a6
Merge pull request #479 from okriuchykhin/ok_SCI_999
...
Add task complete/uncomplete functionality [SCI-999]
2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin
4fb5fa79af
Move task completion activity and notification creation to separate methods [SCI-999]
2017-02-16 13:36:05 +01:00
Oleksii Kriuchykhin
218e96b1f0
Code style fixes [SCI-999]
2017-02-16 11:45:07 +01:00
zmagod
836baa7412
fixes bug with user teams table [fixes SCI-987]
2017-02-15 10:06:21 +01:00
Luka Murn
d097f0dd15
Merge pull request #477 from Ducz0r/lm-sci-928
...
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
2017-02-13 16:42:57 +01:00
Luka Murn
1b6f50647c
Please Hound
2017-02-13 16:40:27 +01:00
Oleksii Kriuchykhin
f97c20e9b5
Fix hound warnings [SCI-999]
2017-02-13 15:42:28 +01:00
Oleksii Kriuchykhin
78d5cbb223
Add links to task completion notification [SCI-999]
2017-02-13 14:51:21 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Luka Murn
3eb4faa44b
Fix task restore action
...
Closes SCI-991.
2017-02-10 14:08:56 +01:00
Luka Murn
280b7a0e75
Minor fix
2017-02-09 15:10:45 +01:00
Luka Murn
2a9f975c13
Some minor fixes
2017-02-09 14:58:11 +01:00
Luka Murn
f7bd62547e
Refactor teams settings into its own controllers
2017-02-09 14:37:59 +01:00
Luka Murn
5cb3eb5e09
Refactor preferences -> move them to subcontroller, subroute
2017-02-09 11:07:16 +01:00
okriuchykhin
c2a69982aa
Merge pull request #471 from okriuchykhin/ok_SCI_936
...
Adds datatable to all teams page [SCI-936]
2017-02-07 10:33:33 +01:00
Oleksii Kriuchykhin
cc6b518c7f
Check that user is a member of a team when switching to it [SCI-984]
2017-02-03 16:10:37 +01:00
Oleksii Kriuchykhin
db90c5d63b
Add datatable to all teams page [SCI-936]
2017-02-02 09:53:59 +01:00
Oleksii Kriuchykhin
031741d122
Disable protocols link if user has no teams [SCI-934]
2017-02-01 14:26:51 +01:00
Oleksii Kriuchykhin
c119b7c014
Make sciNote work for users without any teams [SCI_934]
2017-02-01 14:16:26 +01:00
Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +01:00
Oleksii Kriuchykhin
d1e69438de
Add config option to enable/disable users registration [SCI-935]
2017-01-30 15:04:02 +01:00
zmagod
e59b2e039a
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939
2017-01-27 11:15:31 +01:00
Mojca Lorber
5bed5f0f4a
fix bug with avatar in smart annotations
2017-01-26 17:15:00 +01:00
Oleksii Kriuchykhin
310d8c1920
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
2017-01-25 17:18:19 +01:00
zmagod
c2c5616078
rename Organization to Team in controllers
2017-01-24 17:06:51 +01:00
Oleksii Kriuchykhin
fe6d6842c2
Add sanitization of group/type to sample edit [SCI-902]
2017-01-24 16:58:03 +01:00
zmagod
21c2f82582
rename controllers where org/organization
2017-01-24 16:57:14 +01:00
Oleksii Kriuchykhin
a04f05eeb3
Add sanitization to sample groups/types [SCI-902]
2017-01-24 14:39:54 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
Oleksii Kriuchykhin
d555ba7905
Add export to protocol management page and code style improvements [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
14a6705b55
Implemented protocol export through Zip::OutputStream [SCI-742]
2017-01-23 17:43:48 +01:00
Oleksii Kriuchykhin
1abd7fc574
Added xml schemas and zip gem [SCI-742]
2017-01-23 17:34:02 +01:00
Mojca Lorber
44de927cf4
display smart annotations in reports - without rich text fields
2017-01-19 14:22:54 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
Luka Murn
a0e9e5afa8
Merge pull request #402 from mz3944/mz-sci-848-v2
...
Unable to delete samples [SCI-848]
2017-01-16 10:47:13 +01:00
zmagod
1b2fa78e42
adds user preview to user smart annotation [fixes SCI-832]
2017-01-13 11:34:10 +01:00
Oleksii Kriuchykhin
f567d0307e
Fix includes [SCI-102]
2017-01-12 17:02:01 +01:00
Luka Murn
8b01f912a0
Fix new year problems with activities
...
Closes SCI-876.
2017-01-12 14:47:15 +01:00
Matej Zrimšek
93a8e0bdae
Fixes sample deletion when coming from experiment page and having modules attached. [SCI-848]
2017-01-12 14:08:29 +01:00
Oleksii Kriuchykhin
d05c16b0ba
Added auto_link wrapper with custom sanitization [SCI-102]
2017-01-11 17:02:17 +01:00
Oleksii Kriuchykhin
0546716a0b
Improve user input sanitization, fix bugs [SCI-102]
2017-01-11 15:50:11 +01:00
zmagod
3a1ec0eb5e
refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824]
2017-01-11 14:56:47 +01:00
zmagod
fc76a4ae6d
Merge branch 'smart-annotations' of https://github.com/biosistemika/scinote-web into zd_SCI_834
2017-01-10 14:22:04 +01:00
zmagod
6efcf49927
working version of dropdown filter
2017-01-10 14:14:21 +01:00
zmagod
53d20df449
added xregexp
2017-01-10 14:14:21 +01:00
zmagod
94262b56ef
prepare data for atwho
2017-01-10 14:14:21 +01:00
Luka Murn
5873eea994
We serve to please the Hound
2017-01-10 10:42:52 +01:00
mz3944
ef431da2db
Merge pull request #389 from mz3944/mz-sci-848
...
Unable to delete samples [SCI-848]
2017-01-09 11:57:48 +01:00
okriuchykhin
3c47d17019
Merge pull request #386 from okriuchykhin/ok_SCI_815
...
Improve error message when importing CSV files with incorrect character encoding [SCI-815]
2017-01-09 11:54:28 +01:00
zmagod
226d5d8247
added blank string to wopi-lock header param
2017-01-09 11:51:18 +01:00
Oleksii Kriuchykhin
89710d8782
Enable image preview for newly uploaded images [SCI-694]
2017-01-06 16:41:24 +01:00
Oleksii Kriuchykhin
aa2b573278
Enable image preview while editing steps and code style improvements [SCI-694]
2017-01-06 15:58:23 +01:00
Matej Zrimšek
ec7a1cb4c0
Replaced remaining related hard-coded names with constants and generalized delete samples name fetching. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Matej Zrimšek
5d104981fd
Fixed sample deletion on experiments level. Minor refactoring. [SCI-848]
2017-01-06 14:23:20 +01:00
Luka Murn
3cdd375a2d
Merge pull request #388 from biosistemika/hotfix-1.6.1
...
Hotfix 1.6.1
2017-01-06 11:23:16 +01:00
Oleksii Kriuchykhin
cba064dfcc
Improve error message whan importing CSV files with incorrect character encoding [SCI-815]
2017-01-05 17:00:21 +01:00
Luka Murn
ef688feb4e
Hotfix 1.6.1
...
Set confirmed_at to created_at when using no
email confirmations and users sign up by themselves.
2017-01-05 15:27:18 +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
Luka Murn
a78bb79618
Temp commit
2017-01-05 12:07:17 +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
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
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
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
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
Oleksii Kriuchykhin
d798f1b120
Fix XSS vulnerability in protocol keywords [SCI-632]
2016-12-29 15:15:29 +01:00
Luka Murn
b931b20f02
Fix 2 bugs with comments editing
...
Closes SCI-820.
2016-12-23 20:41:23 +01:00
Oleksii Kriuchykhin
4d3e002c81
Add sorting to Project's experiments overview [SCI-361]
2016-12-23 15:40:01 +01:00
Mojca Lorber
40e3240a99
add content to preview modal
2016-12-22 11:43:11 +01:00
zmagod
e554fdf805
code refactor
2016-12-21 16:52:15 +01:00
Oleksii Kriuchykhin
53ea09c3de
Fix issue with long samples column names in import modal [SCI-817]
2016-12-21 14:34:53 +01:00
zmagod
e2723a288c
fixes bug with samples sorting [fixes SCI-812]
2016-12-21 14:32:28 +01:00
Oleksii Kriuchykhin
00ea3a027c
Fix generation of preview url for new steps and results [SCI-694]
2016-12-20 16:10:53 +01:00
Oleksii Kriuchykhin
cbef971d85
Fix timeouts when fetching images from S3 [SCI-694]
2016-12-20 15:36:07 +01:00
Oleksii Kriuchykhin
d2b76d8385
Improved image preview modal [SCI-694]
2016-12-19 17:36:18 +01:00
Zmago Devetak
c8631077df
Merge pull request #361 from biosistemika/improved-sample-table
...
Improved sample table
2016-12-16 15:37:54 +01:00
zmagod
6d2fb3b02c
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_SCI_790
2016-12-14 17:05:00 +01:00
okriuchykhin
c4ff12be51
Merge pull request #349 from okriuchykhin/ok_SCI_783
...
Fix columns ordering when deleting custom fields [SCI-783]
2016-12-14 16:19:20 +01:00
Oleksii Kriuchykhin
de8eed0a19
Fix hound warning [SCI-783]
2016-12-14 15:27:24 +01:00
Oleksii Kriuchykhin
fa1cf1f04d
Better handling of columns deleting with fixing columns ordering [SCI-783]
2016-12-14 15:23:00 +01:00
zmagod
3c1a275510
fixes invited user samples table [fixes SCI-790]
2016-12-13 10:56:13 +01:00
Mojca Lorber
2cfcba0ceb
add protocol preview modal
2016-12-13 10:39:18 +01:00
zmagod
4b0e2baa3f
fixes breadcrumbs in secondary nav
2016-12-12 16:03:14 +01:00
zmagod
8dd8a7e7cd
Merge branch 'improved-sample-table' of https://github.com/biosistemika/scinote-web into zd_improved_samples_table_SCI_774_775_778_777
2016-12-12 15:52:25 +01:00
zmagod
8bb452e4f7
trim long names [fixes SCI-774] adds secondary navigation and sidebar [fixes SCI-775]
2016-12-12 10:30:03 +01:00
zmagod
de3099e4d1
removes asset_helper, fixes loading of processed thumbnails in results and steps and when loading protocols from repository
2016-12-09 13:59:49 +01:00
Luka Murn
1a8b141b95
Add delete custom field functionality
2016-12-09 13:49:19 +01:00
Luka Murn
754c90b612
Edit functionality now works
2016-12-09 13:18:59 +01:00
Mojca Lorber
0e3526c9ad
Merge branch 'mlorb-ml-sci-696' into improved-sample-table
...
Conflicts:
app/assets/javascripts/samples/sample_datatable.js
2016-12-08 15:44:50 +01:00
zmagod
40fdfef67f
setup delayed_paperclip gem
2016-12-08 15:24:14 +01:00
zmagod
ac52e643be
cleanup direct upload
2016-12-08 11:26:13 +01:00
okriuchykhin
cb2abfa7a9
Merge pull request #325 from okriuchykhin/ok_SCI_712
...
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 15:00:01 +01:00
Oleksii Kriuchykhin
f6dd64772a
Add columns to samples table without page reload [SCI-712]
2016-12-06 13:22:26 +01:00
Oleksii Kriuchykhin
22dabd2177
Added form for adding new columns to samples table into dropdown [SCI-712]
2016-12-06 13:17:05 +01:00
Mojca Lorber
849f78b4df
implement reordering of columns in the samples table and change from local to database storage
2016-12-05 11:34:36 +01:00
zmagod
7725374c42
refactor sample types/groups [fixes SCI-700]
2016-12-02 09:58:35 +01:00
zmagod
83aae59eed
adds sample groups index page
2016-12-02 09:33:09 +01:00
Luka Murn
372b455d7d
Merge pull request #332 from Ducz0r/lm-sci-750-751
...
Fix inviting users not working
2016-12-01 15:52:40 +01:00
Luka Murn
6a770f6a7e
Fix inviting users not working
...
Closes SCI-750, SCI-751.
Probably reopens parts of SCI-746.
2016-12-01 15:46:37 +01:00
Matej Zrimšek
3bdaa4bcef
Some token authentication refactoring and error handilng fixes. [closes SCI-689]
2016-12-01 15:38:56 +01:00
Matej Zrimšek
46465060d0
Added automatic sign in with token authentication, needed when signing in from different webpage. [closes SCI-689]
2016-11-30 16:56:56 +01:00
Nejc Bernot
cb03ed8384
Users can now have multiple tokens
...
A new token is generated whenever an edit or view file is called. Tokens have a TTL of one day.
Also enabled the toggling of both wopi and wopi test mode, using environmental variables.
2016-11-30 16:48:42 +01:00
Luka Murn
76ec77fce4
Merge pull request #329 from biosistemika/simplify-signup
...
Merge simplify-signup into master
2016-11-30 09:41:20 +01:00
zmagod
4e4a48620c
adds validation to input fields
2016-11-29 18:08:29 +01:00
zmagod
12848f15fa
adds sample_type index view with all crud actions
2016-11-29 17:15:54 +01:00
Luka Murn
b5d0a39827
Fix some recaptcha form submit errors for signup pages
...
Closes SCI-746.
2016-11-29 15:53:58 +01:00
zmagod
5c0b2d7b24
init sample_types page
2016-11-29 08:57:12 +01:00
okriuchykhin
f9c8223fe5
Merge pull request #321 from okriuchykhin/ok_SCI_736
...
Improve regexp for image whitelisting [SCI-736]
2016-11-28 15:46:54 +01:00
Oleksii Kriuchykhin
cc0aab2e59
Improve regexp for image whitelisting [SCI-736]
2016-11-28 10:08:54 +01:00
okriuchykhin
31f6379866
Merge pull request #318 from okriuchykhin/ok_SCI_736
...
Add whitelisting of supported image types [SCI-736]
2016-11-28 09:32:49 +01:00
okriuchykhin
5981d1a48e
Merge pull request #316 from okriuchykhin/ok_SCI_738
...
Add full name field to accept invitation form [SCI-738]
2016-11-25 16:15:23 +01:00
Oleksii Kriuchykhin
74f6455a8f
Add whitelisting of supported image types [SCI-736]
2016-11-25 16:12:43 +01:00
Oleksii Kriuchykhin
3fdb20b92c
Add full name field to accept invitation form [SCI-738]
2016-11-25 11:15:10 +01:00
Luka Murn
87d3280847
Refactor registrations_controller code slightly
2016-11-25 09:56:07 +01:00
Oleksii Kriuchykhin
698e07a3b5
Enable reCaptcha and auto log in on confirm invitation form [SCI-706]
2016-11-24 14:11:02 +01:00
Luka Murn
198febfd94
Fix user projects not working
2016-11-23 13:19:10 +01:00
Luka Murn
fba646bfba
Fix Hound errors
2016-11-22 15:19:12 +01:00
Luka Murn
7cbe44d1f2
Refactor user projects & user my modules code
2016-11-22 15:16:26 +01:00
Luka Murn
201b1a48d5
Refactor user my modules code
2016-11-22 15:07:18 +01:00
Luka Murn
e0607f7891
Refactor step comments code
2016-11-22 15:01:48 +01:00
Luka Murn
0c96036de8
Refactor some sample types code
2016-11-22 14:59:57 +01:00
Mojca Lorber
60f23b109b
integrate reCaptcha into sciNote
2016-11-22 14:57:41 +01:00
Luka Murn
8ff5285179
Refactor some sample groups code
2016-11-22 14:57:01 +01:00
Luka Murn
f5e286b1f6
Remove unused code for some more comments
2016-11-22 14:52:43 +01:00
Luka Murn
1f7a8712fb
Update task comments & task tags controllers & localized Strings
...
(Remove a lot of unused code)
2016-11-22 14:26:35 +01:00
Luka Murn
59eb1c1d18
Remove unused new, edit user_projects views
2016-11-19 17:01:10 +01:00
Luka Murn
911b7ba72f
Remove unused new user_my_module view
2016-11-19 16:59:24 +01:00
Luka Murn
6999105e51
Remove tags
2016-11-19 16:57:08 +01:00
Luka Murn
008b31df0c
Finish removing new comment forms
2016-11-19 16:54:55 +01:00
Luka Murn
595b213b1a
Changes up to samples in views folder
2016-11-19 16:51:40 +01:00
Luka Murn
3be30c0e7a
Re-introduce fix for SCI-650 that was lost during merge
...
Closes SCI-650.
2016-11-18 10:57:03 +01:00
Luka Murn
26d04b1f3c
Merge branch 'rich-text-formatting' into 'master'
...
Conflicts:
Gemfile.lock
app/assets/stylesheets/themes/scinote.scss
2016-11-17 16:39:33 +01:00
Luka Murn
9d3685f872
Merge branch 'gamification' into 'master'
...
Conflicts:
app/controllers/users/invitations_controller.rb
app/controllers/users/settings_controller.rb
2016-11-17 16:30:18 +01:00
Luka Murn
04749c3b2c
Allow inviting of existing, unconfirmed users
...
Closes SCI-676.
2016-11-15 15:04:31 +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
Luka Murn
564274a588
Set invited_by field to invited users
2016-11-10 14:45:24 +01:00
Mojca Lorber
d2ae11f1af
fix hound
2016-11-10 14:16:54 +01:00
Mojca Lorber
3e162b3a93
remove redcarpet gem - markdown
2016-11-10 14:11:32 +01:00
mlorb
0793fb9f11
Merge pull request #260 from mlorb/ml_sci_614
...
Add notification for removing user from team and removing user from project [SCI-614]
2016-11-08 11:30:49 +01:00
Mojca Lorber
27c83992b4
refactoring notification method
2016-11-07 15:31:06 +01:00
Luka Murn
ce7733e9e9
Also add notification when UserOrganization is created
2016-11-07 09:47:30 +01:00
Luka Murn
0ab62576a2
Add new modal to organization page, remove old modal code
2016-11-07 09:43:10 +01:00
Luka Murn
6fe0d6b3df
A working invite modal!
2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611
Add first version of invite users modal
2016-11-07 09:43:09 +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
Oleksii Kriuchykhin
3d25da5db7
Fixed bug with protocol loading from file [SCI-605]
2016-11-03 14:15:22 +01:00
Mojca Lorber
749b108928
fix hound
2016-11-02 13:32:15 +01:00
Mojca Lorber
a2213e23b3
add notification for removing user from team and removing user from project
2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin
e8d20dfc01
Added additional activities [SCI-605]
2016-11-02 10:43:36 +01:00
Luka Murn
eec6b1403d
Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org
...
Add check in application controller to always set current org if nil
2016-10-25 11:53:05 +02:00
Zmago Devetak
266d1415d0
Merge pull request #246 from ZmagoD/zd_SCI_599
...
fixes error when removing user from team [SCI-599]
2016-10-25 11:52:44 +02:00
Luka Murn
7885fd0f39
Add check in application controller to always set current org if nil
2016-10-25 11:39:57 +02:00
zmagod
6a328969f0
reset current_user if the user leaves the team [fixes SCI-599]
2016-10-25 09:53:02 +02:00
zmagod
24b81c96f6
sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608]
2016-10-24 21:20:41 +02:00
zmagod
e02132578a
first run
2016-10-24 20:07:20 +02:00
Zmago Devetak
4f5b7ad8ad
Merge pull request #228 from ZmagoD/zd_SCI_585
...
Removes archived projects from index page [fixes SCI-585]
2016-10-21 11:33:01 +02:00
Oleksii Kriuchykhin
5be7904f5a
Fix hound warnings [SCI-557]
2016-10-21 09:37:24 +02:00
zmagod
db806f3c10
hide private projects
2016-10-21 09:06:19 +02:00
Oleksii Kriuchykhin
0c1ff06f21
Fixes issue with new comments and date separator SCI-557
2016-10-20 22:33:15 +02:00
zmagod
4c086a6fc1
removes archived projects from index page [fixes SCI-585]
2016-10-20 13:13:44 +02:00
zmagod
557957c857
fixed issue with mozilla browsers
2016-10-17 15:21:19 +02:00
zmagod
1614cbc2b2
fixes repeat tutorial button and localization typos
2016-10-17 15:16:22 +02:00
zmagod
931cba2666
fixes hound [fixes SCI-512]
2016-10-17 15:10:26 +02:00
zmagod
fa36488397
fixed new project form
2016-10-17 15:10:26 +02:00
zmagod
8f24d0d80c
fixed new user registration
2016-10-17 15:10:26 +02:00
zmagod
3117a464f0
fixed controllers
2016-10-17 15:10:26 +02:00
zmagod
bb9c03df24
fixes controllers
2016-10-17 15:10:26 +02:00
zmagod
d7f514db09
fixes search
2016-10-17 15:10:26 +02:00
zmagod
efe031d766
setup current_organization in all controllers
2016-10-17 15:10:26 +02:00
zmagod
d86a4dd311
setup global team switch view and controller action
2016-10-17 15:10:26 +02:00
Matej Zrimšek
a6a2a237aa
Removed unneeded ERB tags, which caused error. Minor refactoring.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
ece89da391
Removed ruby constants duplicates in JS, because of caching problems.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
5966911b92
Fixed Hound alerts.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416
Ruby constants are now automatically available in JS. Refactoring was needed.
2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558
Added remaining constants.
2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +02:00
Luka Murn
bdaeb4db13
Add notification mailer preview
2016-10-13 08:56:04 +02:00
mlorb
78f7879c04
Merge pull request #216 from mlorb/ml_sci_555
...
Adding update notifications in settings [SCI-555]
2016-10-13 08:53:55 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Luka Murn
cccabcdd7b
Remove invitation_to_organization email
...
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
2016-10-12 10:54:36 +02:00
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
Jure Grabnar
1f67aec258
Prevent destroying protocols when file is edited
...
SCI-552 #close
2016-10-06 16:13:42 +02:00
Jure Grabnar
b52e596209
Update protocol timestamp on put_file
...
SCI-551 #close
2016-10-06 14:37:42 +02:00
Oleksii Kriuchykhin
c783e9a03d
Code fix after rebase with latest master [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
868ffd03d6
JS code improvement [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
246dae4f46
Code style improvements according to hound [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8907e54b49
Global notifications index page added [SCI-442]
2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8b5b0723d1
Initial code commit
2016-10-05 15:51:11 +02:00
zmagod
9c7a690944
fixed type, fixed settings controller, fixes setting view on mobile devices
2016-10-05 14:33:22 +02:00
Jure Grabnar
85d2370d28
Change some values to string in CheckFileInfo
2016-10-04 18:19:36 +02:00
Jure Grabnar
3e74c96085
Add wd* params to iframe action url
2016-10-04 18:00:08 +02:00
zmagod
a68e7abc57
first run notification settings
2016-10-04 15:52:48 +02:00
Luka Murn
61cb9651c7
Merge pull request #188 from biosistemika/global-notifications
...
Global notifications
2016-10-04 08:30:50 +02:00
zmagod
c9bbab1004
added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users
2016-10-03 20:31:00 +02:00
Jure Grabnar
72c5824e67
Remove navbar for viewing WOPI files
2016-10-03 20:02:13 +02:00
Jure Grabnar
ec82f64df2
Add WOPI breadcrumbs
2016-10-03 19:45:39 +02:00
Jure Grabnar
1949b1fe88
Add CloseUrl to WOPI
2016-10-03 18:25:01 +02:00
Jure Grabnar
03567d6208
Prevent archive of locked result asset
2016-10-03 17:07:57 +02:00
mlorb
153b692c0c
Merge pull request #181 from mlorb/ml_sci_321
...
Displaying more information for individual samples in Sample table [SCI-321]
2016-10-03 16:37:35 +02:00
zmagod
0d23f05698
Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440
2016-10-03 16:14:22 +02:00
Jure Grabnar
f727289935
Add lock check for editing result
2016-10-03 13:43:35 +02:00
zmagod
947096862d
fixed hound
2016-10-03 11:40:59 +02:00
zmagod
ea17182372
generate notifications [fixes SCI-440]
2016-10-03 11:37:29 +02:00
zmagod
2ee02ec472
mark all seen notifications
2016-10-03 08:20:23 +02:00
Jure Grabnar
1e14955ade
Prevent deleting asset on step update
2016-10-01 18:47:05 +02:00
Jure Grabnar
d9fa882d6a
Add check for locked files on step delete
2016-10-01 14:51:55 +02:00
Jure Grabnar
a2d6d9a29a
Add WOPI controlls to result
2016-10-01 11:23:32 +02:00
Jure Grabnar
ff47f29dc2
Add wopi file activity
...
SCI-393 #close
2016-09-29 16:16:42 +02:00
zmagod
e1a1b93d44
fixed migrations
2016-09-29 14:49:58 +02:00
Jure Grabnar
ed8df3cc62
Add favicon url to iframe
2016-09-29 12:19:29 +02:00
Jure Grabnar
bc22697ebe
Take/release space in putfile
2016-09-28 18:02:47 +02:00
Jure Grabnar
5e5f4c5ed4
Add text extraction on unlock
2016-09-28 17:36:53 +02:00
Jure Grabnar
02ddd64aaa
Set last_modified_by on put_file
2016-09-28 17:00:19 +02:00
zmagod
cab1e9b521
start implement toolbar view
2016-09-28 16:03:52 +02:00
Jure Grabnar
e96e8486ea
Add check file permissions to assets controller
...
SCI-502 #close
2016-09-28 09:33:44 +02:00
Jure Grabnar
25c9ec67b3
Check permissions in wopi_controller
2016-09-28 09:33:44 +02:00
Jure Grabnar
5aea0fbb19
Refactor the rest of WOPI logic from Nejc
2016-09-28 09:33:44 +02:00
Jure Grabnar
c1ae4360a3
Refactor WopiController
2016-09-28 09:33:44 +02:00
Jure Grabnar
0c9292e4fc
Catch GET_SHARE_URL post file action
2016-09-28 09:33:44 +02:00
Jure Grabnar
3600fbfe64
Fix UnlockUnlockedFile action
...
The time was nigh!
2016-09-28 09:33:44 +02:00
Jure Grabnar
674326e761
Add timestamp WOPI checking
...
Change status error code to 500.
2016-09-28 09:33:44 +02:00
Jure Grabnar
b51f2a3027
Add basic WOPI proof checking
...
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec
First working version of office integration
...
Only works on scinote-preview
2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5
Initial commit of WOPI integration
2016-09-28 09:33:44 +02:00
zmagod
dad0d3868b
fixing hound
2016-09-27 17:31:37 +02:00
zmagod
2235778110
fixed project and task comments + fixed date issue
2016-09-27 16:19:31 +02:00
Mojca Lorber
c2b742374f
adding popup sample info
2016-09-23 17:45:02 +02:00
Matej Zrimšek
13e886f7a9
Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408]
2016-09-22 17:35:23 +02:00
Matej Zrimšek
234918a76d
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
2016-09-21 19:48:18 +02:00
Zmago Devetak
5fedcb4be2
Merge pull request #160 from ZmagoD/zd_SCI_464
...
Fixes restore experiment error [fixes SCI-464]
2016-09-21 19:24:33 +02:00
zmagod
06b1992e94
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
2016-09-21 19:20:55 +02:00
zmagod
8a8bf10f08
clean up flash label
2016-09-21 19:09:57 +02:00
zmagod
bf8e2a208f
fixes restore experiment error [fixes SCI-464]
2016-09-21 08:34:32 +02:00
zmagod
42bbc47f5f
first working version
2016-09-20 17:06:07 +02:00
zmagod
da86208441
styled step comments
2016-09-20 14:13:40 +02:00
zmagod
0ca65aeca5
fixed step comment sorting
2016-09-20 13:31:50 +02:00
Matej Zrimšek
c2f0106993
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
2016-09-16 15:56:44 +02:00
Zmago Devetak
431227c0a4
Merge pull request #147 from maslick/resultCommentsError1000Chars
...
Fixed: Comments in results have no error message if the text exceeds 1000 characters
2016-09-16 09:38:38 +02:00
Matej Zrimšek
76ff34a8a9
URL presigning is now used only when using S3 file uploading (caused error for local uploading) [fixes SCI-447], along with some refactoring.
2016-09-13 18:56:47 +02:00
zmagod
7c363d5ade
fixed security issue
2016-09-13 13:57:31 +02:00
zmagod
3d5a42cc27
refactor results controller
2016-09-13 13:26:04 +02:00
zmagod
222ddf7438
fixed houd error
2016-09-13 13:26:04 +02:00
zmagod
691ae94d2c
enabled to delete results in task archive [fixes SCI-370]
2016-09-13 13:26:04 +02:00
Pavel Maslov
15ea8fc0dc
Bug fixed: comments in results have no error message if the text exceeds 1000 characters.
2016-09-13 12:01:56 +02:00
Zmago Devetak
1368716aa0
Merge pull request #130 from ZmagoD/zd_SCI_348
...
project overview - updating (or creating new) experiment details
2016-09-08 12:49:35 +02:00
Matej Zrimšek
b0ad6d0753
Fixed result file deletion and result name updating [fixes SCI-409]. Fixed step name and checklists names and its items names checking, and items removing [fixes SCI-407].
2016-09-06 23:26:00 +02:00
zmagod
b44a284b54
sets edit experiment validation
2016-09-06 11:46:28 +02:00
zmagod
9d469f9092
sets front end validation for new experiment modal [fixes SCI-348]
2016-09-06 11:44:03 +02:00
Zmago Devetak
9440371f3f
Merge pull request #131 from ZmagoD/zd_SCI_400
...
Sets front end validation for experiment move action [fixes SCI-400]
2016-09-06 11:39:38 +02:00
zmagod
c526cab498
removed commented code
2016-09-06 11:38:02 +02:00
zmagod
667fb67052
sets front end validation for experiment move action [fixes SCI-400]
2016-09-02 16:31:17 +02:00
zmagod
4afaa50ce0
fixed multiple tables check
2016-09-01 13:49:12 +02:00
zmagod
111cb81d08
clear tables from report [fixes SCI-247] again
2016-09-01 13:38:09 +02:00
Mojca Lorber
a35bf7182f
fixes troubles
2016-08-30 09:43:39 +02:00
Mojca Lorber
b07f1af90f
fixes hound again again
2016-08-29 17:08:00 +02:00
Mojca Lorber
7f8bb9be53
fixes hound again
2016-08-29 13:59:51 +02:00
Mojca Lorber
60b0d69a72
fixes hound
2016-08-29 13:56:05 +02:00
Mojca Lorber
53cdbc2638
fixes notification when adding new sample
2016-08-29 13:45:54 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Matej Zrimšek
782d384e26
Spinner now doesn't hide prematurally on file uploading. Some recently introduced bugs quickfixes (report images not showing, locale missplealing, client-side blank tables deletion deleted all tables, error if no asset present in a step).
2016-08-25 22:26:53 +02:00
Matej Zrimšek
04d9163ff6
Paperclip file spoofing corrected/modified.
2016-08-25 18:57:06 +02:00
Luka Murn
8018cff02e
Merge pull request #103 from Ducz0r/bb_edit_delete_comments
...
Edit&delete comments
2016-08-25 17:18:48 +02:00
Zmago Devetak
b090fd8d5b
Merge pull request #95 from ZmagoD/zd_SCI_374
...
adds edit workflow link if no workflow [fixes SCI-374]
2016-08-25 14:07:33 +02:00
Luka Murn
a480c8d403
Styling fixes
2016-08-25 13:59:50 +02:00
Luka Murn
8592c13ed4
Remove now obsolote controller actions
2016-08-25 13:51:31 +02:00
Luka Murn
b0d7b9dc75
Generate activities when editing/deleting comments
2016-08-25 13:51:31 +02:00
Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435
Add edit&delete functionality to step comments
...
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
2016-08-25 13:51:31 +02:00
Luka Murn
512efd3812
Fix 2 lines that were too long
2016-08-25 13:51:31 +02:00
Luka Murn
c92d016f65
Add edit&delete module/task comments functionality
...
This required a minor fix of comments.js.
2016-08-25 13:51:31 +02:00
Luka Murn
f0d9cb96fa
Add edit project comments functionality
2016-08-25 13:51:30 +02:00
Luka Murn
15c0baeee8
Add delete project comment functionality
...
This commit also removes the old code from @bberic.
2016-08-25 13:51:30 +02:00
scibb
a76d82d188
delete and edit comments for projects, protocols, results, and workflow elements
2016-08-25 13:51:30 +02:00
zmagod
f515366d91
fixes workflowing after updating description, fixes canvas bug
2016-08-25 09:11:42 +02:00
jbargu
5c104ac050
Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error
...
Fix 404 move experiment error
2016-08-24 16:35:29 +02:00
Jure Grabnar
00da7efb44
Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
...
Conflicts:
app/models/experiment.rb
SCI-328 #close
2016-08-24 13:11:10 +02:00
Jure Grabnar
3e5e9aed22
Fix 404 on move experiment
...
[fixes SCI-378]
2016-08-24 11:09:03 +02:00
mlorb
5c8d669cac
Merge pull request #81 from mlorb/ml_sci_364
...
fixes edit experiment [SCI-364]
2016-08-23 16:49:20 +02:00
Zmago Devetak
396325bd67
Merge pull request #86 from ZmagoD/zd_SCI_365
...
changed experiment create redirection [fixes SCI-365]
2016-08-23 16:30:48 +02:00
Zmago Devetak
65049692ea
Merge pull request #78 from ZmagoD/zd_SCI_349
...
updating thumbnail
2016-08-23 16:22:07 +02:00
Mojca Lorber
322be64b5f
change experiment path
2016-08-23 14:44:22 +02:00
Jure Grabnar
67768c8865
Fix Hound errors
2016-08-23 11:08:10 +02:00
zmagod
66b8a3055d
changed experiment create redirection [fixes SCI-365]
2016-08-23 09:03:39 +02:00
Jure Grabnar
c0edf51054
Fix bounding box algorithm, can move new modules
2016-08-23 09:00:25 +02:00
Jure Grabnar
667b7671a6
Add connections for moved workflows
2016-08-22 17:26:21 +02:00
Mojca Lorber
75c52d20e5
fixes hound
2016-08-22 15:30:27 +02:00
Mojca Lorber
131d0d269a
fixes edit experiment
2016-08-22 15:18:02 +02:00
zmagod
d38f29d207
set ajax loading of experiments images [fixes SCI-349]
2016-08-22 11:29:19 +02:00
mlorb
0832466d20
Merge pull request #76 from mlorb/ml_sci_286
...
fixes notifications when creating new sample type or group [SCI-286]
2016-08-22 08:54:28 +02:00
Mojca Lorber
1c220aba7b
delete comment
2016-08-22 08:50:48 +02:00
zmagod
cac5033eba
set ajax for workflow img
2016-08-19 15:36:12 +02:00
Zmago Devetak
99aa66cd84
Merge pull request #74 from ZmagoD/zd_SCI_346
...
check search input string [fixes SCI-346]
2016-08-19 14:01:56 +02:00
Mojca Lorber
799cac1238
fixes hound
2016-08-19 13:55:34 +02:00
Jure Grabnar
80498260e5
Add backend for moving task from canvas
2016-08-19 13:53:43 +02:00
Mojca Lorber
5695842fe3
fixes notifications when creating sample types and groups
2016-08-18 16:05:15 +02:00
zmagod
d62500cb56
check search input string [fixes SCI-346]
2016-08-18 13:14:31 +02:00
zmagod
fa08b861d0
fixed experiments archive bug
2016-08-18 10:55:29 +02:00
Matej Zrimšek
4ad384df5a
Fixed hound alerts.
2016-08-17 21:02:05 +02:00
Matej Zrimšek
27a9dac412
File permissions corrected, with some refactoring.
2016-08-17 18:23:24 +02:00
Matej Zrimšek
e4a6a3944e
Added deleting of files on S3 server when editing/removing a file. Some refactoring.
2016-08-17 18:13:35 +02:00
Matej Zrimšek
ccdccc5cf1
Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.
2016-08-17 18:11:13 +02:00
Matej Zrimšek
854ef0d227
Special characters caused error [fixes SCI-315].
2016-08-17 18:10:47 +02:00
Matej Zrimšek
c87ba5b45c
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +02:00
Jure Grabnar
78cf4f396e
render_403 and 404 now return true
...
To prevent any: render_403 and return type of bugs
2016-08-17 15:46:30 +02:00
Jure Grabnar
0cdea0b51a
Add modal for moving task on canvas
2016-08-17 15:46:30 +02:00
zmagod
6c5cc8aac9
fixes notification [fixes SCI-337]
2016-08-17 13:17:40 +02:00
Zmago Devetak
da735a51f4
Merge pull request #62 from ZmagoD/zd_SCI_318
...
Zd sci 318
2016-08-17 10:01:10 +02:00
zmagod
850f5d8dad
fixing hound alerts
2016-08-17 09:44:23 +02:00
zmagod
7abc8f3a90
Merge branch 'master' into experiment-level
2016-08-17 09:28:35 +02:00
Jure Grabnar
a29b56b0bd
Even more candy for our dog
2016-08-16 09:15:29 +02:00
Jure Grabnar
042a33f2c7
Add activity for moving
2016-08-16 08:49:24 +02:00
zmagod
852fe499fb
clean up linked protocol
2016-08-12 16:31:40 +02:00
Jure Grabnar
c387439fb2
Fix projects query for experiments
...
Remove unneeded word in view
2016-08-12 11:36:52 +02:00
Jure Grabnar
d7341d0383
Set actions/routes/view for move experiment
2016-08-12 11:26:18 +02:00
Jure Grabnar
9173c83502
Select current project in clone modal
2016-08-11 17:20:06 +02:00
Jure Grabnar
3c36293770
Add activity for cloning experiment
2016-08-11 17:00:33 +02:00
Jure Grabnar
3b259d34b0
Basic cloning of experiment works
...
Still missing:
- cloning of assets
- cloning of experiment image
2016-08-11 15:13:36 +02:00
Jure Grabnar
7f21ae138a
Set clone actions/routes/view
...
DRY code for showing AJAX on project#show page
2016-08-11 09:46:15 +02:00
Jure Grabnar
1ca34a7986
Fix result texts/tables
2016-08-10 15:44:33 +02:00
Jure Grabnar
52e6d7d300
Fix step comments
2016-08-10 15:44:33 +02:00
Jure Grabnar
3e72f29bfd
Fix uploading of step assets
2016-08-10 15:44:33 +02:00
Jure Grabnar
d69195a4f6
Fix uploading of result assets
2016-08-10 15:44:33 +02:00
zmagod
c866e90b33
Merge branch 'zd_add_image_to_project_preview' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_add_image_to_project_preview
2016-08-10 11:33:37 +02:00
zmagod
5f3a5cb845
fixed project overview
2016-08-09 14:26:08 +02:00
Jure Grabnar
0ca5725f9b
Archive/restore of experiments now work
2016-08-08 16:35:45 +02:00
zmagod
1a56396eb5
add workflow image to project overview page [fixes SCI-41]
2016-08-08 16:02:17 +02:00
Jure Grabnar
2bd74866e0
Fix my_modules archive page
2016-08-08 15:04:02 +02:00
Jure Grabnar
deecbf082c
Remove badly merged code
2016-08-08 13:06:20 +02:00
jbargu
3f91e7a476
Merge pull request #47 from biosistemika/jg_explvl_reports
...
Update reports with experiment level
[Fixes SCI-35].
2016-08-08 08:51:23 +02:00
zmagod
04d171997e
Merge branch 'zd_SCI_41' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_41
2016-08-05 15:56:21 +02:00
zmagod
9c5c4f0a3a
Merge branch 'zd_SCI_44' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_44
2016-08-05 15:23:01 +02:00
Jure Grabnar
d9702b6964
Remove unneeded new element
2016-08-05 08:36:06 +02:00
Jure Grabnar
2f0dc57ea6
Fix Hounds warning
2016-08-05 08:29:49 +02:00
Jure Grabnar
cafec6a1b4
Fix controls on experiment contents
...
Also fix bug with adjencent elements not updating controls.
Fixes SCI-35.
2016-08-04 16:05:03 +02:00
zmagod
a4ec558596
start to implement project overview page
2016-08-04 12:57:33 +02:00
zmagod
57ac34e9f4
add samples to experiment page [fixes SCI-43]
2016-08-03 12:57:51 +02:00
Jure Grabnar
aedaf2f30a
Adding of experiment content now works in reports
2016-08-03 12:52:52 +02:00
Jure Grabnar
5854e72878
Add experiments_contents action
2016-08-03 12:52:52 +02:00
Jure Grabnar
acc41dae40
Add experiment content report dialog
...
Adding still has to be implemented
2016-08-03 12:52:51 +02:00
Jure Grabnar
1e334d9075
Remove unneeded "Add new report element"
2016-08-03 12:52:06 +02:00
Jure Grabnar
d82ba163ed
Add experiment to report screen
...
Only placeholder for now, JS still needs fixing.
2016-08-03 12:52:06 +02:00
zmagod
d11b0b11e9
Feed the Hound
2016-08-03 09:44:05 +02:00
zmagod
caa80642c0
[fixes SCI-304], [fixes SCI-37]
2016-08-03 09:34:10 +02:00
zmagod
18d73467c8
fixed hound warning
2016-08-02 11:16:07 +02:00
zmagod
166f907780
fixed search error
2016-08-02 11:10:30 +02:00
zmagod
f184ee3f2d
fixing hound warnings
2016-08-02 09:13:30 +02:00
zmagod
9581e2751f
fixes samples page for experiment level [fixes SCI-44]
2016-08-02 08:44:07 +02:00
Luka Murn
ecf5b5a2c1
Feed the Hound
2016-07-29 16:46:25 +02:00
zmagod
95da62adde
fixed hound
2016-07-29 16:38:42 +02:00
zmagod
25b99b6570
fixed search [fixes SCI-261]
2016-07-29 16:32:54 +02:00
Luka Murn
b085aa1db3
Remove uneccesary project_activities HTML pages
2016-07-29 16:06:35 +02:00
Luka Murn
34af50a9d0
Fix breadcrumbs & sidebar so it works
2016-07-29 15:47:41 +02:00
Luka Murn
4ea86d6aa1
Code style fixes
2016-07-29 10:41:08 +02:00
Luka Murn
edafcaeed6
Move route module_archive_project -> module_archive_experiment
...
Also add some new routes, move some templates.
2016-07-29 10:25:02 +02:00
Luka Murn
ebda92ef05
Add experiments_controller
2016-07-29 10:21:21 +02:00
Luka Murn
b64e200b91
Refactor canvas a lot.
...
Also refactor localization files concerning canvas.
2016-07-28 16:41:10 +02:00
zmagod
e95f518964
refactor canvas_controller, experiments_controller
2016-07-28 16:01:53 +02:00
zmagod
d91aa5c60b
fixed translation sting 'name' to 'experiment'
2016-07-28 14:57:47 +02:00
zmagod
23a46d5fb3
added translations to experiment create and edit flash messages
2016-07-28 14:52:11 +02:00
zmagod
352944fc33
added new/edit experiment modals
2016-07-28 14:44:44 +02:00
zmagod
9d23cfd940
fixed experiment routes
2016-07-28 11:30:34 +02:00
zmagod
c11932b45b
fixed layout
2016-07-28 11:00:56 +02:00
zmagod
d16c0fe706
fixed edit canvas
2016-07-28 10:09:05 +02:00
zmagod
54c4051906
added canvas under experiments
2016-07-28 09:01:44 +02:00
zmagod
a17106b883
added experiments controller and fixed sidebar
2016-07-27 16:18:26 +02:00
Zmago Devetak
c869db2506
Merge pull request #35 from ZmagoD/zd_SCI_40
...
Edit canvas controller to work with experiments
2016-07-27 12:11:19 +02:00
zmagod
485d93f8b9
refactor canvas permissions
2016-07-27 11:35:07 +02:00
zmagod
5c7501a273
added experiments canvas labels in localization file and fixed canvas views
2016-07-26 14:21:59 +02:00
zmagod
0a84ecdfc1
edit canvas controller to work with experiment
2016-07-26 14:02:06 +02:00
Jure Grabnar
3be562bdf6
Add experiment to search results
2016-07-26 12:26:48 +02:00
Luka Murn
076b67620f
Migration GitLab -> GitHub
2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8
Initial commit.
2016-02-12 16:52:43 +01:00
