Anton
ea9d2d8291
Merge branch 'develop' into features/protocol_versioning
2023-02-14 11:07:58 +01:00
Anton
1a0b28c74e
Add archive view for protocols template
2023-02-09 11:38:27 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] ( #4725 )
2023-01-20 14:29:25 +01:00
Anton
ba98075690
Add protocols filters front end [SCI-7517]
2023-01-04 10:34:49 +01:00
Oleksii Kriuchykhin
5fea4722ac
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-19 15:39:32 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids
2022-12-08 15:58:11 +01:00
Anton
2a8aaed7d1
Add actions toolbar to protocol repository [SCI-7521]
2022-12-06 15:54:50 +01:00
Giga Chubinidze
769fe7ebd8
fixed id sorting on reports removed model duplicate code
2022-12-05 13:17:15 +04:00
ajugo
847280489a
Add report id to the report datatable [SCI-7199] ( #4453 )
...
* Add report id to the report datatable [SCI-7199]
* Remove report id migration [SCI-7199]
2022-12-02 11:41:32 +01:00
Giga Chubinidze
43f8370a08
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 13:55:41 +04:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Oleksii Kriuchykhin
68fab55328
Fix display of a creator in the reports table [SCI-7297]
2022-10-13 14:55:24 +02:00
Alex Kriuchykhin
3592faea78
Merge pull request #4511 from okriuchykhin/ok_SCI_7230
...
Fix filtering by user role for teams table [SCI-7320]
2022-10-10 16:07:34 +02:00
Alex Kriuchykhin
3a9b568358
Merge pull request #4508 from rekonder/aj_SCI_7318
...
Fix view permission at label template table [SCI-7318]
2022-10-10 15:59:02 +02:00
Oleksii Kriuchykhin
a88e936693
Fix filtering by user role for teams table [SCI-7230]
2022-10-10 15:48:38 +02:00
Andrej
42193bbe81
Fix view permission at label template table [SCI-7318]
2022-10-07 17:16:40 +02:00
Alex Kriuchykhin
4d529cfcb5
Merge pull request #4499 from okriuchykhin/ok_SCI_7291
...
Update teams table with new user assignments system [SCI-7291]
2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin
0a8ebef095
Update teams table with new user assignments system [SCI-7291]
2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin
830248ada9
Fix search in team members table [SCI-7289]
2022-10-03 16:56:15 +02:00
Oleksii Kriuchykhin
0d656f8976
Fix sorting in label templates datatable [SCI-7263]
2022-09-26 22:21:45 +02:00
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +02:00
Anton
46990b3df4
Add sorting by default label template [SCI-7084]
2022-08-18 11:49:22 +02:00
Anton
51cb951e06
Update labels index page [SCI-7048]
2022-08-08 11:15:46 +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
Anton
31202922af
Add general layout for template [SCI-7030]
2022-08-04 10:51:30 +02:00
Anton
67df01711f
Add edit actions to label templates [SCI-7019]
2022-07-28 14:42:13 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] ( #4292 )
...
* Initial label template datatable [SCI-7018]
* Add new columns to LabelTemplate and update datatable view [SCI-7018]
* Fix after rebase [SCI-7018]
* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00
Anton
61464b3780
Add new protocol view to repository [SCI-6858]
2022-06-02 11:05:25 +02:00
Oleksii Kriuchykhin
c5c3afa906
Update team users table with new user assignments [SCI-6842]
2022-06-01 15:06:19 +02:00
Oleksii Kriuchykhin
c26dcf4b23
Replace empty? with blank? [SCI-5579]
2021-07-23 11:56:28 +02:00
Oleksii Kriuchykhin
7204e47ba5
Fix sorting by role with filtering in team members table [SCI-5908]
2021-07-16 10:49:41 +02:00
Oleksii Kriuchykhin
2bad60d48c
Disable edit button for reports of archived projects [SCI-5755]
2021-05-28 16:17:20 +02:00
Oleksii Kriuchykhin
29c83ffbb1
Merge branch 'develop' into features/new-reports
2021-05-21 11:04:17 +02:00
Alex Kriuchykhin
8e3e72654c
Merge pull request #3324 from aignatov-bio/ai-sci-5551-add-search-field-to-reports
...
Add search field to reports page [SCI-5551]
2021-05-17 11:50:03 +02:00
aignatov-bio
e058adab08
Add search scope from searchable concern [SCI-5551]
2021-05-17 09:55:59 +02:00
aignatov-bio
e953666762
Add search field to reports page [SCI-5551]
2021-05-13 21:41:26 +02:00
Oleksii Kriuchykhin
a175e83a16
Add generation error states to reports [SCI-5702]
2021-05-11 14:52:02 +02:00
Oleksii Kriuchykhin
fe8f006f6e
Fix save report PDF to Inventory [SCI-5613]
2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin
0a9a656313
Add flash message and notification for generated reports [SCI-5552]
2021-04-14 15:45:51 +02:00
Oleksii Kriuchykhin
a2a0aabb62
Implement pooling for Report document creation status [SCI-5557]
2021-04-14 15:16:08 +02:00
aignatov-bio
a46b9cb8ea
Add document preview to reports [SCI-5559]
2021-04-07 11:15:22 +02:00
Oleksii Kriuchykhin
0e545dfee0
Fix sorting by status in team members table [SCI-4179]
2021-03-22 13:40:25 +01:00
aignatov-bio
3e5c2e83c7
Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550]
2021-03-17 12:54:25 +01:00
aignatov-bio
c99e8f19fd
Add basic layout [SCI-5548]
2021-03-16 13:11:51 +01:00
Urban Rotnik
8107920400
Fix Role sorting for organization admin
2021-03-12 14:06:28 +01:00
Urban Rotnik
1d43e478a2
Fix sorting on Teams settings page
...
SCI-4179
2021-02-26 12:17:57 +01:00
Urban Rotnik
a259800590
Merge branch 'develop' into jg_sci_2228
2020-08-31 16:29:23 +02:00
Urban Rotnik
a2ade6e0ec
Merge branch 'develop' into features/new-task-layout
2020-05-15 14:27:56 +02:00
Urban Rotnik
8fa024ed10
Remove all tooltips from HTML
2020-04-28 12:30:43 +02:00
aignatov-bio
fe718349da
Add recent protocol tab to load protocal from repository
2020-04-09 17:29:39 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
311189a2e9
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
2018-12-13 11:18:09 +01:00
Oleksii Kriuchykhin
537de596a7
Merge latest master [SCI-2778]
2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Zanz2
22a565a684
Made fixes according to review
2018-09-14 13:07:09 +02:00
Zanz2
4e55fdc9b5
Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662
2018-08-21 12:09:05 +02:00
Zanz2
601335a807
Fixed non .js errors hound
2018-08-21 12:08:14 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662
2018-08-21 11:27:01 +02:00
Zanz2
1159a32ce2
Implemented all except 2 tooltips, debbugging why they dont work now
2018-08-20 13:03:30 +02:00
Oleksii Kriuchykhin
6669beaf0e
Change icons throughout the rest of application [SCI-2445]
2018-07-27 15:27:08 +02:00
zmagod
a7e47faa61
sanitizes the report name on repors index page [fixes SCI-2600]
2018-07-10 10:58:39 +02:00
mlorb
c4ecfc4d38
Change icons throughout sciNote - navigation, project, task cards
2018-05-22 16:55:58 +02:00
Luka Murn
cb6fe50832
Merge branch 'master' into ux-release-1
...
Conflicts:
app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
zmagod
9d282d1800
adds new reports index page [fixes SCI-2124]
2018-04-18 16:47:52 +02:00
Oleksii Kriuchykhin
f656ad1561
Fix fa icons [SCI-2217]
2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
zmagod
1cdba5e0d3
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
2018-03-16 11:05:16 +01:00
zmagod
dd2f7dd417
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin
269f7d74fa
Add explicit ordering to samples_tables [SCI-2148][SCI-2149]
2018-03-13 13:16:34 +01:00
zmagod
4f951f6679
adds unit specs for datatable service [fixes SCI-2068]
2018-03-09 14:22:00 +01:00
zmagod
e3ca782996
add info modal for repository items [fixes SCI-2066]
2018-02-27 16:21:46 +01:00
Matej Zrimšek
b8b9707c06
Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.
2018-02-19 14:51:14 +01:00
Matej Zrimšek
5bda53eebf
Overall refactoring of all canaid permissions and code related to their calls.
2018-02-16 10:54:06 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797
...
Permissions - refactor organization & team level permissions (core) [SCI-1797]
2018-01-05 16:03:55 +01:00
mlorb
99185871c4
fix naming things
2018-01-05 15:15:50 +01:00
Oleksii Kriuchykhin
070711917e
Code fixes [SCI-1873]
2018-01-04 11:25:34 +01:00
Oleksii Kriuchykhin
512ee07bde
Fix repositories [SCI-1873]
2017-12-19 17:53:45 +01:00
mlorb
0d37f9c85a
refactor clone protocol permission
2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2
refactor update protocol type in repository
2017-12-14 14:18:16 +01:00
mlorb
806fcbce36
refactor update protocol in repository permission
2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e
refactor read protocol in repository permission
2017-12-14 14:18:15 +01:00
zmagod
1f45123d51
removes unneeded comments
2017-08-21 13:34:39 +02:00
Luka Murn
ae5bccf709
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
okriuchykhin
af4b310754
Add ordering for column mappings in repositories
2017-07-26 13:35:54 +02:00
zmagod
506e47a595
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 09:45:36 +02:00
Mojca Lorber
ec76873e95
fix sorting by assigned causes ajax error
2017-07-13 11:41:19 +02:00
Oleksii Kriuchykhin
b234c07c13
Fix datatables [SCI-1409]
2017-07-03 15:33:50 +02:00
Oleksii Kriuchykhin
115ce91d8d
Handle column mappings in task repository [SCI-1381]
2017-06-20 15:58:52 +02:00
Oleksii Kriuchykhin
9a9f8b9c41
Fix total number of records in task repository [SCI-1381]
2017-06-19 16:45:57 +02:00
mlorb
14429a270c
Merge pull request #689 from mlorb/ml_sci_1354
...
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
Matej Zrimšek
6b284d8c89
Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357]
2017-06-16 16:02:31 +02:00
Matej Zrimšek
1f0eeeaecb
Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357]
2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3
Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
...
Fix bug when reordering column to the first position in repositories [SCI-1346]
2017-06-16 14:29:08 +02:00
Oleksii Kriuchykhin
94d74b8101
Make assigned column always visible in repositories [SCI-1346]
2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af
truncate and display text in tooltip in custom repository fields
2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21
Merge pull request #687 from mz3944/mz-SCI-1357
...
Repository management - filter on custom columns [SCI-1357]
2017-06-15 13:30:42 +02:00
Matej Zrimšek
bae1e298d7
Fixed repositories search to only search the current repository. [SCI-1357]
2017-06-14 19:49:08 +02:00
Matej Zrimšek
092e82c722
Date search fix for repositories. [SCI-1357]
2017-06-14 19:36:15 +02:00
Matej Zrimšek
e38947b1f8
Minor repository search refactoring. [SCI-1357]
2017-06-14 19:28:53 +02:00
