Commit graph

1657 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
aignatov-bio
3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model
Refactor checklist column data structure [SCI-4168]
2019-12-24 11:12:36 +01:00
Urban Rotnik
400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
Miha Mencin
882ec711fe
Merge pull request #2276 from biosistemika/master
Master
2019-12-20 17:39:46 +01:00
aignatov-bio
54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
aignatov-bio
16c4879e56 Merge migrations and update sorting 2019-12-20 15:42:54 +01:00
Oleksii Kriuchykhin
b945171f2f Fix creation of new tasks on canvas [SCI-4171] 2019-12-19 15:48:25 +01:00
Urban Rotnik
7153711570 Move delimiter from column to metadata 2019-12-18 10:22:52 +01:00
Miha Mencin
b67911c81a Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9 2019-12-17 14:48:50 +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
0094528a02 Improve connected accounts unlinking [SCI-4142] 2019-12-12 14:57:27 +01:00
aignatov-bio
eed56b59aa Fix markup 2019-12-11 15:08:18 +01:00
aignatov-bio
7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +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
aignatov-bio
7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Urban Rotnik
5055490a23 Refactor asset value methods 2019-12-10 14:29:36 +01:00
Urban Rotnik
82b93bf9a4 Fix failing tests 2019-12-10 14:29:35 +01:00
Urban Rotnik
508a9b4e3e RepositoryRows controller refactor 2019-12-10 14:29:35 +01:00
Urban Rotnik
0c990ef8cf Add functions for creating new cells with values 2019-12-10 14:29:34 +01:00
Mojca Lorber
8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
aignatov-bio
09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio
d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik
7661a24a44 Remove scope for before_action 2019-12-06 11:15:17 +01:00
Urban Rotnik
2c0a6ed085 Remove current_user vars 2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin
03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Urban Rotnik
ee5c2ac93d Add edit renderer for Assets 2019-12-04 14:52:52 +01:00
aignatov-bio
d5f9604e1c Fix file post process method 2019-12-03 10:17:47 +01:00
Urban Rotnik
3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Alex Kriuchykhin
fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098
Refactor Azure configuration  and connected accounts [SCI-4098]
2019-11-29 11:30:33 +01:00
Urban Rotnik
5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik
65d8d0e35b DateTime HTML and JS simplified 2019-11-29 10:19:57 +01:00
Urban Rotnik
5ae29d549e Add manage modal for DateTime values 2019-11-29 10:19:55 +01:00
Urban Rotnik
fe4aa12ced Add DateTime columns CRUD endpoints 2019-11-29 10:19:14 +01:00
Urban Rotnik
dc6cc3bc62 Show after create flash messages 2019-11-29 10:19:12 +01:00
Urban Rotnik
b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Urban Rotnik
b2b6296cb5 Improve update items action, JS and views 2019-11-29 10:19:10 +01:00
Urban Rotnik
24acf1f84b Fix edit mode for File and Text 2019-11-29 10:19:08 +01:00
Urban Rotnik
1e8261ac2a Update InventoryColumns API for new Status Type 2019-11-29 10:19:07 +01:00
Urban Rotnik
7ab12baef9 Add API endpoint for StatusItems 2019-11-29 10:19:07 +01:00
Mojca Lorber
bcb8cc1840 Remove byebug 2019-11-29 10:17:54 +01:00
Mojca Lorber
305104f639 Refactor text inventory type 2019-11-29 10:17:53 +01:00
Urban Rotnik
37b7d5aa64 Use values from extends 2019-11-29 10:17:52 +01:00
Urban Rotnik
f645ff52ab Refactor ColumnServices 2019-11-29 10:17:52 +01:00
Urban Rotnik
28d7a4f284 Refactor FileColumnController 2019-11-29 10:17:51 +01:00
Urban Rotnik
1720623665 Refactor RepositoryListColumn controller 2019-11-29 10:17:50 +01:00
Mojca Lorber
482deafdd3 Rename partial 2019-11-29 10:17:49 +01:00
Mojca Lorber
fe8829b592 Fix multiple load of modal 2019-11-29 10:17:49 +01:00
Urban Rotnik
5923e8897a Remove commented code 2019-11-29 10:16:46 +01:00
Urban Rotnik
4cb3d1b6f0 Add BaseColumnsController for column_types controllers 2019-11-29 10:16:45 +01:00