scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 05:02:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
6084 commits 39 branches 184 tags 168 MiB
Commit graph

911 commits

Author SHA1 Message Date
aignatov-bio
737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) 
* Replace marvinJS logo and fix some merge issues

* Fix tests
 2019-08-13 11:04:19 +02:00
Oleksii Kriuchykhin
32054c5516 Handle situation for assets without blob in list sorting [SCI-3757] 2019-08-09 15:17:19 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
aignatov-bio
6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Anton Ignatov
e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
aignatov-bio
f0b7771e19
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export 
Fix protocol copy, add metadata to assets [SCI-3629]
 2019-08-05 12:55:16 +02:00
Anton Ignatov
feadd940f7 Fix duplicate for TinyMCE model 2019-08-05 11:33:49 +02:00
Anton Ignatov
24da016465 Reuse duplicate file method 2019-08-05 11:30:36 +02:00
Anton Ignatov
7e379d4e0d Fix download file 2019-07-29 10:24:31 +02:00
Anton Ignatov
f35f4886a3 Fix markup 2019-07-29 10:18:34 +02:00
Anton Ignatov
a4b2825258 Fix tests for active storage 2019-07-26 15:58:51 +02:00
Anton Ignatov
618f0cc334 Fix tests for services 2019-07-26 14:16:44 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Anton Ignatov
3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
Anton Ignatov
b762ae6a90 Copy protocol assets through tempfile 2019-07-19 15:23:34 +02:00
aignatov-bio
4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
aignatov-bio
2fae7d8208
Fix issue in report (#1941) 2019-07-19 10:37:44 +02:00
Anton Ignatov
b5a35f583a Fix protocol copy, add metadata to assets 2019-07-18 15:39:08 +02:00
Anton Ignatov
1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Anton Ignatov
ba1d6d45ca Fix merging issues 2019-07-12 15:47:15 +02:00
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Miha Mencin
ab9b7a7429
Merge pull request #1902 from biosistemika/release-1.16.6 
Merge 'release-1.16.6' into 'master'
 2019-07-08 12:49:40 +02:00
Alex Kriuchykhin
82708f0124
Merge pull request #1891 from okriuchykhin/ok_SCI_3654 
Fix project page view saving [SCI-3654]
 2019-07-08 11:46:54 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
aignatov-bio
88dc2dcdd0
Hot fix for TinyMCE asset permission check (#1896) 
* Hot fix for TimyMCE asset permission check
 2019-07-04 15:59:11 +02:00
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
aignatov-bio
d147e8260d
Fix issue with moving protocol in repository (#1887) 2019-07-03 15:35:37 +02:00
Oleksii Kriuchykhin
e16cb513e1 Fix project page view saving [SCI-3654] 2019-07-03 15:34:16 +02:00
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00
Anton Ignatov
1f40fa69fc Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-07-01 11:51:27 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Anton Ignatov
c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +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
Oleksii Kriuchykhin
ba2daede0b Add migration scripts [SCI-3539] 2019-06-24 15:17:42 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Alex Kriuchykhin
db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436 
Implement saving of attachments ordering on steps [SCI-3436]
 2019-06-20 11:31:15 +02:00
Oleksii Kriuchykhin
f2b617ac12 Fix code formatting [SCI-3436] 2019-06-19 14:23:12 +02:00
Oleksii Kriuchykhin
ae1a63037b Raise an exception if required methods for ViewableModel are not implemented [SCI-3436] 2019-06-19 14:17:17 +02:00
aignatov-bio
9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835) 
* Convert image to base64 in PDF reports

* Fix typo error
 2019-06-19 13:57:04 +02:00
Urban Rotnik
807104035c Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated 2019-06-17 12:24:09 +02:00
aignatov-bio
68937dd192
Fix RTE import for protocol repository (#1833) 2019-06-14 16:20:27 +02:00