scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
5140 commits 70 branches 179 tags 165 MiB
Commit graph

5140 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio bf9c571c09
Merge pull request #1546 from aignatov-bio/ai-sci-3114-recapthca-bug 
Fix the issues we were having with reCAPTCHA on the the February lauch day [SCI - 3114]
 2019-03-01 13:28:45 +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 1ef8108521
update version to 1.15.4 2019-02-28 13:01:59 +01:00
Miha Mencin 20db41d361
Merge pull request #1540 from biosistemika/sci-3112-change-the-comments 
SCI-3112 Change the the comments in demo project generator
 2019-02-28 11:43:20 +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 e0ef3781a8
Merge pull request #1538 from biosistemika/revert-1522-ai-sci-3058-task-info-section-improvments 
Revert "Task info section improvements [SCI - 3058]"
 2019-02-27 21:51:53 +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
Urban Rotnik 6978db0e45
Merge pull request #1534 from urbanrotnik/ur-SCI-3106-tooltip-fix 
Update tooltip for system notifications dropdown
 2019-02-27 15:12:48 +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
Jure Grabnar c6884eae85
Merge pull request #1533 from jbargu/jg_template_background_rake_task 
update_all_templates task now executes jobs in background [SCI-3109]
 2019-02-27 14:52:42 +01:00
Urban Rotnik 3121bf1d39 Update tooltip for system notifications dropdown 2019-02-27 14:49:18 +01:00
Jure Grabnar 8025acc2d7 Update the priority for the templates background generation 2019-02-27 14:46:12 +01:00
Jure Grabnar a78147e950 update_all_templates task now executes jobs in background 2019-02-27 14:34:20 +01:00
Anton Ignatov a6666c688c Adding check for user tutorial 2019-02-27 13:55:46 +01:00
aignatov-bio 26f9c596e8
Merge pull request #1530 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity 
Missing user name at copy as template and move experiment in activity [SCI - 3108]
 2019-02-27 10:59:51 +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 a0d2f7c676 Move templates project creation for new team to delayed job [SCI-3101] 2019-02-26 13:32:00 +01:00
aignatov-bio 4da0eab328
Merge pull request #1522 from biosistemika/ai-sci-3058-task-info-section-improvments 
Task info section improvements [SCI - 3058]
 2019-02-26 09:00:26 +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 943aea4e8b fix schema.rb 2019-02-25 16:55:09 +01:00
Anton Ignatov 7d4d45906a fix schema.rb 2019-02-25 16:55:09 +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 abfba3e4b1
Merge pull request #1520 from jbargu/jg_sci_3081_3082 
Copy as template on experiment card does not respond at mouse over [SCI-3081][SCI-3082]
 2019-02-25 13:21:44 +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