Commit graph

107 commits

Author SHA1 Message Date
Martin Artnik
649917d0b9 Merge branch 'develop' into features/global-tags 2025-09-10 13:10:04 +02:00
Oleksii Kriuchykhin
8faea2bf89 Migrate tags to be Workspace level, merge identical tags [SCI-12239] 2025-08-27 10:29:29 +02:00
Martin Artnik
8ceb099acf Merge branch 'develop' into features/team-automations 2025-08-07 15:09:45 +02:00
Martin Artnik
84b796756f Add team and user_group assignment relations [SCI-12204] 2025-08-06 15:03:03 +02:00
Andrej
8d98f65c92 Add initial team automation settings page [SCI-11929] 2025-07-21 14:08:17 +02:00
Martin Artnik
3d5a25e42c Refactor sharing logic [SCI-12055] 2025-07-17 16:34:04 +02:00
Andrej
f5f8a54a30 Move users logic to shareable concern [SCI-12053] 2025-07-17 14:35:56 +02:00
Alex Kriuchykhin
1184767a62
Initial implementation of user_groups data layer [SCI-11938] (#8576) 2025-06-12 17:07:59 +02:00
Andrej
4753bef936 Add repository templates [SCI-11708] 2025-04-02 19:55:24 +02:00
Martin Artnik
f4bd43129e Merge branch 'develop' into features/native-tables-revamp 2025-01-28 12:45:50 +01:00
andrej-scinote
fc620e1a18
Fix text with tiny_mce objects [SCI-11069] (#8087) 2024-12-12 13:40:10 +01:00
Andrej
8c57e28078 Add forms controllers [SCI-11354] 2024-12-10 12:22:56 +01:00
Martin Artnik
1a5530efde Add 203dpi label templates [SCI-10901] 2024-11-07 11:59:36 +01:00
Andrej
2f53772f61 Add move modal for storage locations [SCI-10863] 2024-07-23 09:41:19 +02:00
Alex Kriuchykhin
7155d7862a
Add missing dependent option to many-to-many relations [SCI-10036] (#7024) 2024-02-05 13:36:12 +01:00
G-Chubinidze
bb35e15993
Default view on Projects and Experiments pages is "Table view" [SCI-9794] (#6768) 2023-12-20 14:19:52 +01:00
Oleksii Kriuchykhin
45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
Soufiane
c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
Alex Kriuchykhin
b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Anton
6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +01:00
Giga Chubinidze
ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Oleksii Kriuchykhin
f586c73dc8 Convert team_repository to polymorphic relation [SCI-6917] 2022-08-31 16:42:08 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] (#4316)
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
Oleksii Kriuchykhin
c79ff8f050 Migrate TeamRepository to new permissions [SCI-6916] 2022-06-28 13:13:36 +02:00
Alex Kriuchykhin
679b29b32d
Merge pull request #4099 from okriuchykhin/ok_SCI_6820
Add migration for user team roles, including protocols and inventories [SCI-6820]
2022-05-24 10:33:35 +02:00
Oleksii Kriuchykhin
39cfcd5522 Add migration for user team roles, including protocols and inventories [SCI-6820] 2022-05-23 16:28:53 +02:00
Oleksii Kriuchykhin
03ec4cb319 Setup user assignments relations for team, inventory and protocol [SCI-6818] 2022-05-17 14:32:14 +02:00
Anton
24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +02:00
Urban Rotnik
235f19cf25 Store Table/Cards view setting per user
SCI-5450
2021-03-04 14:56:59 +01:00
Oleksii Kriuchykhin
324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
Oleksii Kriuchykhin
ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Urban Rotnik
7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik
87ca79717c Add separate sorting for active/archived view
[SCI-5306]
2020-12-18 08:41:51 +01:00
Oleksii Kriuchykhin
e87407bbd3 Create database structure for project folders [SCI-5126] 2020-10-29 15:44:21 +01:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Oleksii Kriuchykhin
675b578272 Add used space calculation method to the team model [SCI-4459] 2020-03-17 16:56:55 +01:00
Urban Rotnik
3db48c44f7 Add ordered scope 2020-01-30 13:47:14 +01:00
Anton Ignatov
7b855f54ac Finish main part of selectors 2019-11-18 13:59:54 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Anton Ignatov
305e9dc109 Fix error handling and rubocop error 2019-09-25 13:45:34 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Mojca Lorber
cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
Urban Rotnik
f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +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
ba1d6d45ca Fix merging issues 2019-07-12 15:47:15 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00