Anton Ignatov
|
7f296b35fa
|
Update team exporter for new tinymce images
|
2019-05-07 13:22:55 +02:00 |
|
Oleksii Kriuchykhin
|
3c1774d330
|
Fix sorting by user name with search parameter in inventories [SCI-3391]
|
2019-04-25 16:29:41 +02:00 |
|
aignatov-bio
|
6968060078
|
Fix user order bug (#1687)
|
2019-04-19 15:24:13 +02:00 |
|
Alex Kriuchykhin
|
8fa6bbc0ab
|
Merge pull request #1679 from okriuchykhin/ok_SCI_3177
Improve experiment preview image generation [SCI-3177]
|
2019-04-17 20:35:29 +02:00 |
|
Alex Kriuchykhin
|
b4cf665c21
|
Merge pull request #1673 from okriuchykhin/ok_SCI_3294
Fix team export/import for new activities [SCI-3294]
|
2019-04-17 12:49:45 +02:00 |
|
Oleksii Kriuchykhin
|
f9832013b0
|
Improve experiment preview image generation [SCI-3177]
|
2019-04-17 12:06:46 +02:00 |
|
Oleksii Kriuchykhin
|
2320941b5d
|
Fix team export/import for new activities [SCI-3294]
|
2019-04-15 15:13:10 +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 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
Oleksii Kriuchykhin
|
d378e33038
|
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-10 15:45:17 +02:00 |
|
Oleksii Kriuchykhin
|
01ffb43c23
|
Include old activites assigned to the task [SCI-3285]
|
2019-04-02 18:37:55 +02:00 |
|
Urban Rotnik
|
86ddbc68b6
|
fixup! Show date actual value without link
|
2019-04-02 14:21:06 +02:00 |
|
Urban Rotnik
|
8eaeeee9f8
|
Show date actual value without link
|
2019-04-02 13:15:34 +02:00 |
|
Urban Rotnik
|
6ec22c0b3b
|
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
|
2019-04-02 11:02:57 +02:00 |
|
aignatov-bio
|
daaa6a367b
|
Adding custom scrollbar to global activities [SCI-3206] (#1623)
* Adding custom scrollbar to global activities
|
2019-04-02 09:56:50 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
Alex Kriuchykhin
|
b3aa6be23d
|
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
Add global activities to reports [SCI-3255]
|
2019-04-01 15:07:06 +02:00 |
|
Jure Grabnar
|
e165459ef5
|
Merge pull request #1574 from jbargu/jg_sci_3149_3163
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
|
2019-04-01 14:32:54 +02:00 |
|
Jure Grabnar
|
83130426e2
|
Merge pull request #1617 from jbargu/jg_3244
Duplicated activity, report activity ... [SCI-3244]
|
2019-04-01 14:31:53 +02:00 |
|
Jure Grabnar
|
111b0e2b7f
|
Merge pull request #1615 from jbargu/jg_sci_3252
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
|
2019-04-01 12:30:48 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Jure Grabnar
|
3a79f7ca01
|
Add activity to save_pdf_to_inventory_item
|
2019-03-29 16:01:36 +01:00 |
|
Jure Grabnar
|
8bc10e1ca7
|
Change breadcrumbs for cloning experiment to destination project
|
2019-03-29 09:52:07 +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 |
|
Oleksii Kriuchykhin
|
d7d45bec70
|
Fix links for archived objects in global activities [SCI-3229]
|
2019-03-28 13:43:50 +01:00 |
|
Matej Zrimšek
|
318c322a1c
|
Fix sorting of custom columns on repository datatables
|
2019-03-27 12:58:55 +01:00 |
|
Matej Zrimšek
|
632835cf30
|
Fix fetching assigned repository rows when using filter & refactor it
|
2019-03-27 12:58:55 +01:00 |
|
Oleksii Kriuchykhin
|
2ff43a3320
|
Change filtering logic when no filters are selected [SCI-3223]
|
2019-03-26 16:04:03 +01:00 |
|
Alex Kriuchykhin
|
935e3a65cf
|
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
|
2019-03-26 16:02:44 +01:00 |
|
Miha Mencin
|
9a30d7be9d
|
SCI-3232 renaming the attribute name so it doesnt get 'constantized'
|
2019-03-26 11:39:54 +01:00 |
|
Oleksii Kriuchykhin
|
e3a3ec4491
|
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]
|
2019-03-25 17:38:13 +01:00 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
Jure Grabnar
|
5de51f9c58
|
Prevent smart annotations accessing other teams when importing protocol
Closes SCI-3163
|
2019-03-20 12:58:22 +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 |
|
Anton Ignatov
|
29b67be127
|
Fix team selection in global activities and add link from navbar
|
2019-03-20 10:33:22 +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 |
|
Anton Ignatov
|
87280f083a
|
[SCI-3166] Finalize global activities front end
|
2019-03-19 13:50:55 +01:00 |
|
Oleksii Kriuchykhin
|
0c71493fdb
|
Add viewing permissions for global activities [SCI-2997]
|
2019-03-18 15:38:19 +01:00 |
|
Urban Rotnik
|
b8e84b5685
|
Add logic for saving message items values and types
|
2019-03-11 08:37:22 +01:00 |
|
Urban Rotnik
|
117944117b
|
Add service for activity creation
|
2019-03-11 08:36:15 +01:00 |
|
Miha Mencin
|
6deaff6382
|
fixing hound errors
|
2019-03-04 18:36:32 +01:00 |
|
Miha Mencin
|
844303ae7c
|
SCI-3119 schedule the creaton of template
|
2019-03-01 17:47:04 +01:00 |
|
aignatov-bio
|
9a007b5d75
|
Merge pull request #1542 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity
Fix missing user name in activty, when moving experiment [SCI-3108]
|
2019-03-01 14:16:59 +01:00 |
|
Alex Kriuchykhin
|
985820a97c
|
Merge pull request #1527 from okriuchykhin/ok_SCI_3101
Move templates project creation for new team to delayed job [SCI-3101]
|
2019-03-01 13:55:49 +01:00 |
|
Oleksii Kriuchykhin
|
1fedb4c91e
|
Improve speed of index query in projects overview service [SCI-3107]
|
2019-02-28 17:46:34 +01:00 |
|
Anton Ignatov
|
9e472c0ccf
|
Fix missing user name in activty, when moving experiment
|
2019-02-28 16:06:23 +01:00 |
|
Oleksii Kriuchykhin
|
0266f6bd3c
|
Change search on subject query constaruction logic [SCI-3014]
|
2019-02-27 13:21:05 +01:00 |
|
Anton Ignatov
|
978c4bcb69
|
Fixed, trying to save object instead name
|
2019-02-27 10:43:46 +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
|
a0d2f7c676
|
Move templates project creation for new team to delayed job [SCI-3101]
|
2019-02-26 13:32:00 +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
|
3ad6cee766
|
Fix tests, remove nullable field
|
2019-02-25 16:50:38 +01:00 |
|
Urban Rotnik
|
7b6c6c414d
|
Merge branch 'master' into features/templates
|
2019-02-19 14:46:15 +01:00 |
|
aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +01:00 |
|
Urban Rotnik
|
f63eaaefe7
|
Add user_system_notification records when syncing notifications, update email sending
|
2019-02-19 11:22:58 +01:00 |
|
Oleksii Kriuchykhin
|
c186498a5e
|
Merge branch 'features/templates' into ok_SCI_3037
|
2019-02-15 10:47:38 +01:00 |
|
Alex Kriuchykhin
|
185e3b4832
|
Merge pull request #1495 from okriuchykhin/ok_SCI_3039
Create templates project when syncing templates if team doesn't have it [SCI-3039]
|
2019-02-14 17:40:01 +01:00 |
|
Mojca Lorber
|
343a46584f
|
Rename scope
|
2019-02-14 14:54:04 +01:00 |
|
Mojca Lorber
|
0e14c126e5
|
Add scope instead of method for active my_module_group
|
2019-02-14 10:53:48 +01:00 |
|
Urban Rotnik
|
5b55860dea
|
Add scheduler
|
2019-02-13 15:48:15 +01:00 |
|
Urban Rotnik
|
9f3187abdf
|
Add service for sync system notifications
|
2019-02-13 15:48:15 +01:00 |
|
Oleksii Kriuchykhin
|
da30d187a6
|
Create templates project when syncing templates if team doesn't have it [SCI-3039]
|
2019-02-13 15:17:33 +01:00 |
|
Oleksii Kriuchykhin
|
f3ad4f7fc9
|
Fix failing test [SCI-3037]
|
2019-02-12 13:39:38 +01:00 |
|
Mojca Lorber
|
d706a18e2d
|
Add flag for archived tasks to experiment exporter
|
2019-02-12 13:29:48 +01:00 |
|
Oleksii Kriuchykhin
|
7854b9d281
|
Merge branch 'features/templates' into ok_SCI_3037
|
2019-02-12 11:18:31 +01:00 |
|
Oleksii Kriuchykhin
|
445098fe45
|
Fix protocols in team export service [SCI-3037]
|
2019-02-12 10:56:15 +01:00 |
|
Alex Kriuchykhin
|
b71c9d96a2
|
Merge pull request #1476 from okriuchykhin/ok_SCI_2944
Add test for templates service [SCI-2944]
|
2019-02-12 09:39:03 +01:00 |
|
Jure Grabnar
|
0fa403d6b0
|
Refactor tests fro experiment import
Closes [SCI-2946]
|
2019-02-06 14:27:43 +01:00 |
|
Matej Zrimšek
|
f68adf1e5e
|
Fix workflow image loading for moved experiments [SCI-3003]
|
2019-02-06 07:51:43 +01:00 |
|
Oleksii Kriuchykhin
|
19f1585352
|
Add test for templates service [SCI-2944]
|
2019-02-01 18:06:36 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +01:00 |
|
Oleksii Kriuchykhin
|
cc57a8d4ef
|
Fix template project name generation [SCI-2939]
|
2019-01-30 10:56:22 +01:00 |
|
Oleksii Kriuchykhin
|
cc92de3726
|
Merge latest features/templates [SCI-2939]
|
2019-01-30 10:43:54 +01:00 |
|
Luka Murn
|
1f7bca485a
|
Merge pull request #1471 from biosistemika/master
Merge master into features/templates
|
2019-01-29 10:14:09 +01:00 |
|
Oleksii Kriuchykhin
|
f7b73c617a
|
Fix code styling [SCI-2939]
|
2019-01-28 15:37:24 +01:00 |
|
Urban Rotnik
|
4cf12d12d1
|
Refactor 'move_experiment' method into service object
Jira Ticket: SCI-2926
|
2019-01-28 11:45:36 +01:00 |
|
Oleksii Kriuchykhin
|
bd2efa55ac
|
Add templates business logic [SCI-2939]
|
2019-01-25 10:55:08 +01:00 |
|
Urban Rotnik
|
f1d59e65f3
|
Add module and rename service object
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
47cc6a9d10
|
Refactor workflow_image_generation and move to service class
|
2019-01-18 16:56:33 +01:00 |
|
Oleksii Kriuchykhin
|
fdf7db425b
|
Merge branch 'master' into features/templates
|
2019-01-18 14:41:21 +01:00 |
|
Jure Grabnar
|
761932282b
|
Fix Hound formatting
Closes SCI-2937
|
2019-01-16 16:11:38 +01:00 |
|
Jure Grabnar
|
d1f966ee05
|
Add importing of the experiment templates
|
2019-01-16 15:54:03 +01:00 |
|
Jure Grabnar
|
5b496a85d3
|
Experiment exporting works
|
2019-01-16 08:37:05 +01:00 |
|
Jure Grabnar
|
0184c97c61
|
Refactor TeamExporter into ModelExporter
|
2019-01-16 08:00:01 +01:00 |
|
Jure Grabnar
|
ff17a7e367
|
Fix S3_BUCKET not being defined
|
2019-01-14 16:49:08 +01:00 |
|
Alex Kriuchykhin
|
c2b38af91e
|
Merge pull request #1439 from okriuchykhin/ok_SCI_2888
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-10 11:05:07 +01:00 |
|
Oleksii Kriuchykhin
|
6a64b23f90
|
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-04 10:44:38 +01:00 |
|
Oleksii Kriuchykhin
|
d5c07fd22a
|
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-13 16:17:22 +01:00 |
|
Luka Murn
|
f56847e44a
|
Refactor team importer to use closed File.open blocks
|
2018-12-05 18:34:32 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Oleksii Kriuchykhin
|
7642d8d472
|
Fix sorting on projects table [SCI-2860]
|
2018-11-15 10:36:37 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
mz3944
|
056efe170b
|
Merge pull request #1358 from mz3944/mz-SCI-2646
Removal of the temporary files for export all [SCI-2646]
|
2018-11-13 20:31:04 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
Oleksii Kriuchykhin
|
145c66a834
|
Fix user counters on projects overview page [SCI-2847]
|
2018-11-12 11:52:38 +01:00 |
|