scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 10:06:53 +08:00
Code Issues Projects Releases Packages Wiki Activity
5549 commits 44 branches 180 tags 166 MiB
Commit graph

1383 commits

Author SHA1 Message Date
Luka Murn
890df8803e Add file name validation to create new Office file modal window 2019-05-10 18:19:32 +02:00
Luka Murn
5135922254 Move the WOPI controls partial to /wopi folder, fix typo 2019-05-10 16:51:54 +02:00
Luka Murn
b78caef915 Fix the file preview modal so it supports WOPI_ENABLED == false 2019-05-10 16:41:11 +02:00
Anton Ignatov
2e6bab4638 Fix smart anottation to protocols in repository 2019-05-09 09:40:40 +02:00
Anton Ignatov
7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +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
Mojca Lorber
9e04eb8ea1 Fixes upon Urbans request 2019-04-26 11:34:53 +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
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
774521df7a Changes to comments section in Task Steps 2019-04-23 15:02:58 +02:00
Urban Rotnik
11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Anton Ignatov
7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +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
6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
aignatov-bio
a75c4c2f91
Update Result API for new tiny mce image format (#1674) 2019-04-19 14:44:16 +02:00
Mojca Lorber
b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Urban Rotnik
782d1dfc2d
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2 
Exports left after export [SCI-3345]
 2019-04-16 14:44:48 +02:00
Urban Rotnik
4f8faba84e Exports left after export fix 2019-04-16 14:21:47 +02:00
Urban Rotnik
0ba0dccd57
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix 
Fix for exports_left, fix for some edge cases [SCI-3345]
 2019-04-16 10:32:31 +02:00
Urban Rotnik
22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
Urban Rotnik
7eeba0e57e
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix 
Dynamic filtering default fix [SCI-3343]
 2019-04-15 11:40:16 +02:00
Urban Rotnik
83f2a5c961 Dynamic filtering default fix 2019-04-15 11:20:43 +02:00
Alex Kriuchykhin
a61d637e6d
Merge pull request #1669 from okriuchykhin/ok_SCI_3340 
Fix crash when no activities present [SCI-3340]
 2019-04-15 11:13:25 +02:00
Oleksii Kriuchykhin
a43e42fdb3 Fix crash when no activities present [SCI-3340] 2019-04-15 10:51:59 +02:00
aignatov-bio
063f02dc56
Add ability to select filters with keyboard [SCI-3200] (#1649) 
* Add ability to select fitlers with keyboard
 2019-04-15 10:30:08 +02:00
aignatov-bio
8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
Alex Kriuchykhin
3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2 
Switch to kaminari pagination in global activities [SCI-3292]
 2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin
231106e131 Switch to kaminari pagination in global activities [SCI-3292] 2019-04-12 15:37:45 +02:00
Jure Grabnar
be90881849
Merge pull request #1665 from jbargu/jg_sci_2949_3318 
Disable editing of office file in view mode when module is locked [SCI-2949, 3318]
 2019-04-12 13:00:18 +02:00
Jure Grabnar
1e5721ce95 Disable editing of office file in view mode when module is locked 
Closes SCI-2949
 2019-04-11 17:21:07 +02:00
Alex Kriuchykhin
7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292 
Improve global activities pagination and fetching [SCI-3292]
 2019-04-11 16:23:37 +02:00
aignatov-bio
9377628f5e
Release team space after update image [SCI-3299] (#1656) 
* Release team space after update image
 2019-04-11 09:20:05 +02:00
Oleksii Kriuchykhin
d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
aignatov-bio
cfbb2a83a6
Merge pull request #1650 from aignatov-bio/ai-sci-3295-update-api-endpoints-new-activities 
Update API endpoints for new activities [SCI-3295]
 2019-04-10 13:46:30 +02:00
Urban Rotnik
caccf8d9f0 Reset counter for export in last 24 hours 
Fix for check if user has avaiable exports, bit refactored increas_counter method.
 2019-04-10 10:56:33 +02:00
aignatov-bio
e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644) 
* Add dynamic generating filters

* Add url methods
 2019-04-09 09:08:27 +02:00
Anton Ignatov
811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
Jure Grabnar
d60cc2cd1c Refactor create_wopi_file 2019-04-04 17:05:25 +02:00
Jure Grabnar
20446fb39d Hound formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar
983f90ddf6 Add file name presence check 2019-04-04 17:05:25 +02:00
Jure Grabnar
b12916b828 Add main functionality 2019-04-04 17:05:25 +02:00
Jure Grabnar
613843d095 Temp commit 2019-04-04 16:58:55 +02:00
Jure Grabnar
9a4cd4fda2 Add file_present true 2019-04-04 16:57:36 +02:00
Jure Grabnar
3b8e6fa47c Test office online 2019-04-04 16:57:36 +02:00
aignatov-bio
a1047f4597
Fix activities wording [SCI-3287] (#1635) 
* Fix activities wording

* Adding project to export protocol
 2019-04-04 10:45:35 +02:00
Alex Kriuchykhin
c86b535a25
Merge pull request #1638 from okriuchykhin/ok_SCI_3289 
Improve large image saving after editing [SCI-3289]
 2019-04-03 16:44:08 +02:00