Urban Rotnik
|
8202181095
|
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications
Bring back old notifications [SCI-4140]
|
2021-03-09 14:54:08 +01:00 |
|
Urban Rotnik
|
8ca8c84efd
|
Fix report completed_on time and username (partially)
SCI-5439
We cannot realy on last_modified_by, because it can be changed after step completion
|
2021-02-25 13:24:21 +01:00 |
|
Urban Rotnik
|
1bb2393655
|
Use translations
SCI-4140
|
2021-02-25 11:59:26 +01:00 |
|
aignatov-bio
|
07831c0294
|
Add new asset icons to report [SCI-5263]
|
2021-01-19 12:53:49 +01:00 |
|
aignatov-bio
|
c43851a2f4
|
Fix download links in reports [SCI-5279]
|
2020-12-03 12:16:48 +01:00 |
|
aignatov-bio
|
8cdf09f244
|
Add preview files to export all
|
2020-11-27 11:07:37 +01:00 |
|
aignatov-bio
|
2947426b44
|
Add scinote link to pdf reports
|
2020-11-17 13:54:13 +01:00 |
|
aignatov-bio
|
7fd7c2de6a
|
Add download link to reports
|
2020-11-11 15:48:00 +01:00 |
|
aignatov-bio
|
f85a3493cd
|
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports
Add filer previews to reports [SCI-5110]
|
2020-11-02 18:48:45 +01:00 |
|
aignatov-bio
|
2f1217688c
|
Add filer previews to reports
|
2020-10-28 16:32:22 +01:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +02:00 |
|
Urban Rotnik
|
9066586149
|
Fix duedate for PDF and DOCX
|
2020-09-09 10:48:42 +02:00 |
|
Urban Rotnik
|
c628fb2598
|
Remove duplicated notes section in reports
|
2020-09-08 16:10:24 +02:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
7c14da70d9
|
Merge branch 'features/task-flows' into develop_to_task_flows
|
2020-08-04 14:50:46 +02:00 |
|
aignatov-bio
|
f09ead703c
|
Fix markup
|
2020-07-28 09:54:47 +02:00 |
|
aignatov-bio
|
b644950e4e
|
Fix I18n markup
|
2020-07-28 09:53:35 +02:00 |
|
aignatov-bio
|
a0d19b5d98
|
Add new statuses to reports
|
2020-07-23 14:24:30 +02:00 |
|
Oleksii Kriuchykhin
|
7fd004baa8
|
Prepare database structure and relations for statuses phase one [SCI-4825]
|
2020-07-17 18:04:09 +02:00 |
|
aignatov-bio
|
f77902f6d4
|
Add tinymce table support to docx
|
2020-07-15 09:44:25 +02:00 |
|
Oleksii Kriuchykhin
|
d774a82762
|
Fix handling of snapshots of deleted repositories in reports [SCI-4698]
|
2020-05-29 16:30:27 +02:00 |
|
Oleksii Kriuchykhin
|
7a95355e81
|
Add extra check for repository presence in report [SCI-4698]
|
2020-05-29 11:39:07 +02:00 |
|
Oleksii Kriuchykhin
|
b430d507cf
|
Fix handling of deleted repositories in reports [SCI-4698]
|
2020-05-27 12:15:19 +02:00 |
|
Urban Rotnik
|
df8fe20d03
|
Keep reportElements up to date with active snapshots and repositories
|
2020-05-25 13:19:33 +02:00 |
|
Urban Rotnik
|
359517eb17
|
Add deleted repositories to report
|
2020-05-25 13:19:30 +02:00 |
|
Urban Rotnik
|
2b493ce6f6
|
Refactor assigned rows
|
2020-05-25 13:19:29 +02:00 |
|
Urban Rotnik
|
9536939b3b
|
Show snapshot rows in report
|
2020-05-25 13:19:28 +02:00 |
|
Oleksii Kriuchykhin
|
15a793a343
|
Fix start date interpolation in reports [SCI-4504]
|
2020-03-31 18:44:43 +02:00 |
|
Oleksii Kriuchykhin
|
3c53be1f9a
|
Add start date to the task [SCI-4504]
|
2020-03-31 14:17:14 +02:00 |
|
Oleksii Kriuchykhin
|
7a89cae56f
|
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-05 13:27:17 +01:00 |
|
Oleksii Kriuchykhin
|
53402c9ce1
|
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 13:30:14 +02:00 |
|
Luka Murn
|
a6ca155fa7
|
Rename repository module report element to have new CSS class
|
2019-08-23 16:05:42 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Jure Grabnar
|
5847a8b05c
|
Convert HOT table after it was initialized
Closes SCI-3704
|
2019-07-23 14:17:22 +02:00 |
|
aignatov-bio
|
3c32fe0895
|
Fix formulas in table report (#1934)
|
2019-07-15 13:27:27 +02:00 |
|
aignatov-bio
|
4bae87e3f7
|
Styling changes in DOCX report [SCI-3633] (#1899)
* Styling changes in DOCX report
* Update result comments in docx report
* Fix markup
|
2019-07-12 13:48:14 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
aignatov-bio
|
4fe3119bd2
|
Fix step description RTE images in report preview (#1888)
|
2019-07-08 15:23:44 +02:00 |
|
aignatov-bio
|
01a01157d3
|
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table
* Add result tables
|
2019-07-08 13:19:12 +02:00 |
|
Anton Ignatov
|
390002f40f
|
Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539
|
2019-07-01 10:12:26 +02:00 |
|
Oleksii Kriuchykhin
|
5acb16d43e
|
Update Asset helper methods [SCI-3539]
|
2019-06-28 08:17:09 +02:00 |
|
aignatov-bio
|
7a3eedf461
|
Adding missing avatars to comments (#1838)
|
2019-06-14 16:20:13 +02:00 |
|
aignatov-bio
|
d3aa6371cd
|
Fix report saving [SCI-3443] (#1753)
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
|
2019-05-13 10:55:08 +02:00 |
|
aignatov-bio
|
0b194eb3b1
|
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808.
|
2019-05-13 09:09:36 +02:00 |
|
aignatov-bio
|
3db6129808
|
Fix report saving (#1748)
|
2019-05-13 08:58:47 +02:00 |
|
aignatov-bio
|
1a860037f7
|
Update reports for new RTE [SCI-3263] (#1691)
* Update reports for new RTE
|
2019-04-25 16:16:43 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
Jure Grabnar
|
1295c0583a
|
Archived results are now separated in exported project
Closes SCI-3179
|
2019-04-17 16:37:21 +02:00 |
|
Urban Rotnik
|
26cf8271a1
|
Change step header, remove vertical line
|
2019-04-05 10:57:38 +02:00 |
|
Jure Grabnar
|
26848ecaef
|
Refactor step position + 1 into a method
|
2019-04-03 13:07:30 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Miha Mencin
|
1b19e67c07
|
Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d.
|
2019-03-27 10:21:40 +01:00 |
|
Urban Rotnik
|
b0f0ded87d
|
Step header changes, removed vertical line
SCI-3134
|
2019-03-25 17:25:13 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
ec28db6f4f
|
Fix image URLs in export all document [SCI-2931]
|
2019-01-10 14:19:40 +01:00 |
|
Luka Murn
|
65adc7a556
|
Fix 2 minor visual bugs in reports
|
2018-12-12 11:15:32 +01:00 |
|
Oleksii Kriuchykhin
|
b926cadba4
|
Fix smartannotations rendering issues [SCI-2880]
|
2018-11-23 15:07:08 +01:00 |
|
Matej Zrimšek
|
57dbd63aa3
|
Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817]
|
2018-11-12 01:34:00 +01:00 |
|
Matej Zrimšek
|
69f3a919db
|
Some specification and syntax fixes [SCI-2641]
|
2018-10-12 07:42:17 +02:00 |
|
Matej Zrimšek
|
d970576d60
|
Switch between generating report PDF and export all PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
c0dc4f6951
|
Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
7152d2f0f1
|
Fix/update file naming convection for exported files [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
6f77c4772c
|
Minor fix for assets & tables naming in export all PDF
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
0ebce8e283
|
Add relative links (not working) to files and tables into the PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
zmagod
|
51e024e3d7
|
adds data-hooks to reports and search results [fixes SCI-2374]
|
2018-06-07 14:29:40 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
Luka Murn
|
cb6fe50832
|
Merge branch 'master' into ux-release-1
Conflicts:
app/assets/javascripts/repositories/index.js
|
2018-04-26 11:38:54 +02:00 |
|
zmagod
|
c0cc6c293a
|
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
|
2018-04-05 13:15:32 +02:00 |
|
Oleksii Kriuchykhin
|
f656ad1561
|
Fix fa icons [SCI-2217]
|
2018-03-30 17:03:44 +02:00 |
|
Oleksii Kriuchykhin
|
cc5d8550b1
|
Refactor file preview modal [SCI-2217]
|
2018-03-30 11:50:28 +02:00 |
|
zmagod
|
ad742ac2d1
|
adds nil check in ste_table_element for table name [fixes SCI-2009]
|
2018-02-05 16:27:04 +01:00 |
|
zmagod
|
3dc3ed906f
|
fixes bug with embedded images [fixes SCI.1624]
|
2017-10-02 18:06:42 +02:00 |
|
Matej Zrimšek
|
d49524a26f
|
Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]
|
2017-06-20 16:10:50 +02:00 |
|
Luka Murn
|
02dd6636ba
|
Allow saving & editing of reports with repository elements
Closes SCI-1279.
|
2017-06-07 16:55:00 +02:00 |
|
Luka Murn
|
b5f6d1da94
|
Allow custom repositories to be added to reports
|
2017-06-07 16:54:32 +02:00 |
|
Matej Zrimšek
|
f78c80b148
|
Added possibility to add uncompleted steps to report. [closes SCI-414]
|
2017-05-17 13:25:21 +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
|
b22350136f
|
adds label to step in report [fixes SCI-488]
|
2017-05-05 09:45:18 +02:00 |
|
Matej Zrimšek
|
a5cffd06f3
|
Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]
|
2017-04-25 16:03:50 +02:00 |
|
zmagod
|
86c6ae3b03
|
display tinyMCE images in reports
|
2017-04-25 09:53:35 +02:00 |
|
zmagod
|
c25df63a14
|
add tinymce img importer and refactor input sanitize helper
|
2017-04-19 09:11:52 +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
|
c244e69e81
|
fixed report comments bug [fixes SCI-1100]
|
2017-03-17 16:59:40 +01:00 |
|
zmagod
|
5d372851d3
|
fixes reports comment bug [fixes SCI-1100]
|
2017-03-14 16:24:02 +01:00 |
|
zmagod
|
5c2e9a4b04
|
adds extends and fixes report methods
|
2017-03-08 14:14:03 +01:00 |
|
Mojca Lorber
|
f84611f558
|
fix report - checklist items are in separate row than checkboxes
|
2017-02-22 15:51:26 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Oleksii Kriuchykhin
|
c55f3cb99c
|
Add flag to disable simple_format in custom_auto_link [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +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
|
8e02c2e025
|
add locale - fix
|
2017-01-20 13:37:07 +01:00 |
|
Mojca Lorber
|
4ea154410a
|
add to fields with rich text formatting
|
2017-01-19 15:27:24 +01:00 |
|
Mojca Lorber
|
44de927cf4
|
display smart annotations in reports - without rich text fields
|
2017-01-19 14:22:54 +01:00 |
|
Mojca Lorber
|
3b92ab9f36
|
add names to tables from protocol steps in reports
|
2017-01-18 14:22:19 +01:00 |
|
Oleksii Kriuchykhin
|
d05c16b0ba
|
Added auto_link wrapper with custom sanitization [SCI-102]
|
2017-01-11 17:02:17 +01:00 |
|