scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-25 00:03:27 +08:00
Code Issues Projects Releases Packages Wiki Activity
6081 commits 50 branches 188 tags 169 MiB
Commit graph

320 commits

Author SHA1 Message Date
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
d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin
973fc775c0 Enforce file size limits for direct uploads on S3 [SCI-3681] 2019-08-06 17:09:00 +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
Anton Ignatov
f35f4886a3 Fix markup 2019-07-29 10:18:34 +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
0702dacc5b Security fixes 2019-07-19 14:10:38 +02:00
Anton Ignatov
ad7130d3b2 Simplify TinyMCE assets for MarvinJS 2019-07-19 09:27:03 +02:00
Anton Ignatov
bdc2dbbac1 Simplify image creation 2019-07-18 14:29:24 +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
Miha Mencin
47d3315d82 SCI-3702 revert the fix and use local variables 2019-07-15 16:20:39 +02:00
Miha Mencin
1c84e46a21 Revert "SCI-3702 replace _to_text with _to_html" 
This reverts commit 93b7c472ac.
 2019-07-15 16:18:26 +02:00
Miha Mencin
93b7c472ac SCI-3702 replace _to_text with _to_html 2019-07-15 16:16:41 +02:00
Jure Grabnar
a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +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
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
aignatov-bio
5ca822a7d8
Add archive lables and fix bright colors in RTE fields (#1923) 2019-07-12 11:38:48 +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
Urban Rotnik
cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
aignatov-bio
c8b0d87054
Fix global links in reports (#1894) 2019-07-09 09:35:43 +02:00
mlorb
7272d838b6
Merge pull request #1875 from mlorb/ml-sci-3618 
Remove unassign_user_from_project notification…[SCI-3618]
 2019-07-08 15:23:06 +02:00
Jure Grabnar
ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio
0d1ec0d4ed
Fix I18n and constants in DOCX report (#1901) 2019-07-08 12:51:26 +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
Jure Grabnar
dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +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
Oleksii Kriuchykhin
e16cb513e1 Fix project page view saving [SCI-3654] 2019-07-03 15:34:16 +02:00
Oleksii Kriuchykhin
028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar
4715e8ec4b Fix building of zero steps protocls 
Close SCI-3648
 2019-07-03 09:34:15 +02:00
aignatov-bio
b1a74a893c
Remove strange symbol (#1874) 2019-07-02 11:21:14 +02:00
Mojca Lorber
41935a9471 Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation 2019-07-01 13:44:27 +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
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
Jure Grabnar
bc4b07cc0f Refactor hardcoded protocol_source in SearchService 2019-06-28 02:26:31 +02:00
Jure Grabnar
0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Urban Rotnik
9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik
2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Jure Grabnar
06b8d1fda7 Update ApiClient tests 
Closes SCI-3434
 2019-06-27 14:54:19 +02:00