Commit graph

3916 commits

Author SHA1 Message Date
Jure Grabnar
30bc536d07 Fix smart annotations in demo project
Closes SCI-3097, SCI-3102.
2019-02-26 14:36:48 +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
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
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
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