scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 22:44:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
5834 commits 43 branches 185 tags 169 MiB
Commit graph

1698 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
d942788581 Implement read permissions checks for ActiveStorage controllers [SCI-3680] 2019-08-07 15:21:41 +02:00
aignatov-bio
aa5061a1af
Add custom context menu to TinyMCE images [SCI-3582] (#1944) 
* Add custom context menu to TinyMCE images

* Fix permission check for unsaved objects

* Fix markup
 2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin
f3849e2ece Fix TinyMCE plugings config [SCI-3679] 2019-08-06 15:46:55 +02:00
Oleksii Kriuchykhin
eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin
423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Oleksii Kriuchykhin
ccf76b8531 Move repository_datatable to JS file [SCI-3679] 2019-07-26 13:00:25 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Anton Ignatov
3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio
4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
Anton Ignatov
ad7130d3b2 Simplify TinyMCE assets for MarvinJS 2019-07-19 09:27:03 +02:00
Anton Ignatov
d79fec3345 Move TinyMCE logic to correspond controller 2019-07-16 15:51:44 +02:00
Anton Ignatov
03a45d7dd8 Fix markup 2019-07-16 13:42:39 +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
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Anton Ignatov
6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +02:00
aignatov-bio
83bc9eb22f
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation 
Adding new activities for image editing [SCI-3369]
 2019-06-24 10:31:39 +02:00
aignatov-bio
57e0478b81
Merge pull request #1855 from aignatov-bio/ai-sci-3583-fix-table-header-in-report 
Fix handsontable [SCI-3583]
 2019-06-24 09:39:35 +02:00
aignatov-bio
81c76fb112
Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated 
Fix comments counter for zero comments [SCI-3586]
 2019-06-24 09:39:22 +02:00
Anton Ignatov
ab73987245 improve connector perfomance 2019-06-23 00:48:50 +02:00
Anton Ignatov
31c6802a06 Add support for marvinjs on service 2019-06-23 00:09:49 +02:00
Anton Ignatov
8240c8baad Initial refactoring for remote api support 2019-06-22 01:51:59 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Anton Ignatov
76e09a2a3d Clear TinyMce autosave after manual save 2019-06-21 14:21:03 +02:00
Anton Ignatov
dfece85ea1 Fix handsone table 2019-06-21 11:16:44 +02:00
Anton Ignatov
57ef9573f2 Fix comments counter for zero comments 2019-06-21 10:43:41 +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
Anton Ignatov
df344f4d03 Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation 2019-06-20 09:43:53 +02:00
Anton Ignatov
a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
aignatov-bio
83b9efd7dd Fix right floating images in RTE editor (#1842) 2019-06-19 14:06:33 +02:00
aignatov-bio
609c408c77 Fix error on new step saving command (#1845) 2019-06-19 14:06:25 +02:00
aignatov-bio
5734d0cdd7 Fix TinyMCE field selector for steps (#1844) 2019-06-19 14:06:16 +02:00
aignatov-bio
81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
aignatov-bio
fb3b7918af
Fix handson table issue (#1827) 2019-06-14 16:21:27 +02:00
aignatov-bio
2dfbdacfa3
Change restore button background (#1829) 2019-06-14 16:21:01 +02:00
aignatov-bio
da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00
Anton Ignatov
f480c0eb8d Adding new activtiies for image editing 2019-06-14 16:15:30 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800) 
* Add recent protocols dropdown to task page
 2019-06-13 15:47:29 +02:00
Alex Kriuchykhin
bc94771828
Merge pull request #1791 from okriuchykhin/ok_SCI_3461 
Refactor the async thumbnail reloading (spinner) [SCI-3461]
 2019-06-12 15:35:15 +02:00
Alex Kriuchykhin
4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller 
Fix nil issue in tags_my_module controller [SCI-3525]
 2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin
a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00