scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-12 07:34:35 +08:00
Code Issues Projects Releases Packages Wiki Activity
5787 commits 53 branches 189 tags 169 MiB
Commit graph

325 commits

Author SHA1 Message Date
Anton Ignatov
c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +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
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
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
Oleksii Kriuchykhin
a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin
e543a849d4 Add document file preview generation with LibreOffice [SCI-3145] 2019-06-05 14:52:30 +02:00
Alex Kriuchykhin
db399864f8
Merge pull request #1820 from okriuchykhin/ok_SCI_3526 
Update Handsontable to 6.2.2 [SCI-3526]
 2019-06-04 14:59:22 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808) 
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
 2019-06-04 14:40:21 +02:00
Oleksii Kriuchykhin
01a5a17bb4 Update Handsontable to 6.2.2 [SCI-3526] 2019-06-04 14:31:37 +02:00
Anton Ignatov
c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
Oleksii Kriuchykhin
84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +02:00
aignatov-bio
2cee46a10d
Fix experiment name length (#1789) 2019-05-21 15:54:01 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787) 
* Refactor avatar appearance across Scinote
 2019-05-21 15:19:44 +02:00
Oleksii Kriuchykhin
1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
Anton Ignatov
259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Alex Kriuchykhin
bcbaf73669
Merge pull request #1773 from okriuchykhin/ok_SCI_3468 
Add permission checking to inline editor fields [SCI-3468]
 2019-05-15 17:49:15 +02:00
Oleksii Kriuchykhin
2ef926e795 Add permission checking to inline editor fields [SCI-3468] 2019-05-15 17:47:09 +02:00
aignatov-bio
24e30867da
Add smart annotation to comments [SCI-3458] (#1768) 
* Add smart annotation to comments
 2019-05-15 14:59:15 +02:00
Miha Mencin
5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426 
Changes to create new office file button [SCI-3426]
 2019-05-13 10:55:58 +02:00
aignatov-bio
71b3228310
Update protocol preview style [SCI-3416] (#1729) 
* Update protocol appearance
 2019-05-13 10:45:12 +02:00
Anton Ignatov
e5b4adcc25 Merge branch 'master-with-note-section' into features/marvinjs-integration 2019-05-11 20:51:01 +02:00
Luka Murn
5135922254 Move the WOPI controls partial to /wopi folder, fix typo 2019-05-10 16:51:54 +02:00
Anton Ignatov
b5271bdd2c Add remote api support 2019-05-08 15:00:36 +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
4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +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
Anton Ignatov
2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +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
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
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio
ffb0db06b9
Add scroll to team selector (#1659) 2019-04-12 09:17:14 +02:00
Oleksii Kriuchykhin
c47d243b1f Disable WOPI edit button in read only mode [SCI-3281] 2019-04-02 17:45:26 +02:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Anton Ignatov
29b67be127 Fix team selection in global activities and add link from navbar 2019-03-20 10:33:22 +01:00
aignatov-bio
6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] (#1568) 
*Add permission check for assets editing

* Add check for image format
 2019-03-19 13:52:57 +01:00
Oleksii Kriuchykhin
a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
645930b8d7 Merge branch 'master' into features/note-section 2019-03-14 16:25:51 +01:00
Oleksii Kriuchykhin
feb75f62e1 Add workaround for image caching in fabric js [SCI-2855] 2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin
80e525fd97 Improve image editor behaviour [SCI-2855] 2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Oleksii Kriuchykhin
0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +01:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524) 
* Adding inline editing to experiment title, project title and task title
 2019-03-06 09:17:34 +01:00
Anton Ignatov
f636b5adff Remove script from modal 2019-03-01 14:56:06 +01:00
Urban Rotnik
3121bf1d39 Update tooltip for system notifications dropdown 2019-02-27 14:49:18 +01:00