aignatov-bio
|
9ca7b76a1f
|
Fix report assigned repository items
|
2021-05-04 12:49:38 +02:00 |
|
Oleksii Kriuchykhin
|
e98ccd2860
|
Add confirmation modal for report regeneration action [SCI-5622]
|
2021-05-03 16:10:14 +02:00 |
|
aignatov-bio
|
3d80deb51a
|
Add pagination to report title page [SCI-5667] (#3275)
|
2021-05-03 15:27:17 +02:00 |
|
aignatov-bio
|
705fb1e43d
|
Add report front-end validations and close wizard modals [SCI-5666] (#3273)
* Add report front-end validations and close wizard modals
* Add constant to report name validation [SCI-5666]
|
2021-05-03 15:24:27 +02:00 |
|
aignatov-bio
|
01dfd305ab
|
Add warning modal to report edit mode [SCI-5621] (#3266)
* Add warning modal to report edit mode [SCI-5621]
* Move report editing modal to partial [SCI-5621]
|
2021-05-03 15:17:23 +02:00 |
|
Oleksii Kriuchykhin
|
1b8265343e
|
Add full-page display to PDF Report of all pages of the attached Word and PDF files in the Results [SCI-5636]
|
2021-05-03 11:45:45 +02:00 |
|
aignatov-bio
|
86854b015d
|
Add third template to reports [SCI-5618]
|
2021-04-29 15:21:58 +02:00 |
|
aignatov-bio
|
6b023603f9
|
Add second template for reports [SCI-5617] (#3268)
|
2021-04-29 10:42:17 +02:00 |
|
Oleksii Kriuchykhin
|
bca88188de
|
Limit created report relations depth to tasks [SCI-5665]
|
2021-04-28 15:33:30 +02:00 |
|
Oleksii Kriuchykhin
|
8a915c8acf
|
Fix assets inclusion into report [SCI-5680]
|
2021-04-28 14:37:16 +02:00 |
|
aignatov-bio
|
7c75f170d0
|
Add repositories settings to report wizard [SCI-5648] (#3269)
* Add repositories settings to report wizard [SCI-5648]
* Move repositories from report settings to content [SCI-5648]
|
2021-04-28 09:54:00 +02:00 |
|
Alex Kriuchykhin
|
fe48e35cf0
|
Merge pull request #3263 from okriuchykhin/ok_SCI_5609
Add additional custom fields for reports [SCI-5609]
|
2021-04-23 10:53:59 +02:00 |
|
Oleksii Kriuchykhin
|
ecbf747499
|
Switch to base64 encoded assets in wiked_pdf templates
|
2021-04-22 14:52:41 +02:00 |
|
Oleksii Kriuchykhin
|
a67cc619ec
|
Add additional custom fields for reports [SCI-5609]
|
2021-04-20 13:57:09 +02:00 |
|
aignatov-bio
|
d18a54c874
|
Update create and update action for reports controller [SCI-5641] (#3260)
Update create and update action [SCI-5641]
|
2021-04-20 13:35:40 +02:00 |
|
Oleksii Kriuchykhin
|
fe8f006f6e
|
Fix save report PDF to Inventory [SCI-5613]
|
2021-04-14 16:06:59 +02:00 |
|
Oleksii Kriuchykhin
|
0a9a656313
|
Add flash message and notification for generated reports [SCI-5552]
|
2021-04-14 15:45:51 +02:00 |
|
Oleksii Kriuchykhin
|
df8354bde3
|
Move the docx creation to the Delayed job [SCI-5560]
|
2021-04-14 12:39:36 +02:00 |
|
aignatov-bio
|
85a13b7182
|
Update condition for project content [SCI-5620]
|
2021-04-14 11:51:03 +02:00 |
|
aignatov-bio
|
bccd474cc6
|
Add edit mode for report [SCI-5620]
|
2021-04-14 11:51:03 +02:00 |
|
aignatov-bio
|
d991b631fb
|
Merge pull request #3252 from aignatov-bio/ai-sci-5593-add-logic-for-preparing-wizard-data-for-report
Add logic for preparing wizard data for report [SCI-5593]
|
2021-04-14 11:04:55 +02:00 |
|
Alex Kriuchykhin
|
1df86c36d9
|
Merge pull request #3254 from okriuchykhin/ok_SCI_5637
Implement PDF report generation in delayed job [SCI-5637]
|
2021-04-13 16:37:16 +02:00 |
|
Oleksii Kriuchykhin
|
f864f551d5
|
Implement PDF report generation in delayed job [SCI-5637]
|
2021-04-12 13:04:02 +02:00 |
|
aignatov-bio
|
101d46956c
|
Add logic for preparing wizard data for report [SCI-5593]
|
2021-04-12 12:42:22 +02:00 |
|
Oleksii Kriuchykhin
|
67302da968
|
Add settings to reports [SCI-5612]
|
2021-04-08 17:40:16 +02:00 |
|
aignatov-bio
|
14f8e97b5f
|
Add I18n for reports wizard second step [SCI-5572]
|
2021-04-08 12:04:34 +02:00 |
|
aignatov-bio
|
e6edbf55f3
|
Add report wizard step 2 [SCI-5572]
|
2021-04-08 12:00:08 +02:00 |
|
aignatov-bio
|
a1d6c30ef7
|
Add report wizard step 3 [SCI-5611]
|
2021-04-07 16:37:08 +02:00 |
|
Alex Kriuchykhin
|
aa21d7e415
|
Merge pull request #3247 from okriuchykhin/ok_SCI_5591
Add dynamic form elements in report wizard step 1 [SCI-5591]
|
2021-04-07 12:05:10 +02:00 |
|
aignatov-bio
|
a46b9cb8ea
|
Add document preview to reports [SCI-5559]
|
2021-04-07 11:15:22 +02:00 |
|
Oleksii Kriuchykhin
|
a9ac8452f2
|
Add dynamic form elements in report wizard step 1 [SCI-5591]
|
2021-04-06 13:56:24 +02:00 |
|
aignatov-bio
|
82be23db81
|
Add project and template selector [SCI-5570]
|
2021-03-31 15:32:03 +02:00 |
|
Alex Kriuchykhin
|
c9688a58f7
|
Merge pull request #3241 from aignatov-bio/ai-sci-5571-add-template-partial-to-report
Add template partials to reports [SCI-5571]
|
2021-03-31 11:36:56 +02:00 |
|
aignatov-bio
|
ecca155fab
|
Added layout for footer and header [SCI-5571]
|
2021-03-30 23:43:34 +02:00 |
|
aignatov-bio
|
ad8e404bca
|
Add template partials to reports [SCI-5571]
|
2021-03-30 13:40:36 +02:00 |
|
aignatov-bio
|
0920d0a5cd
|
Add reports wizzard layout [SCI-5569]
|
2021-03-25 13:21:54 +01:00 |
|
aignatov-bio
|
3e5c2e83c7
|
Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550]
|
2021-03-17 12:54:25 +01:00 |
|
aignatov-bio
|
c99e8f19fd
|
Add basic layout [SCI-5548]
|
2021-03-16 13:11:51 +01:00 |
|
Urban Rotnik
|
07ba11c140
|
Fix icons in export_all and print mode
|
2021-03-10 12:42:12 +01:00 |
|
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 |
|
Oleksii Kriuchykhin
|
67b3f853d7
|
Merge branch 'develop' into features/folders
|
2020-12-18 14:51:21 +01:00 |
|
Oleksii Kriuchykhin
|
94b6c96e48
|
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
|
2020-12-12 22:46:30 +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 |
|
aignatov-bio
|
bb983af42f
|
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style
Update checkbox style at repository and protocol datatable [SCI-4579]
|
2020-10-27 10:22:56 +01:00 |
|
aignatov-bio
|
d6f8e156c1
|
Update checkbox style at repository and protocol datatable
|
2020-10-22 16:42:12 +02:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +02:00 |
|
mlorb
|
3d2aaed791
|
Merge pull request #2820 from mlorb/ml-sci-4580
Fix buttons visability on reports page according to new styleguide [SCI-4580]
|
2020-09-10 09:32:16 +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 |
|
Mojca Lorber
|
1f0d9f3ad7
|
Fix buttons visability on reports page according to new styleguide
|
2020-09-03 16:19:02 +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 |
|
aignatov-bio
|
1d3055011f
|
Merge branch 'features/tinymce-tables' into develop
|
2020-07-22 13:41:43 +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 |
|
aignatov-bio
|
39b5651283
|
Revert FontAwesome in reports to CDN
|
2020-07-14 09:44:03 +02:00 |
|
aignatov-bio
|
f8c6d9f260
|
Fix markup
|
2020-07-13 14:31:57 +02:00 |
|
aignatov-bio
|
a7fac38fcb
|
Improve pdf reports
|
2020-07-13 14:29:59 +02:00 |
|
Urban Rotnik
|
5d067077b1
|
Add logo and timestamp to PDF and Doc reports
|
2020-07-08 10:48:29 +02:00 |
|
Urban Rotnik
|
69d086ba32
|
Scope snapshots to project
|
2020-06-03 22:58:22 +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 |
|
aignatov-bio
|
da4b55ceea
|
Fix protocol and report create modals after dashboard redirect
|
2020-03-19 19:43:20 +01:00 |
|
aignatov-bio
|
95fca105eb
|
Add quickstart layout and create task modal
|
2020-02-28 14:34:34 +01:00 |
|
aignatov-bio
|
5953c2543d
|
Fix typo and boostrap load order
|
2020-01-08 12:07:33 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
aignatov-bio
|
a281f09e7f
|
Add reports and missed modals
|
2020-01-06 10:40:20 +01: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 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Luka Murn
|
a6ca155fa7
|
Rename repository module report element to have new CSS class
|
2019-08-23 16:05:42 +02:00 |
|
aignatov-bio
|
5515bac773
|
Add assigned items from shared inventories to report (#2002)
|
2019-08-23 11:28:09 +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 |
|
mlorb
|
5bc8eb7392
|
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
|
2019-07-12 15:52:40 +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 |
|
Mojca Lorber
|
f8afc92606
|
Fix page redirect and add success flash msg after protocols.io import action
|
2019-07-11 09:50:39 +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 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +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
|
71b3228310
|
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
|
2019-05-13 10:45:12 +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 |
|
Urban Rotnik
|
686f10cbd0
|
Refactor instance method 'ordered_modules' to scope
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
1b70f42817
|
Refactor 'Experiment.modules_without_group' to Module's scope
|
2019-01-18 16:54:00 +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 |
|
Alex Kriuchykhin
|
20e2cbf0ca
|
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
|
2018-11-28 09:47:20 +01:00 |
|
Oleksii Kriuchykhin
|
2e00f1546a
|
Fix handsontable initialization [SCI-2882]
|
2018-11-26 14:11:46 +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
|
48a6a64502
|
Move PDF generation and export logic of export all PDF to the model
|
2018-10-14 22:52:54 +02: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 |
|
Alex Kriuchykhin
|
75a48291e1
|
Merge pull request #1272 from okriuchykhin/ok_SCI_2654
Fix report elements sorting [SCI-2654]
|
2018-08-22 14:20:54 +02:00 |
|
Oleksii Kriuchykhin
|
62d99a4372
|
Fix report elements sorting [SCI-2654]
|
2018-08-20 14:46:23 +02:00 |
|
Zanz2
|
dfcaa40f1a
|
Merge branch 'master' into zz_refactor_icons_sci_2445_v2
|
2018-08-14 13:33:43 +02:00 |
|
Zanz2
|
45a4c1c598
|
changed the icons as per last comment in jira issue
|
2018-08-14 13:26:48 +02:00 |
|
Oleksii Kriuchykhin
|
b2bd1cb849
|
Upgrade to Turbolinks 5 [SCI-2253]
|
2018-07-27 17:26:46 +02:00 |
|
Oleksii Kriuchykhin
|
6669beaf0e
|
Change icons throughout the rest of application [SCI-2445]
|
2018-07-27 15:27:08 +02:00 |
|
Oleksii Kriuchykhin
|
13c374d9b3
|
Add hooks to new report modal [SCI-2377]
|
2018-06-14 15:26:06 +02:00 |
|
Luka Murn
|
9a4fdd166e
|
Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix
Conflicts:
app/views/projects/index.html.erb
|
2018-06-12 17:44:42 +02:00 |
|
zmagod
|
51e024e3d7
|
adds data-hooks to reports and search results [fixes SCI-2374]
|
2018-06-07 14:29:40 +02:00 |
|
Luka Murn
|
e0a3b5a941
|
Fix Save PDF to repository modal window
|
2018-06-06 16:29:07 +02:00 |
|
Luka Murn
|
c76b926387
|
Delete _report_sidebar.html.erb
This file is no longer needed from my research.
|
2018-05-25 11:04:05 +02:00 |
|
Zmago Devetak
|
280a926554
|
Merge pull request #1159 from ZmagoD/zd_SCI_2372
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
|
2018-05-24 16:05:56 +02:00 |
|
zmagod
|
06f1daf7a9
|
rename data-hook
|
2018-05-24 16:02:56 +02:00 |
|
mlorb
|
c4ecfc4d38
|
Change icons throughout sciNote - navigation, project, task cards
|
2018-05-22 16:55:58 +02:00 |
|
zmagod
|
e97a98f189
|
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
|
2018-05-22 14:18:40 +02:00 |
|