Urban Rotnik
|
117944117b
|
Add service for activity creation
|
2019-03-11 08:36:15 +01:00 |
|
Alex Kriuchykhin
|
bc3d5ae87c
|
Merge pull request #1535 from okriuchykhin/ok_SCI_3024_v3
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
|
2019-03-08 14:05:44 +01:00 |
|
Oleksii Kriuchykhin
|
e3bacd6b9a
|
Fix global activities page after refactoring [SCI-2994][SCI-3024]
|
2019-03-08 13:09:27 +01:00 |
|
Oleksii Kriuchykhin
|
0b87e8e1e4
|
Merge branch 'features/global-activities' into ok_SCI_3024_v3
|
2019-03-08 10:29:51 +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 |
|
Oleksii Kriuchykhin
|
c3705ccb25
|
Improve group collapse JS code [SCI-2994][SCI-3024]
|
2019-03-04 13:44:43 +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 |
|
Alex Kriuchykhin
|
af5cc4a5bb
|
Merge pull request #1526 from okriuchykhin/ok_SCI_3014_v2
Add main global activities bussiness logic [SCI-3014]
|
2019-02-27 14:00:31 +01:00 |
|
Oleksii Kriuchykhin
|
0266f6bd3c
|
Change search on subject query constaruction logic [SCI-3014]
|
2019-02-27 13:21:05 +01:00 |
|
Oleksii Kriuchykhin
|
74a60d443d
|
Merge branch 'features/global-activities' into ok_SCI_3014_v2
|
2019-02-26 13:46:25 +01:00 |
|
Urban Rotnik
|
11c14d2360
|
Merge pull request #1523 from urbanrotnik/ur-SCI-3026-migration-for-lagacy-activity
Activity model update (original JIRA issue is migration for lagacy activity)[3026]
|
2019-02-26 13:41:54 +01:00 |
|
Oleksii Kriuchykhin
|
61147b480c
|
Add main global activities bussiness logic [SCI-3014]
|
2019-02-26 11:01:15 +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 |
|
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 |
|