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

4296 commits

Author SHA1 Message Date
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
aignatov-bio
60296419e8
Update project card due date dropdown (#1716) 2019-04-30 13:30:09 +02:00
Anton Ignatov
7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
mlorb
9f0983de77
Merge pull request #1706 from mlorb/ml-sci-3350 
Change ownership of inventory items, when a user leaves a team [SCI-3350]
 2019-04-30 10:39:14 +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
687b53feb1
Add new tag activtiies [SCI-3341] (#1712) 
* Add new tag activtiies
 2019-04-30 10:23:09 +02:00
Jure Grabnar
b37349624a
Merge pull request #1714 from biosistemika/jg_sci_3380 
Add editnew action for editing new office files [SCI-3380]
 2019-04-30 09:57:07 +02:00
Jure Grabnar
ed003aca13 Add editnew action for editing new office files 
Closes SCI-3380
 2019-04-30 08:19:52 +02:00
aignatov-bio
7d197a6f02
Remove gray step headers (#1713) 2019-04-29 14:06:55 +02:00
Mojca Lorber
5fd4c47388 Move change owner functionality to RepositoryRow 2019-04-29 14:02:02 +02:00
Miha Mencin
a16b2cdf03
Merge pull request #1704 from urbanrotnik/ur-sci-3388-icon-for-deleting-is-visible 
Hide icon for deleting [SCI-3388]
 2019-04-29 10:15:18 +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
Miha Mencin
970a9b42ed
Update hilightjs github theme path 2019-04-26 17:29:14 +02:00
Urban Rotnik
dba1ccfc34
Merge pull request #1705 from urbanrotnik/ur-sci-3387-office-files-icons 
Show icons for office files [SCI-3387]
 2019-04-26 15:53:53 +02:00
Urban Rotnik
3b063348ce Hide remove icon and show only on attachment hover 2019-04-26 15:51:35 +02:00
Urban Rotnik
090df87f48
Merge pull request #1703 from urbanrotnik/ur-sci-3382-duplicated-complete-button 
Remove duplicated button [SCI-3382]
 2019-04-26 15:46:57 +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
Alex Kriuchykhin
c735607930
Merge pull request #1701 from okriuchykhin/ok_SCI_3391 
Fix sorting by user name with search parameter in inventories [SCI-3391]
 2019-04-26 15:39:48 +02:00
Alex Kriuchykhin
5d85ac0a95
Merge pull request #1702 from okriuchykhin/ok_SCI_3390 
Fix loading more activities on task page [SCI-3390]
 2019-04-26 15:39:31 +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
mlorb
12564bd070
Merge pull request #1686 from mlorb/ml-sci-3324 
Add activity for importing inventory items [SCI-3324]
 2019-04-26 15:20:40 +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
Mojca Lorber
9e04eb8ea1 Fixes upon Urbans request 2019-04-26 11:34:53 +02:00
Mojca Lorber
eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
Urban Rotnik
c41413234c Use MS office icons for MS files 2019-04-26 09:29:39 +02:00
Urban Rotnik
c94d3ce950 Remove duplicated button 2019-04-26 07:57:46 +02:00
Alex Kriuchykhin
6bb19ed0be
Merge pull request #1697 from okriuchykhin/ok_SCI_3264 
Update limits for new rich text enabled fileds [SCI-3264]
 2019-04-25 23:54:05 +02:00
Oleksii Kriuchykhin
66631ba26c Fix loading more activities on task page [SCI-3390] 2019-04-25 23:50:00 +02:00
Oleksii Kriuchykhin
3c1774d330 Fix sorting by user name with search parameter in inventories [SCI-3391] 2019-04-25 16:29:41 +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
Anton Ignatov
e52b985e7b xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes 2019-04-24 13:40:41 +02:00
Oleksii Kriuchykhin
a3f5974dbd Update limits for new rich text enabled fileds [SCI-3264] 2019-04-24 13:37:22 +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