scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5642 commits 70 branches 179 tags 165 MiB
Commit graph

5642 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin d378e33038 Improve global activities pagination and fetching [SCI-3292] 2019-04-10 15:45:17 +02:00
aignatov-bio f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload 
Improve the image file upload into RTE input fields [SCI-3131]
 2019-04-10 14:04:06 +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
Mojca Lorber c8ddae4d1e Fix activity card visuals 2019-04-10 12:37:13 +02:00
Urban Rotnik 0fb745a38c
Merge pull request #1645 from urbanrotnik/ur-sci-3234-export-all-counter-reset 
Reset counter for export [SCI-3234]
 2019-04-10 11:57:02 +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
Urban Rotnik 18c1c3c22c enable ScssLint 2019-04-09 15:57:47 +02:00
aignatov-bio 7ef7e2397f
Change activity filter order and reduce custom date label size [SCI-3301] (#1651) 
* Change activity filter order and reduce custom date label size

* Fix hound
 2019-04-09 14:18:22 +02:00
Urban Rotnik ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Urban Rotnik a3932cc67f New asset box style update 2019-04-09 14:17:40 +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
aignatov-bio a086f88541
Disable save button while image loading (#1646) 2019-04-09 09:07:58 +02:00
Anton Ignatov 811f07a62c Update API endpoints for new activities 2019-04-08 15:07:45 +02:00
mlorb f566dd6c83
Merge pull request #1648 from mlorb/ml-sci-3214 
Remove activities that belong to addons [SCI-3214]
 2019-04-08 11:48:55 +02:00
Mojca Lorber 501c46bc92 Remove activities that belong to addons 2019-04-05 16:25:22 +02:00
Urban Rotnik 2cbf70819f
Merge pull request #1647 from urbanrotnik/ur-sci-3134 
Change step header, remove vertical line
 2019-04-05 11:08:49 +02:00
Urban Rotnik 26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar bc9eff2ef5 Add asset validation on wopi creation 
Missing file
 2019-04-04 17:05:25 +02:00
Jure Grabnar d9a9045658 Hound formatting 2019-04-04 17:05:25 +02:00
Jure Grabnar d60cc2cd1c Refactor create_wopi_file 2019-04-04 17:05:25 +02:00
Jure Grabnar 56bb62c5b0 Addtional formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar 20446fb39d Hound formatting fixes 2019-04-04 17:05:25 +02:00
Jure Grabnar 7ac88ee84b Change icons to be relative 2019-04-04 17:05:25 +02:00
Jure Grabnar cbf109f884 Fix create WOPI file button 
Closes SCI-3137
 2019-04-04 17:05:25 +02:00
Jure Grabnar fddff9c627 Perform styling on the WOPI modal 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 38e47b93ab Update labels 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
Miha Mencin ea4cc7ba0f
Update VERSION to 1.16.0 
Update VERSION to 1.16.0
 2019-04-04 11:07:42 +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
Miha Mencin 5a73f3f72c
Merge pull request #1643 from biosistemika/SCI-3286-fix-deleted-reports-activities 
[SCI-3286] Once result is deleted all corresponding results activity are deleted as well
 2019-04-04 10:43:29 +02:00
Miha Mencin 97d9fde3fd SCI-3286 add breadcrumbs to the report activity 2019-04-04 10:30:31 +02:00
Alex Kriuchykhin ce63f077d8
Merge pull request #1642 from okriuchykhin/ok_SCI_3290 
Disable inventory import activity logging [SCI-3290]
 2019-04-04 00:53:33 +02:00
Oleksii Kriuchykhin e7151e6e6b Disable inventory import activity logging [SCI-3290] 2019-04-03 22:42:33 +02:00
Alex Kriuchykhin 93b5d473c0
Merge pull request #1641 from okriuchykhin/ok_SCI_3290 
Fix activity generation with discarded inventories [SCI-3290]
 2019-04-03 21:19:45 +02:00
Oleksii Kriuchykhin d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Alex Kriuchykhin d8ce4d4a91
Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2 
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
 2019-04-03 21:14:36 +02:00
Jure Grabnar 834482c2a7
Merge pull request #1639 from jbargu/jg_3288 
Remove archive_task from extends.rb [SCI-3288]
 2019-04-03 21:13:42 +02:00
Oleksii Kriuchykhin 14978f7c1f Fix activity creation for editing wopi file in protocol repository [SCI-3281] 2019-04-03 19:51:54 +02:00
Jure Grabnar 7136294386 Remove archive_task from the list of activity_types 
Closes SCI-3288
 2019-04-03 19:13:00 +02:00
Alex Kriuchykhin 91d379fc78
Merge pull request #1636 from okriuchykhin/ok_SCI_3285 
Fix missing old activities on task activity page and user popup in global activities [SCI-3285]
 2019-04-03 19:04:13 +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
Oleksii Kriuchykhin 9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +02:00
Miha Mencin f7bc83935c
Merge pull request #1637 from jbargu/jg_sci_3273 
Wrong counter of step items, it now starts with one [SCI-3273]
 2019-04-03 14:56:09 +02:00
Jure Grabnar f00f4d39af Refactor step activities using position_plus_one 
Closes SCI-3273
 2019-04-03 13:10:45 +02:00
Jure Grabnar 26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Oleksii Kriuchykhin 8c2b2513b0 Fix user popup in global activities [SCI-3285] 2019-04-03 12:53:52 +02:00