Commit graph

166 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
f43340a849 Fix projects visibility in the sidebar [SCI-5338] 2021-01-05 13:50:42 +01:00
Oleksii Kriuchykhin
f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
aignatov-bio
6a44e23697
Add projects sidebar [SCI-5178] (#2995)
* Add projects sidebar navigation [SCI-5178]
2020-12-08 16:07:26 +01:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Mojca Lorber
f7083a000a Add devise lockable to user 2020-07-14 14:49:51 +02:00
aignatov-bio
c592954400 Add UX 2020-07-13 16:05:23 +02:00
aignatov-bio
fef6e5f1db Add recovery strategy for 2fa 2020-07-09 17:01:00 +02:00
aignatov-bio
13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
aignatov-bio
9b33cbc104 Rename ensure 2fa method 2020-07-02 11:24:33 +02:00
aignatov-bio
46256c89c9 Fix tests 2020-07-01 15:44:52 +02:00
aignatov-bio
742fb0d27b Small 2fa improvments 2020-07-01 14:41:55 +02:00
aignatov-bio
4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
Urban Rotnik
62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
Urban Rotnik
de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
Urban Rotnik
88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
Urban Rotnik
ebbce8d09e Add restore columns to migrations 2020-06-09 18:43:22 +02:00
Mojca Lorber
a9a278409c Fix test 2020-06-08 16:22:37 +02:00
Mojca Lorber
42d6d727b9 Add archive to repository rows 2020-06-04 23:29:37 +02:00
Mojca Lorber
d3806e53a5 Add archive to repository 2020-06-04 15:44:47 +02:00
Urban Rotnik
5c72200801 Remove tooltips settings for user 2020-04-28 12:44:47 +02:00
Oleksii Kriuchykhin
943285d4a0 Fix Azure AD user creation on sign in [SCI-4544] 2020-04-22 16:47:06 +02:00
Oleksii Kriuchykhin
9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin
522ae12f08 Merge branch 'develop' into ok_SCI_3988 2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Oleksii Kriuchykhin
1b902ff4b3 Merge branch 'develop' into ok_SCI_3988 2020-01-07 15:26:30 +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
Mojca Lorber
a3a5b21951 small fixes 2019-12-10 12:02:08 +01:00
mlorb
1122fe2d2f
Merge branch 'features/new-column-types' into ml-sci-4029 2019-12-10 10:54:41 +01:00
Urban Rotnik
e764e856d8 Fix syntax error 2019-12-10 09:40:40 +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
Oleksii Kriuchykhin
7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Urban Rotnik
b591346a3f Add DateTime type column 2019-11-29 10:19:13 +01:00
Urban Rotnik
c00a837105 Add models for RepositoryStatus column type 2019-11-29 10:16:43 +01:00
Oleksii Kriuchykhin
6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Oleksii Kriuchykhin
b2862b6c9e Remove Paperclip DB columns and fix experiment templates [SCI-3988] 2019-11-18 14:16:28 +01:00
Anton Ignatov
7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
aignatov-bio
9950a23188 Replace base64 avatars with url 2019-10-22 12:27:13 +02:00
Anton Ignatov
646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
aignatov-bio
a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983)
* Fix report image issues

* Small fixes
2019-09-12 09:02:45 +02:00
Anton Ignatov
e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Luka Murn
83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00