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 |
|
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 |
|
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 |
|
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 |
|
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 |
|