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

76 commits

Author SHA1 Message Date
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
aignatov-bio 68284c10da Add task description and task protocol description activities 2019-11-27 14:37:53 +01:00
Anton Ignatov fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin 267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
Urban Rotnik 89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
Miha Mencin d1ecdedd59 SCI-3768 remove .freeze from multiple constants 2019-08-12 22:31:47 +02:00
Urban Rotnik 7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik 32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik 171cdb319b Add ShareInventory activities 2019-08-09 14:13:01 +02:00
Urban Rotnik f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
aignatov-bio 6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Anton Ignatov a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
Anton Ignatov f480c0eb8d Adding new activtiies for image editing 2019-06-14 16:15:30 +02:00
aignatov-bio d3aa6371cd
Fix report saving [SCI-3443] (#1753) 
* Fix report saving

* Fix the report saving by using the reports' structures

* Remove uneccesary yarn.lock (mistake)
 2019-05-13 10:55:08 +02:00
aignatov-bio 0b194eb3b1
Revert "Fix report saving (#1748)" (#1752) 
This reverts commit 3db6129808.
 2019-05-13 09:09:36 +02:00
aignatov-bio 3db6129808
Fix report saving (#1748) 2019-05-13 08:58:47 +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
Oleksii Kriuchykhin 7c91b4a255 Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266 2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin c7a707f9db Fix task clonning with TinyMCE images [SCI-3266] 2019-04-23 15:16:40 +02:00
Mojca Lorber b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +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
Mojca Lorber 501c46bc92 Remove activities that belong to addons 2019-04-05 16:25:22 +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
Jure Grabnar 22d193114e Add asset to activity message item type 
Closes SCI-3283
 2019-04-02 16:10:20 +02:00
aignatov-bio e6102c72c7
Adding missed activities [SCI-3253] (#1614) 
* Adding missed activties

* Adding test for activities
 2019-04-02 11:50:37 +02:00
Urban Rotnik b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Mojca Lorber 3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
aignatov-bio 5c8f976ad1
Adding missed project comment activities [SCI-3250] (#1612) 
* Adding missed project comment activities

* Fix markup
 2019-03-29 11:45:31 +01:00
aignatov-bio b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] (#1605) 
* Adding children selector to global activities subjects

* Fix naming, add seperate check for project id
 2019-03-29 09:26:27 +01:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
aignatov-bio 54fd3a748b
Adding activity groups [SCI-3203] (#1588) 
* Adding activty groups
 2019-03-26 15:29:21 +01:00
Mojca Lorber 4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Mojca Lorber cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber 1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
Urban Rotnik 32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 1a3c97b978 Add new enum values for Activity type_of 2019-03-12 09:11:00 +01:00
Urban Rotnik b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin 74a60d443d Merge branch 'features/global-activities' into ok_SCI_3014_v2 2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin 61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Urban Rotnik 5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik 863e3873c2 Comment for depricated NotificationType 2019-01-29 11:40:26 +01:00
Oleksii Kriuchykhin ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Luka Murn 7b5a65416a Update status endpoint 2018-10-06 11:47:23 +02:00
Oleksii Kriuchykhin 0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00