Commit graph

5056 commits

Author SHA1 Message Date
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
Urban Rotnik
3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Miha Mencin
a93402d69f sci-2992 routes 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
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
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
147b7039a3
Merge pull request #1512 from urbanrotnik/ur-SCI-3054-whats-new-notification-modal-content
Add margin  for system notification modal [SCI-3054]
2019-02-21 15:56:17 +01:00
Alex Kriuchykhin
7b930a55de
Merge pull request #1511 from okriuchykhin/ok_SCI_3053
Update templates to final version [SCI-3053]
2019-02-21 15:43:44 +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
f0933f4a89
Merge pull request #1509 from urbanrotnik/ur-SCI-3060-SN-limits-for-fields
Add validation limits for system notification fields [SCI-3060]
2019-02-20 16:41:39 +01:00
Urban Rotnik
22dd1f8f1c
Merge pull request #1508 from urbanrotnik/ur-SCI-3050-polsih-SN-email
System Notification polish🇵🇱 Email [SCI-3050]
2019-02-20 16:36:10 +01:00
Urban Rotnik
82ea31e275 Add validation limits for system notification fields 2019-02-20 16:05:15 +01:00
Urban Rotnik
8768fcac6c Copy change 2019-02-20 14:19:59 +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
mlorb
acfacf0ba8
Merge pull request #1502 from mlorb/ml-sci-3049
Change experiments title color [SCI-3049]
2019-02-19 14:50:05 +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
Anton Ignatov
ec18280af4 remove yarn.lock 2019-02-19 13:17:05 +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
a31181e3d3 Merge branch 'ur-SCI-2961-SN-emails' into features/system-notifications 2019-02-19 12:52:00 +01:00
Urban Rotnik
f7c7335bf0 Change test to pass on Travis 2019-02-19 11:23:01 +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
Alex Kriuchykhin
372ca31e42
Merge pull request #1492 from okriuchykhin/ok_SCI_3037
Fix protocols in team export service [SCI-3037]
2019-02-15 13:08:45 +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