Commit graph

602 commits

Author SHA1 Message Date
aignatov-bio
d2a479c2e8
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
2020-05-08 12:39:28 +02:00
aignatov-bio
2728df5bac Move helper method to my_module_helper 2020-05-08 11:56:29 +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
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
aignatov-bio
61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
aignatov-bio
ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio
0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio
2f7adffcb0 Fix markup 2020-04-23 16:40:14 +02:00
aignatov-bio
c2e456aa27 Fix activities and specs 2020-04-23 15:25:28 +02:00
aignatov-bio
34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio
10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin
e0d397ba77 Improve code style in repository_datatable_helper.rb [SCI-4525] 2020-04-22 15:21:04 +02:00
Oleksii Kriuchykhin
f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +02:00
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio
9dfc652580 Fix markup 2020-04-07 12:50:58 +02:00
aignatov-bio
845e8c3d6d Fix loading process 2020-04-07 12:36:01 +02:00
aignatov-bio
7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
aignatov-bio
b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio
8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
Oleksii Kriuchykhin
a518bfe023 Enable time fraction for task due date [SCI-4408] 2020-03-16 17:55:35 +01:00
aignatov-bio
8e05908753 Small fixes 2020-02-25 17:19:11 +01:00
aignatov-bio
5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
aignatov-bio
44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
2020-01-30 13:42:07 +01:00
Urban Rotnik
fc14bf05be
Merge pull request #2377 from biosistemika/master
Master >> Develop
2020-01-29 14:25:11 +01:00
Urban Rotnik
503c05805d Move editable? method from helper to model 2020-01-25 09:43:05 +01:00
Urban Rotnik
ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
aignatov-bio
9524659e1d Demodulize column name in datatable helper 2020-01-24 11:33:30 +01:00
aignatov-bio
4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
Urban Rotnik
75c7cb7aa8 Keep circles for task page 2020-01-14 13:31:44 +01:00
Urban Rotnik
2468b67de0 Assign column update 2020-01-14 09:02:30 +01:00
Oleksii Kriuchykhin
01b8d2226d Optimize repository table counters [SCI-4224] 2020-01-13 16:31:42 +01:00
Oleksii Kriuchykhin
7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
aignatov-bio
d5675c0c33 Add smart annotations to repository text value 2020-01-10 12:56:57 +01:00
Alex Kriuchykhin
9ab07af87b
Merge pull request #2282 from okriuchykhin/ok_SCI_4149
Disable comment edit mode if comment is not editable [SCI-4149]
2020-01-09 15:06:04 +01:00
Oleksii Kriuchykhin
1624f9d5ab Disable comment edit mode if comment is not editable [SCI-4149] 2020-01-08 12:32:59 +01:00
aignatov-bio
54c78cf4d1
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
2020-01-08 12:30:51 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Alex Kriuchykhin
792e6f2eb9
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
2019-12-12 16:12:40 +01:00
Oleksii Kriuchykhin
1aa334fdaa Merge branch 'develop' into release-1-17-8 2019-12-11 10:55:00 +01:00
Oleksii Kriuchykhin
ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Urban Rotnik
06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Urban Rotnik
2c0a6ed085 Remove current_user vars 2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin
7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Urban Rotnik
5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik
1c9d7ef6e7 Add File type renderer 2019-11-29 10:19:54 +01:00