Commit graph

3940 commits

Author SHA1 Message Date
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
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
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
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
Anton Ignatov
a4cabb203b Task info section improvements 2019-02-25 16:55:09 +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