Mojca Lorber
|
b1e939e715
|
add experiment to activities
|
2017-04-20 13:16:11 +02:00 |
|
zmagod
|
90faeec410
|
fixes typos and protocol step links
|
2017-04-10 11:21:28 +02:00 |
|
|
zmagod
|
f16607579f
|
refactor steps annotation
|
2017-04-06 13:03:13 +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
|
2edebb282a
|
Add team_id field to assets and tables [SCI-1046]
|
2017-03-23 10:36:55 +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 |
|
|
Oleksii Kriuchykhin
|
f97c20e9b5
|
Fix hound warnings [SCI-999]
|
2017-02-13 15:42:28 +01:00 |
|
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
|
zmagod
|
21c2f82582
|
rename controllers where org/organization
|
2017-01-24 16:57:14 +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 |
|
|
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 |
|
|
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 |
|
|
zmagod
|
ac52e643be
|
cleanup direct upload
|
2016-12-08 11:26:13 +01: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 |
|
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 |
|
|
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
|
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 |
|
|
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
|
4ad384df5a
|
Fixed hound alerts.
|
2016-08-17 21:02:05 +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
|
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
|
3e72f29bfd
|
Fix uploading of step assets
|
2016-08-10 15:44:33 +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 |
|