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

5236 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 51f6644c16
Merge pull request #1567 from aignatov-bio/ai-sci-3166-finalize-the-global-activites 
[SCI-3166] Finalize global activities front end
 2019-03-20 09:02:48 +01:00
Luka Murn 9efeb32077
Merge pull request #1560 from biosistemika/lm-fix-rubocop-line-length 
Change line length in rubocop to 120
 2019-03-19 16:15:50 +01:00
Mojca Lorber cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Mojca Lorber 7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik 1017836c0e Activities service fix 2019-03-19 14:12:39 +01:00
Urban Rotnik fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +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
Anton Ignatov f606210652 Rubocop fix 2019-03-19 13:52:03 +01:00
Anton Ignatov 87280f083a [SCI-3166] Finalize global activities front end 2019-03-19 13:50:55 +01:00
Alex Kriuchykhin 2e987ceed3
Merge pull request #1570 from okriuchykhin/ok_SCI_2997 
Add viewing permissions for global activities [SCI-2997]
 2019-03-19 11:09:35 +01:00
aignatov-bio a0a3c4b97f
Fix file format bug (#1569) 2019-03-19 11:06:36 +01:00
Jure Grabnar 8831ebdcc9
Merge pull request #1559 from jbargu/jg_sci_2949 
Office file in inventory item can be edited in spite of assigned item to a locked task[SCI-2949]
 2019-03-18 21:11:51 +01:00
Oleksii Kriuchykhin 0c71493fdb Add viewing permissions for global activities [SCI-2997] 2019-03-18 15:38:19 +01:00
Urban Rotnik 3802d417ce
Merge pull request #1562 from urbanrotnik/ur-SCI-3138-new-activities 
New global activities [SCI-3138]
 2019-03-18 09:07:50 +01:00
Luka Murn a4ce2b66ce
Merge pull request #1565 from Ducz0r/lm-fix-stack-trace-on-wopi-middleware 
Fix stack trace trimming on WOPI middleware
 2019-03-15 14:34:22 +01:00
Urban Rotnik 5dccdbab17 fixup! Fix failing tests 2019-03-15 11:12:10 +01:00
Urban Rotnik 2ea2700837 fixup! Fix failing tests 2019-03-15 10:30:51 +01:00
Oleksii Kriuchykhin 06b5667ec5 Update VERSION to 1.15.8 2019-03-14 11:12:41 +01:00
Alex Kriuchykhin 81a25d9f84
Merge pull request #1564 from okriuchykhin/rails_update 
Update Rails to 5.1.6.2
 2019-03-14 09:56:00 +01:00
Luka Murn fc4b271803 Fix stack trace trimming on WOPI middleware 2019-03-14 08:34:04 +01:00
Oleksii Kriuchykhin 0b0141de5f Update Rails to 5.1.6.2 2019-03-13 20:32:29 +01:00
Miha Mencin 70f7161c65
Update version 2019-03-13 14:45:07 +01:00
Urban Rotnik c65d1af18d Fix failing tests 2019-03-13 09:53:34 +01:00
Urban Rotnik b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik 3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik 7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik 976831e7d3 Edit and Archive experiment activity logging 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 ea59482bef
Merge pull request #1551 from urbanrotnik/ur-SCI-3103-implement-changes-to-activity-logging 
Global activities creating service [SCI-3103]
 2019-03-12 09:03:09 +01:00
Anton Ignatov b6480b04a9 Fixed conflicts 2019-03-11 15:36:56 +01:00
Oleksii Kriuchykhin af94f79f0d Submit image as FormData [SCI-2879] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin 7315db73f1 Add missing semicolon [SCI-2856] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin 37dc8298b7 Fix webpack config [SCI-2856] 2019-03-11 15:13:06 +01:00
Oleksii Kriuchykhin 9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin ded74044de Fix circle icon in image editor [SCI-2855] 2019-03-11 15:10:38 +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
Urban Rotnik 3992336db9 Add type and value_for attributes to user hash 2019-03-11 08:37:22 +01:00
Urban Rotnik b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik ad8e5973fa Remove not null constraint from project_id in Activity table 2019-03-11 08:36:15 +01:00