scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-12 20:24:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
5553 commits 30 branches 180 tags 166 MiB
Commit graph

1589 commits

Author SHA1 Message Date
Anton Ignatov
b5271bdd2c Add remote api support 2019-05-08 15:00:36 +02:00
Anton Ignatov
dcf94e78e1 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-08 14:03:41 +02:00
aignatov-bio
d08bdd771e
Fix task tag cut off (#1734) 2019-05-08 10:21:59 +02:00
Miha Mencin
0a7696200a
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading 
Clear step edit textarea status before going to edit mode [SCI-3413]
 2019-05-07 16:36:04 +02:00
Miha Mencin
b31645adbe
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce 
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
 2019-05-07 16:35:49 +02:00
Miha Mencin
60fd1a02c6
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter 
Add task tag on enter button [SCI-3410]
 2019-05-07 16:35:34 +02:00
Miha Mencin
4b76151e40
Merge pull request #1727 from mlorb/ml-sci-3384 
Fix bug when saving empty step description [SCI-3384]
 2019-05-07 16:35:12 +02:00
Miha Mencin
7c088c8432
Merge pull request #1725 from aignatov-bio/ai-sci-3411-due-date-in-one-line 
Fix due date position [SCI-3411]
 2019-05-07 16:34:23 +02:00
Anton Ignatov
ea545801aa Clear edit textarea status before going to editmode 2019-05-07 15:54:32 +02:00
Anton Ignatov
826ed63f17 Fix floating tool bar and scroll issue after leaving editor 2019-05-07 15:21:15 +02:00
Anton Ignatov
168424a035 Add tag on enter button 2019-05-07 14:47:44 +02:00
aignatov-bio
7d54f2ab01
Fix issue with TInyMCE upload plugin (#1723) 2019-05-07 10:24:02 +02:00
Mojca Lorber
46e8f80965 Fix bug when saving empty step description 2019-05-06 17:14:19 +02:00
Anton Ignatov
2a294c408f Fix due date alignment and chage header structure from bootstrap to flexbox 2019-05-06 16:20:00 +02:00
aignatov-bio
4c1a64ce4f
Fix tags line up (#1722) 2019-05-06 14:19:32 +02:00
Alex Kriuchykhin
3f0401bf9a
Merge pull request #1709 from okriuchykhin/ok_SCI_3398 
Fix TinyMCE for results [SCI-3398]
 2019-05-06 10:47:11 +02:00
mlorb
df16b54be0
Merge pull request #1719 from mlorb/ml-sci-3399 
Visual fixes for edit/add step on protocol [SCI-3399]
 2019-05-06 10:33:28 +02:00
aignatov-bio
cc8a152278
Fix step attachments sorting (#1718) 2019-05-06 09:56:26 +02:00
Anton Ignatov
565a4959b4 small fixes and improvments 2019-05-03 15:24:28 +02:00
Anton Ignatov
88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-02 16:16:03 +02:00
Anton Ignatov
fef691d30f Add error handling and secutiry checks 2019-05-02 16:12:25 +02:00
Anton Ignatov
f73dd38780 Add image editor to tinymce drawings 2019-04-30 18:32:59 +02:00
Anton Ignatov
4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +02:00
Mojca Lorber
7be151bd2d Visual fixes for edit/add step on protocol 2019-04-30 14:57:50 +02:00
aignatov-bio
60296419e8
Update project card due date dropdown (#1716) 2019-04-30 13:30:09 +02:00
aignatov-bio
26dc1a0a4a
Note section css issues [SCI-3378] (#1715) 
* Fix step name width bug
 2019-04-30 10:23:44 +02:00
aignatov-bio
7d197a6f02
Remove gray step headers (#1713) 2019-04-29 14:06:55 +02:00
Anton Ignatov
f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov
2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +02:00
Anton Ignatov
260810fff8 Add editing mode for tinymce images 2019-04-28 16:16:31 +02:00
Anton Ignatov
193edfbc35 Add marvin js support to TinyMCE 2019-04-27 22:54:59 +02:00
Anton Ignatov
54731856f0 Finish step chemical attachments 2019-04-27 19:08:40 +02:00
Anton Ignatov
cf4ff41ec6 Add delete feature 2019-04-27 13:51:35 +02:00
Anton Ignatov
46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov
fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov
baa9b94a63 Add new graph button to step 2019-04-26 20:33:20 +02:00
Anton Ignatov
40c1c9aef7 Add marvin js modal 2019-04-26 18:24:21 +02:00
Oleksii Kriuchykhin
077ad52d4b Fix TinyMCE for results [SCI-3398] 2019-04-26 17:37:01 +02:00
Urban Rotnik
3b063348ce Hide remove icon and show only on attachment hover 2019-04-26 15:51:35 +02:00
Urban Rotnik
88050b9b93
Merge pull request #1707 from urbanrotnik/ur-sci-3383-task-name-not-editable 
Fix for inline editing on Firefox [SCI-3383]
 2019-04-26 15:46:37 +02:00
aignatov-bio
dc7fddc60a
Improve task tags (#1708) 2019-04-26 15:38:33 +02:00
aignatov-bio
9fbfa9215e
Add zoom to image annotation [SCI-3374] (#1694) 
* Add zoom to image annotation
 2019-04-26 15:21:01 +02:00
aignatov-bio
57b80280dc
Update attachemnts css (#1700) 2019-04-26 15:20:39 +02:00
Urban Rotnik
8413ed5ab0 Fix for inline editing on Firefox 2019-04-26 14:22:18 +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
0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes 
Comments section changes [SCI-3135]
 2019-04-25 14:18:05 +02:00
Anton Ignatov
0779ed598b Reuse inline editing logic 2019-04-25 11:14:55 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] (#1689) 
* Update protocol repository for new description format

* move image clone method to concerns
 2019-04-24 13:34:56 +02:00
Urban Rotnik
f894bca694 Add saving event when user clicks out of textarea 2019-04-23 15:02:59 +02:00
Urban Rotnik
774521df7a Changes to comments section in Task Steps 2019-04-23 15:02:58 +02:00