Commit graph

10394 commits

Author SHA1 Message Date
Alex Kriuchykhin
80332eb4a0
Merge pull request #2545 from biosistemika/dependabot/bundler/doorkeeper-5.1.1
Bump doorkeeper from 5.1.0 to 5.1.1
2020-05-08 11:09:56 +02:00
Oleksii Kriuchykhin
17cd991868 Update Canaid and Rails [SCI-4597] 2020-05-08 10:58:36 +02:00
aignatov-bio
c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
dependabot[bot]
9d0b73b0d2
Bump doorkeeper from 5.1.0 to 5.1.1
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.1.0...v5.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-05-07 21:13:39 +00:00
aignatov-bio
0a3b6a7d3e
Merge pull request #2543 from aignatov-bio/ai-sci-fix-snapshot-button-position
Fix snapshot button place
2020-05-07 19:48:27 +02:00
aignatov-bio
dad5ac7a27 Fix snapshot button place 2020-05-07 19:36:30 +02:00
Mojca Lorber
b3bce933e5 Task details description corrections and some changes of locales 2020-05-07 16:11:22 +02:00
aignatov-bio
fe658a9b23
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
Update CSS for full view assigned rows modal [SCI-4594]
2020-05-07 15:22:06 +02:00
aignatov-bio
c3ca0156fb Fix error handling 2020-05-07 13:58:25 +02:00
aignatov-bio
30ce49b731
Merge pull request #2538 from aignatov-bio/ai-sci-4574-result-office-button-position
Fix office button position [SCI-4574]
2020-05-07 13:55:15 +02:00
aignatov-bio
29903f570d Merge assign and unassign service 2020-05-07 13:51:07 +02:00
aignatov-bio
8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio
912b01d34b
Merge pull request #2539 from aignatov-bio/ai-sci-4573-small-css-fixes-for-protocols
Fix css for comments and fix modal title size [SCI-4573]
2020-05-07 12:59:56 +02:00
aignatov-bio
8076d8f464 Create helper for partial 2020-05-07 12:51:18 +02:00
aignatov-bio
8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
Add new protocol template dropdown [SCI-4538]
2020-05-07 08:32:54 +02:00
Urban Rotnik
a38b850601
Merge pull request #2520 from urbanrotnik/ur-sci-4522-activity-links
Activities links [SCI-4522] &  [SCI-4514]
2020-05-06 22:11:58 +02:00
Oleksii Kriuchykhin
25f9c5bc7d Refactor Repository permissions and implement deduplication for files in snapshots [SCI-4597] 2020-05-06 15:17:54 +02:00
Urban Rotnik
a6ab14de99
Merge pull request #2536 from urbanrotnik/ur-sci-4586-hide-icon-if-there-is-no-users-for-assign
Hide icon [SCI-4586]
2020-05-06 14:19:18 +02:00
Urban Rotnik
715d6ab8fa
Merge pull request #2537 from urbanrotnik/ur-sci-4587-activities-start-date-fix
Fix activity message for start date [SCI-4587]
2020-05-06 14:18:52 +02:00
mlorb
b41f78e40f
Merge pull request #2532 from mlorb/ml-sci-4595
Css fixes for avatars for assigned users on tasks [SCI-4595]
2020-05-06 14:15:13 +02:00
aignatov-bio
5972c3fdf6 Fix css for comments and fix modal title size 2020-05-06 13:54:39 +02:00
aignatov-bio
b74b717d03 Fix office button position 2020-05-06 13:42:30 +02:00
Urban Rotnik
8ff7c33431 Fix start date activity message 2020-05-06 12:34:45 +02:00
aignatov-bio
4e5ebd01b5 Fix I18n 2020-05-06 12:20:20 +02:00
Urban Rotnik
4c4d0a2403 Hide icon if there is no users 2020-05-06 09:47:39 +02:00
aignatov-bio
a29db548f8 Update CSS for full view assigned rows modal 2020-05-05 18:17:14 +02:00
Oleksii Kriuchykhin
8eae17fe02 Merge branch 'release/1.18.8' into develop 2020-05-05 16:53:31 +02:00
Alex Kriuchykhin
518b3a01d1
Merge pull request #2533 from biosistemika/release/1.18.8
Merge release/1.18.8 to master
2020-05-05 16:52:31 +02:00
Oleksii Kriuchykhin
20bb0c5103 Bump version to 1.18.8 2020-05-05 16:29:52 +02:00
Alex Kriuchykhin
a33737c5b7
Merge pull request #2531 from okriuchykhin/ok_SCI_4544_v2
Add option for storing Azure app configs in settings using JSON format [SCI-4544]
2020-05-05 16:27:56 +02:00
Mojca Lorber
8b4110c0af Css fixes for avatars for assigned users on tasks 2020-05-05 16:11:11 +02:00
Alex Kriuchykhin
7e9054e6d2
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
2020-05-05 13:20:01 +02:00
aignatov-bio
85dae268fe
Merge pull request #2498 from aignatov-bio/ai-sci-4481-fix-notification-when-search-field-active
Fix notification when search field active [SCI-4481]
2020-05-05 12:59:32 +02:00
aignatov-bio
c556fd2478
Merge pull request #2530 from aignatov-bio/ai-sci-4574-fix-css-for-results-page
Fix CSS for results [SCI-4574]
2020-05-05 12:58:35 +02:00
aignatov-bio
f3046c8515
Merge pull request #2529 from aignatov-bio/ai-sci-4584-fix-handsone-table
Fix Handson table for collapsed protocol section [SCI-4584]
2020-05-05 12:58:04 +02:00
aignatov-bio
cf2508c5d0
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes
Small layout changes for protocol [SCI-4508]
2020-05-05 12:57:40 +02:00
Urban Rotnik
429519e930
Merge pull request #2521 from urbanrotnik/ur-sci-4513-counter-fix
Fix items count validation [SCI-4513]
2020-05-05 12:31:00 +02:00
Urban Rotnik
4947255015
Merge pull request #2528 from urbanrotnik/ur-sci-4542-user-filter
Fix for user filter in task activity page [SCI-4542]
2020-05-05 10:25:26 +02:00
aignatov-bio
ff2a7aa9b6 Fix spec markup 2020-05-05 09:47:55 +02:00
aignatov-bio
1b57040c37 Fix deepscan issues 2020-05-05 09:44:38 +02:00
aignatov-bio
8c57ed3109 Fix css for results 2020-05-02 22:37:02 +02:00
aignatov-bio
9d006aac9e Fix handson table for colapsed protocol section 2020-05-02 22:15:38 +02:00
aignatov-bio
1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
Urban Rotnik
760c2fba8f
Merge pull request #2523 from urbanrotnik/ur-sci-4549-sidebar-fix
Fix icon position and hover effect in repositories sidebar [SCI-4549]
2020-04-30 09:32:20 +02:00
Urban Rotnik
1fe1b782f1 Fix for user filter in task activity page 2020-04-30 09:20:29 +02:00
aignatov-bio
938f00484b Fix markup 2020-04-29 15:17:15 +02:00
aignatov-bio
19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
Alex Kriuchykhin
0e865f8e45
Merge pull request #2525 from okriuchykhin/ok_SCI_4552
Implement background processing of repository snapshots [SCI-4552]
2020-04-29 12:03:23 +02:00
Oleksii Kriuchykhin
307a5d7e1b Improve code style in migration [SCI-4552] 2020-04-29 10:42:00 +02:00
aignatov-bio
046c9662d1 Fix markup 2020-04-28 19:16:04 +02:00