Oleksii Kriuchykhin
|
e3bacd6b9a
|
Fix global activities page after refactoring [SCI-2994][SCI-3024]
|
2019-03-08 13:09:27 +01:00 |
|
Jure Grabnar
|
eceda4909f
|
Move edit_file permission for wopi file in a special function
Used for overwritting it in addons.
Closes SCI-2949
|
2019-03-08 12:22:35 +01:00 |
|
Oleksii Kriuchykhin
|
0b87e8e1e4
|
Merge branch 'features/global-activities' into ok_SCI_3024_v3
|
2019-03-08 10:29:51 +01:00 |
|
Alex Kriuchykhin
|
bb29a97962
|
Merge pull request #1557 from okriuchykhin/ok_SCI_3151
Improve JS files inclusion in export all [SCI-3151]
|
2019-03-07 17:46:45 +01:00 |
|
Oleksii Kriuchykhin
|
af9daf3a5e
|
Improve JS files inclusion in export all [SCI-3151]
|
2019-03-07 17:42:47 +01:00 |
|
Alex Kriuchykhin
|
ec1aec3bf1
|
Merge pull request #1556 from okriuchykhin/ok_SCI_3048
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:58:30 +01:00 |
|
Oleksii Kriuchykhin
|
0c99ea9c5c
|
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:46:05 +01:00 |
|
Oleksii Kriuchykhin
|
8cc95bf491
|
Embed tables JS files to main HTML of Export All [SCI-3151]
|
2019-03-07 14:23:10 +01:00 |
|
Alex Kriuchykhin
|
d5110a4f87
|
Merge pull request #1554 from okriuchykhin/ok_SCI_3150
Fix JS files inclusion in export all report [SCI-3150]
|
2019-03-07 11:17:51 +01:00 |
|
Oleksii Kriuchykhin
|
2b239e2f35
|
Fix JS files inclusion in export all report [SCI-3150]
|
2019-03-07 11:14:38 +01:00 |
|
aignatov-bio
|
ec2dbb897f
|
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
|
2019-03-06 10:34:04 +01:00 |
|
Miha Mencin
|
8fbda40c49
|
Merge pull request #1552 from biosistemika/mm-sci-3119-create-templates-at-login
put the scheduling logic into session create action
|
2019-03-05 10:56:48 +01:00 |
|
Miha Mencin
|
9807c80286
|
move the create action to the tope section of controller
|
2019-03-05 10:49:36 +01:00 |
|
Miha Mencin
|
67fe486874
|
put the scheduling logic into session create action
|
2019-03-05 10:43:39 +01:00 |
|
aignatov-bio
|
6dcaea973d
|
Merge pull request #1550 from aignatov-bio/ai-sci-3123-keep-title-bold
Bold text for read messages SCI-3123
|
2019-03-05 10:30:16 +01:00 |
|
Miha Mencin
|
6deaff6382
|
fixing hound errors
|
2019-03-04 18:36:32 +01:00 |
|
Miha Mencin
|
fa7bba9de7
|
scheduling creation of demo project at the sign in time
remove wrong schema, fix comment, add migration
|
2019-03-04 18:26:15 +01:00 |
|
Anton Ignatov
|
33682bb561
|
Bold text for read messages
|
2019-03-04 13:48:25 +01:00 |
|
Oleksii Kriuchykhin
|
c3705ccb25
|
Improve group collapse JS code [SCI-2994][SCI-3024]
|
2019-03-04 13:44:43 +01:00 |
|
Miha Mencin
|
2ba040980f
|
reverting the team changes, the scope is not needed
|
2019-03-01 17:48:38 +01:00 |
|
Miha Mencin
|
844303ae7c
|
SCI-3119 schedule the creaton of template
|
2019-03-01 17:47:04 +01:00 |
|
aignatov-bio
|
d69f8c5636
|
Merge pull request #1547 from aignatov-bio/ai-sci-3114-recapthca-bug
Remove script from modal SCI-3114
|
2019-03-01 14:58:49 +01:00 |
|
Anton Ignatov
|
f636b5adff
|
Remove script from modal
|
2019-03-01 14:56:06 +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 |
|
Alex Kriuchykhin
|
09ed7922da
|
Merge pull request #1543 from okriuchykhin/ok_SCI_3107
Improve speed of index query in projects overview service [SCI-3107]
|
2019-03-01 13:53:56 +01:00 |
|
Anton Ignatov
|
1ae4a60f79
|
Fix recaptha error
|
2019-03-01 12:58:31 +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 |
|
Miha Mencin
|
4f9daa9590
|
SCI-3112 Change the the comments in demo project generator
|
2019-02-28 11:39:44 +01:00 |
|
Miha Mencin
|
088a860683
|
Merge pull request #1539 from biosistemika/features/templates
Features/templates
|
2019-02-28 10:23:13 +01:00 |
|
Jure Grabnar
|
18c738263d
|
Merge pull request #1536 from jbargu/jg_sci_3100
Missing item smart annotation in Demo project [SCI-3100, 3098]
|
2019-02-28 09:52:28 +01:00 |
|
Miha Mencin
|
d03ef2cd2a
|
Merge branch 'master' into features/templates
|
2019-02-28 09:41:20 +01:00 |
|
Jure Grabnar
|
93490a1f47
|
Add missing created_at and fix typo
Closes SCI-3100, SCI-3098
|
2019-02-28 07:29:25 +01:00 |
|
Miha Mencin
|
a372ebf07d
|
Revert "Task info section improvements [SCI - 3058]"
|
2019-02-27 21:00:11 +01:00 |
|
Jure Grabnar
|
0fbbe8b5de
|
Add result comments to demo project
Closes [SCI-3100].
|
2019-02-27 20:32:28 +01:00 |
|
Miha Mencin
|
576520659c
|
Merge pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations
added uniquness validator and index on user_projects and user_teams r…
|
2019-02-27 19:53:25 +01:00 |
|
Oleksii Kriuchykhin
|
0930277c4e
|
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
|
2019-02-27 16:02:53 +01:00 |
|
Jure Grabnar
|
3acf9b71f8
|
Merge pull request #1525 from jbargu/jg_sci_3096_and_other_demo_issues
Demo project improvements [SCI-3096], [SCI-3097], [SCI-3098], [SCI-3099], [SCI-3102]
|
2019-02-27 15:43:14 +01:00 |
|
aignatov-bio
|
7ced0b367b
|
Merge pull request #1531 from aignatov-bio/ai-sci-3095-notification-bug-on-signup
First what's up notification user gets already at signup [SCI-3095]
|
2019-02-27 15:42:20 +01:00 |
|
Jure Grabnar
|
0699204d3b
|
Add changes for parallel exec discussed with Miha
|
2019-02-27 15:22:19 +01:00 |
|
Miha Mencin
|
51b3aea49a
|
added uniquness validator and index on user_projects and user_teams relations
finxing typo, fixied failing test
fixing mistakenly commited file
fixing schema to include bigint migration
|
2019-02-27 15:09:47 +01:00 |
|
Urban Rotnik
|
3121bf1d39
|
Update tooltip for system notifications dropdown
|
2019-02-27 14:49:18 +01:00 |
|
Anton Ignatov
|
a6666c688c
|
Adding check for user tutorial
|
2019-02-27 13:55:46 +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 |
|
Jure Grabnar
|
30bc536d07
|
Fix smart annotations in demo project
Closes SCI-3097, SCI-3102.
|
2019-02-26 14:36:48 +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 |
|
Jure Grabnar
|
2464a45f83
|
Fix ordering for another step in demo project
Closes SCI-3098.
|
2019-02-26 08:34:50 +01:00 |
|
Jure Grabnar
|
c409c39e60
|
Fix demo project's checklist item ordering
Closes SCI-3099.
|
2019-02-26 08:26:02 +01:00 |
|
Jure Grabnar
|
b6dd783114
|
Improve generation of a demo project
Closes SCI-3096
|
2019-02-26 08:06:07 +01:00 |
|
Urban Rotnik
|
c8ab9f8ff8
|
Fix tests
|
2019-02-26 08:04:05 +01:00 |
|
Urban Rotnik
|
5a123d26ac
|
Activity model update
|
2019-02-26 07:15:05 +01:00 |
|
Anton Ignatov
|
a4cabb203b
|
Task info section improvements
|
2019-02-25 16:55:09 +01:00 |
|
Urban Rotnik
|
3ad6cee766
|
Fix tests, remove nullable field
|
2019-02-25 16:50:38 +01:00 |
|
Miha Mencin
|
76c3db0b11
|
added layout, added css, added select2 lib, WIP
|
2019-02-25 16:50:38 +01:00 |
|
Urban Rotnik
|
5b5c6c7122
|
Changes to Activity model
|
2019-02-25 16:49:55 +01:00 |
|
aignatov-bio
|
0bf7cb4c59
|
Merge pull request #1519 from biosistemika/ai-adding-multiple-select-plugin
Adding new Select2 library with customizations
|
2019-02-25 16:46:07 +01:00 |
|
Jure Grabnar
|
4edab957a4
|
Merge pull request #1516 from jbargu/jg_sci_3069_due_date_red
Due date is not red for today anymore [SCI-3069]
|
2019-02-25 13:20:50 +01:00 |
|
Jure Grabnar
|
d7e91676c3
|
Rename initial experiment back to the old one
|
2019-02-24 08:13:57 +01:00 |
|
Jure Grabnar
|
b4199b28e4
|
Remove turbolinks:load from the project show page
Also rename Demo project experiment back to PCR.
Closes SCI-3081.
|
2019-02-22 19:46:42 +01:00 |
|
Anton Ignatov
|
6971d1a55d
|
Adding new Select2 library with customization
|
2019-02-22 16:40:33 +01:00 |
|
aignatov-bio
|
aa8a2b040a
|
Merge pull request #1518 from biosistemika/features/system-notifications
Notification changes on settings page [SCI 3084] (#1517)
|
2019-02-22 14:01:38 +01:00 |
|
aignatov-bio
|
606708987f
|
Notification changes on settings page [SCI 3084] (#1517)
* Fix css and update text settings
|
2019-02-22 13:20:51 +01:00 |
|
Jure Grabnar
|
f98d6fbd4d
|
Remove archived task in Demo project
Closes SCI-3082.
|
2019-02-22 11:58:32 +01:00 |
|
Jure Grabnar
|
f9cb8c8803
|
Add utc conversion to due_date
|
2019-02-22 10:47:39 +01:00 |
|
Jure Grabnar
|
87dcf301fb
|
Change due_date calculation to DateTime#end_of_day
|
2019-02-22 10:23:12 +01:00 |
|
Jure Grabnar
|
fb533eb9d3
|
Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed
Add action_name to sidebar cache as dependency [SCI-2930]
|
2019-02-22 10:04:57 +01:00 |
|
Jure Grabnar
|
7f0ea48dff
|
Merge pull request #1515 from jbargu/jg_sci_3080_demo_project_rename
Rename Demo project and create rake task to create it on existing users [SCI-3080]
|
2019-02-22 10:01:39 +01:00 |
|
Jure Grabnar
|
96f2da1e8b
|
Shift due day calculations for 1 day
Closes SCI-3069.
|
2019-02-22 08:01:15 +01:00 |
|
Jure Grabnar
|
ffe0493013
|
Rename Demo project and create rake task to create it on existing users
Closes SCI-3080.
|
2019-02-21 23:31:55 +01:00 |
|
Miha Mencin
|
bcd0b433b6
|
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-21 16:38:58 +01:00 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
Urban Rotnik
|
b50320a4bc
|
Add margin for system notification modal
|
2019-02-21 15:15:33 +01:00 |
|
Oleksii Kriuchykhin
|
db18f88807
|
Update templates to final version [SCI-3053]
|
2019-02-21 15:06:34 +01:00 |
|
Jure Grabnar
|
0fa06ea9fc
|
Merge pull request #1505 from jbargu/jg_sci_2928_few_turbolinks_bugs
Check for recaptcha enabled boolean value
|
2019-02-20 18:29:40 +01:00 |
|
aignatov-bio
|
5fdba554d2
|
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-20 17:22:57 +01:00 |
|
Urban Rotnik
|
82ea31e275
|
Add validation limits for system notification fields
|
2019-02-20 16:05:15 +01:00 |
|
Jure Grabnar
|
61f9df0656
|
Add action_name to sidebar cache as dependency
Closes SCI-2930.
|
2019-02-20 14:13:51 +01:00 |
|
aignatov-bio
|
35268252c8
|
After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] (#1504)
* Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr
|
2019-02-20 13:15:16 +01:00 |
|
Jure Grabnar
|
e392f9e61f
|
Check for recaptcha enabled boolean value
Closes SCI-2928.
|
2019-02-20 10:14:37 +01:00 |
|
Jure Grabnar
|
27ed8e781e
|
Merge pull request #1501 from jbargu/jg_sci_2985_recaptcha_invite_not_working
Recaptcha input field now addressed with jQuery
|
2019-02-20 08:44:23 +01:00 |
|
Alex Kriuchykhin
|
0a54eb8ebe
|
Merge pull request #1503 from biosistemika/features/templates
Merge features/templates to master
|
2019-02-19 15:07:42 +01:00 |
|
Urban Rotnik
|
7b6c6c414d
|
Merge branch 'master' into features/templates
|
2019-02-19 14:46:15 +01:00 |
|
Mojca Lorber
|
ebfacdd62c
|
change experiments title color
|
2019-02-19 14:24:23 +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 |
|
Jure Grabnar
|
ebdf9adab0
|
Recaptcha input field now addressed with jQuery
Fix SCI-2985
|
2019-02-19 13:05:33 +01:00 |
|
Urban Rotnik
|
d3d9868ba4
|
Set version for HTTParty dependency, add opts in mailer
|
2019-02-19 11:23:01 +01:00 |
|
Urban Rotnik
|
f63eaaefe7
|
Add user_system_notification records when syncing notifications, update email sending
|
2019-02-19 11:22:58 +01:00 |
|
Urban Rotnik
|
29d77ca81d
|
Add system_notification sending email feature
|
2019-02-19 11:20:25 +01:00 |
|
aignatov-bio
|
8e905b67b2
|
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
|
2019-02-19 11:08:59 +01:00 |
|
aignatov-bio
|
c598541e09
|
System notification modal window [SCI-2957 and SCI-2958] (#1484)
* Added new system notification modal
* Adding loading system notification on sign in
|
2019-02-15 13:07:29 +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 |
|
mlorb
|
71e4cc4dbd
|
Merge branch 'master' into ml-sci-2940
|
2019-02-13 14:35:03 +01:00 |
|
Mojca Lorber
|
0adb8b2b61
|
Fix failing tests
|
2019-02-13 14:31:26 +01:00 |
|
aignatov-bio
|
5c85595ab4
|
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
|
2019-02-13 13:06:14 +01:00 |
|
Mojca Lorber
|
16f99afbc0
|
Minor fixes
|
2019-02-13 12:20:14 +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 |
|
mlorb
|
8bad68c854
|
Merge pull request #1457 from mlorb/ml-sci-2933
Change experiment cards look and feel [SCI-2933]
|
2019-02-12 11:49:24 +01:00 |
|
Mojca Lorber
|
3b4a894124
|
fix hound
|
2019-02-12 11:24:44 +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 |
|
Mojca Lorber
|
d8cc482cbf
|
remove electronic signatures from templates
|
2019-02-11 17:51:48 +01:00 |
|
Mojca Lorber
|
78a29c4141
|
add templates after protocol_keyword_team rake task was run
|
2019-02-11 16:15:56 +01:00 |
|
Mojca Lorber
|
087832c29d
|
add templates
|
2019-02-11 14:02:49 +01:00 |
|
aignatov-bio
|
de75ec4600
|
Merge pull request #1485 from biosistemika/ai-sci-3006-inventory-order-bug
[SCI-3006] After changing order of inventory columns item can not be edited, deleted, copied
|
2019-02-11 13:50:13 +01:00 |
|
aignatov-bio
|
16164477ac
|
Merge pull request #1487 from biosistemika/ai-sci-3005-user-counter-card-not-updated
User counter on task card is not updated [SCI-3005]
|
2019-02-11 13:49:49 +01:00 |
|
Alex Kriuchykhin
|
b7d7e4bf10
|
Merge pull request #1488 from okriuchykhin/ok_SCI_3030
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-11 13:41:01 +01:00 |
|
Alex Kriuchykhin
|
11e0ccc24a
|
Merge pull request #1479 from okriuchykhin/ok_SCI_2967
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-11 12:56:31 +01:00 |
|
Oleksii Kriuchykhin
|
2ff5199be0
|
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-07 16:58:38 +01:00 |
|
Anton Ignatov
|
c389b7ab06
|
remove console.log from js
|
2019-02-07 14:26:15 +01:00 |
|
Anton Ignatov
|
c6ab6da381
|
Fixed counter bug SCI-3005
|
2019-02-07 14:23:37 +01:00 |
|
Oleksii Kriuchykhin
|
3376fd012c
|
Improve error loggin in protocol import [SCI-3023]
|
2019-02-07 14:00:24 +01:00 |
|
Anton Ignatov
|
4145b2565c
|
Fixed bug with order in inventories SCI-3006
|
2019-02-07 11:34:04 +01:00 |
|
Oleksii Kriuchykhin
|
fdff69f22e
|
Add comment for Tika start up code [SCI-2967]
|
2019-02-07 11:06:25 +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 |
|
Mojca Lorber
|
227aeb284c
|
change mydemo projects data
|
2019-02-05 11:15:16 +01:00 |
|
Oleksii Kriuchykhin
|
13c4bd25af
|
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-04 16:47:29 +01:00 |
|
Oleksii Kriuchykhin
|
a033e9b207
|
Fix Lato font loading [SCI-2969]
|
2019-02-04 15:36:17 +01:00 |
|
Oleksii Kriuchykhin
|
19f1585352
|
Add test for templates service [SCI-2944]
|
2019-02-01 18:06:36 +01:00 |
|
Miha Mencin
|
e84ab5b550
|
Merge pull request #1475 from biosistemika/mm-sci-2982-user-variables-bug
SciNoteSCI-2982 Investigate (plus, fix) the User.variables on my.scinote.net
|
2019-02-01 09:46:19 +01:00 |
|
mz3944
|
a315808d58
|
Merge pull request #1473 from mz3944/mz-SCI-2918
In html project export there is formula instead of result in table [SCI-2918]
|
2019-02-01 04:49:14 +01:00 |
|
Urban Rotnik
|
8ebb7561d9
|
Add last_time_changed_at columnd to SystemNotifications
|
2019-01-31 16:44:20 +01:00 |
|
Miha Mencin
|
d2dfe68e46
|
Changing double quotes to single quotes
|
2019-01-31 10:31:03 +01:00 |
|
Miha Mencin
|
3ec62758fe
|
SCI-2982, handle the empty json condition
|
2019-01-31 09:43:41 +01:00 |
|
Matej Zrimšek
|
ac78c7d21b
|
Process Handsontable formulas in project HTML files in team export [SCI-2918]
|
2019-01-31 07:39:17 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +01:00 |
|
mz3944
|
2ae56eb13f
|
Merge pull request #1448 from mz3944/mz-SCI-2929
Can not switch team [SCI-2929]
|
2019-01-31 04:43:39 +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 |
|
Urban Rotnik
|
3e2c9934d0
|
Add SystemNotification model
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
|
2019-01-29 11:40:26 +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 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +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
|
05edfae766
|
Fix failing tests [SCI-2939]
|
2019-01-25 14:13:00 +01:00 |
|
Miha Mencin
|
b67cee2e65
|
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug
SCI-2928 moving team modal js file to application.js.erb in order to …
|
2019-01-25 11:54:14 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
Urban Rotnik
|
247bae8a9f
|
Refactor export_all_counter increasing/reseting logic
- Remove daily task
- Add method to user Model
|
2019-01-25 11:16:31 +01:00 |
|
Oleksii Kriuchykhin
|
bd2efa55ac
|
Add templates business logic [SCI-2939]
|
2019-01-25 10:55:08 +01:00 |
|
mlorb
|
a297ef2094
|
Merge pull request #1443 from mlorb/ml-sci-2914
Allow org. administrators to invite them onto all projects [SCI-2914]
|
2019-01-24 16:24:57 +01:00 |
|
Mojca Lorber
|
fa1dff6352
|
refactor Demo project generation
|
2019-01-24 13:40:53 +01:00 |
|
mz3944
|
79d35de794
|
Merge pull request #1435 from mz3944/mz-SCI-2912
An error at archiving experiment with locked task [SCI-2912]
|
2019-01-24 05:27:58 +01:00 |
|
Miha Mencin
|
126a031498
|
SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded
|
2019-01-23 15:30:23 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +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 |
|
Urban Rotnik
|
686f10cbd0
|
Refactor instance method 'ordered_modules' to scope
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
1b70f42817
|
Refactor 'Experiment.modules_without_group' to Module's scope
|
2019-01-18 16:54:00 +01:00 |
|
mlorb
|
d2108ac3ea
|
fix hound
|
2019-01-18 16:16:00 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
fdf7db425b
|
Merge branch 'master' into features/templates
|
2019-01-18 14:41:21 +01:00 |
|
Oleksii Kriuchykhin
|
1861f86b2c
|
Improve export all modal messages in case of unlimited exports [SCI-2965]
|
2019-01-17 17:27:32 +01:00 |
|
Oleksii Kriuchykhin
|
e62e1873b0
|
Fix issue with caching in inventories dropdown [SCI-2776]
|
2019-01-17 15:04:20 +01:00 |
|
Alex Kriuchykhin
|
88cea198f0
|
Merge pull request #1452 from okriuchykhin/ok_SCI_2950
Fix binary files in Export All archive [SCI-2950]
|
2019-01-16 17:29:48 +01:00 |
|
Oleksii Kriuchykhin
|
4f9eb7e165
|
Fix binary files in Export All archive [SCI2950]
|
2019-01-16 17:07:05 +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 |
|
Miha Mencin
|
0766ee96a7
|
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-16 12:44:50 +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 |
|
Oleksii Kriuchykhin
|
3a4b992f4e
|
Code style fixies []SCI-2875]
|
2019-01-14 16:31:23 +01:00 |
|
Matej Zrimšek
|
a5c1cf4450
|
Switch user's team if he's no longer a member of the currently selected one
|
2019-01-12 23:39:31 +01:00 |
|
Matej Zrimšek
|
838455af0d
|
Fix protocols.io Date handling at import
|
2019-01-12 19:28:45 +01:00 |
|
Oleksii Kriuchykhin
|
89240659a7
|
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-11 17:20:39 +01:00 |
|
Alex Kriuchykhin
|
b530cea771
|
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-11 16:27:22 +01:00 |
|
Alex Kriuchykhin
|
be514fd62d
|
Merge pull request #1445 from okriuchykhin/ok_SCI_2931
Fix image URLs in export all document [SCI-2931]
|
2019-01-11 12:03:06 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Oleksii Kriuchykhin
|
ec28db6f4f
|
Fix image URLs in export all document [SCI-2931]
|
2019-01-10 14:19:40 +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 |
|
Alex Kriuchykhin
|
8ea37c541b
|
Merge pull request #1436 from okriuchykhin/ok_SCI_2904
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2019-01-10 11:04:26 +01:00 |
|
mlorb
|
06b1e5cf20
|
Allow org. administrators to invite them onto all projects
|
2019-01-08 16:30:52 +01:00 |
|
Jure Grabnar
|
fe46f9c9fe
|
Reinit tooltips after cancel/save step
Closes SCI-2891.
|
2019-01-08 15:36:44 +01:00 |
|
Matej Zrimšek
|
8070b7f8b5
|
Fix Date and Time display formats on JS side
|
2019-01-08 08:07:24 +01:00 |
|
Matej Zrimšek
|
b64df7d8cc
|
Fix additional Date and Time display formats
|
2019-01-08 06:29:37 +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 |
|
Alex Kriuchykhin
|
8ffe5dafee
|
Merge pull request #1437 from okriuchykhin/ok_SCI_2907
Change sample date in date format settings [SCI-2907]
|
2019-01-03 16:10:19 +01:00 |
|
Oleksii Kriuchykhin
|
5ea5b76d39
|
Change sample date in date format settings [SCI-2907]
|
2019-01-03 14:15:41 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Matej Zrimšek
|
c84457e1ed
|
Prevent archiving of experiments with at least one locked task
|
2018-12-23 21:17:51 +01:00 |
|
Matej Zrimšek
|
b74105abc2
|
Fix Date and Time display formats
|
2018-12-23 20:30:09 +01:00 |
|
Luka Murn
|
1c8407e4f4
|
Merge pull request #1433 from okriuchykhin/ok_SCI_2864
Additional fix for export all S3 path [SCI-2864]
|
2018-12-20 13:27:50 +01:00 |
|
Oleksii Kriuchykhin
|
2fa4f42883
|
Additional fix for export all S3 path [SCI-2864]
|
2018-12-20 13:22:56 +01:00 |
|
Luka Murn
|
faf6601962
|
Merge pull request #1432 from okriuchykhin/ok_SCI_2864
Fix S3 zip exports path [SCI-2864]
|
2018-12-20 11:08:48 +01:00 |
|
Oleksii Kriuchykhin
|
c880f3fd84
|
Fix S3 zip exports path [SCI-2864]
|
2018-12-20 11:07:19 +01:00 |
|
Luka Murn
|
ac5c809d20
|
Add force_encoding to export all report view template
|
2018-12-18 21:03:10 +01:00 |
|
Luka Murn
|
cb1cfe2ef3
|
Merge pull request #1429 from Ducz0r/lm-sci-2902-fix-2
Fix assets include in export all report to work on production env [SCI-2902]
|
2018-12-18 09:14:44 +01:00 |
|