Commit graph

11470 commits

Author SHA1 Message Date
aignatov-bio
c30ba4cd18
Merge pull request #2617 from aignatov-bio/ai-sci-4531-fix-forgot-password-margin
Fix forgot password link margin [SCI-4531]
2020-05-27 13:40:10 +02:00
aignatov-bio
aaff5eb67f Add name order for porject/experiment/task sidebar 2020-05-27 13:31:00 +02:00
aignatov-bio
32c1f4af84 Fix forgot password link margin 2020-05-27 12:55:15 +02:00
Oleksii Kriuchykhin
b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
aignatov-bio
40ad9fbf00 Check duplicate protocol name during import 2020-05-27 12:10:48 +02:00
Urban Rotnik
0007de2a95 Merge pull request #2614 from biosistemika/develop
Merge develop to master
2020-05-27 11:58:19 +02:00
Miha Mencin
183f5af7de
Bump version to 1.19.0 2020-05-27 11:33:32 +02:00
Alex Kriuchykhin
05d4f57793
Merge pull request #2613 from biosistemika/revert-2611-ok_SCI_4698
Revert "Fix handling of deleted repositories in reports [SCI-4698]"
2020-05-27 10:40:19 +02:00
Alex Kriuchykhin
8ed8f148a3 Revert "Fix handling of deleted repositories in reports [SCI-4698]" 2020-05-27 10:39:44 +02:00
Urban Rotnik
e198a2a149 Merge pull request #2612 from urbanrotnik/ur-sci-inventory-activity-fix
Fix constantizing for repository
2020-05-27 10:02:35 +02:00
aignatov-bio
7b36392a19
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse
Resize simple table header on sidebar collapse [SCI-4621]
2020-05-27 09:35:40 +02:00
Urban Rotnik
fcd3efe07e Fix constantizing for repository 2020-05-27 09:19:11 +02:00
Miha Mencin
56b9a3ee2c
Merge pull request #2611 from okriuchykhin/ok_SCI_4698
Fix handling of deleted repositories in reports [SCI-4698]
2020-05-27 08:43:38 +02:00
Oleksii Kriuchykhin
6424bd23da Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 08:21:55 +02:00
aignatov-bio
457b0a8137
Merge pull request #2610 from aignatov-bio/ai-sci-4697-fix-snapshot-date-creation
Fix snapshot date creation [SCI-4697]
2020-05-26 16:28:13 +02:00
aignatov-bio
15f58be1c2 Fix snapshot date creation 2020-05-26 15:59:49 +02:00
aignatov-bio
88122904a5
Merge pull request #2608 from aignatov-bio/ai-sci-4696-fix-full-view-zindex
Fix z-index for full view modal [SCI-4696]
2020-05-26 15:41:18 +02:00
Mojca Lorber
9b7d321666 Add rename task and rename experiment activities 2020-05-26 15:34:20 +02:00
aignatov-bio
73c7ff47a5 Fix z-index for full view modal 2020-05-26 12:41:07 +02:00
Miha Mencin
4b7b3a8622
Merge pull request #2607 from biosistemika/SCI-4674-tehnician-snapshots-permissions
[SCI-4674] Fix a typo
2020-05-25 17:30:19 +02:00
Miha Mencin
55aac63fba Fix a typo 2020-05-25 17:28:36 +02:00
Miha Mencin
79ba0b3708
Merge pull request #2605 from biosistemika/SCI-4674-tehnician-snapshots-permissions
SCI-4674 allow tehnician to create, delete and select snapshot
2020-05-25 16:55:33 +02:00
Miha Mencin
26f4f24cc6 SCI-4674 fix stupid 2020-05-25 16:30:22 +02:00
Miha Mencin
77e1feda97 SCI-4674 name permissions more properly 2020-05-25 16:29:00 +02:00
aignatov-bio
f86b71144d Resize simple table header on sidebar collapse 2020-05-25 16:21:28 +02:00
Miha Mencin
5f195b3622 SCI-4674 check if experiment and projects are active during snapshot creation 2020-05-25 15:56:39 +02:00
Miha Mencin
5994e8c6a6 SCI-4674 create special permissions for snapshots on task 2020-05-25 15:49:31 +02:00
Miha Mencin
cd70d9c5a6 SCI-4674 allow tehnician to create, delete and select snapshot 2020-05-25 15:03:37 +02:00
Urban Rotnik
c7361332ab
Merge pull request #2567 from urbanrotnik/ur-sci-4622-snapshot-in-report
Show snapshot in report [SCI-4622]
2020-05-25 14:21:49 +02:00
Urban Rotnik
b264b86cba Prepand callback 2020-05-25 14:00:41 +02:00
Alex Kriuchykhin
6ada4dc723
Merge pull request #2604 from okriuchykhin/ok_SCI_4669
Fix viewing of office files in repository snapshots [SCI-4669]
2020-05-25 13:55:31 +02:00
aignatov-bio
3a1280fead
Merge pull request #2602 from aignatov-bio/ai-sci-4675-fix-ordering-of-columns-to-snapshots
Fix snapshot column ordering by parent_id [SCI-4675]
2020-05-25 13:39:16 +02:00
Urban Rotnik
d9690115f8 Move refresh reference from controller to model 2020-05-25 13:19:34 +02:00
Urban Rotnik
df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
Urban Rotnik
359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +02:00
Urban Rotnik
2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
Urban Rotnik
9536939b3b Show snapshot rows in report 2020-05-25 13:19:28 +02:00
Alex Kriuchykhin
4dc3d352f7
Merge pull request #2603 from mlorb/ml-sci-4676
Change order of snapshots versions [SCI-4676]
2020-05-25 12:39:43 +02:00
Oleksii Kriuchykhin
3cabe2250b Fix viewing of office files in repository snapshots [SCI-4669] 2020-05-25 12:30:08 +02:00
Mojca Lorber
76a1f73989 Change order of snapshots versions 2020-05-25 12:15:24 +02:00
mlorb
981839eb6f
Merge pull request #2601 from mlorb/ml-sci-4664
Hide hamburger menu on login [SCI-4664]
2020-05-25 11:30:57 +02:00
aignatov-bio
f0bdae8b67 Fix snapshot column ordering by parent_id 2020-05-25 11:19:43 +02:00
Mojca Lorber
94dc314c73 Hide hamburger menu on login screen 2020-05-25 10:39:35 +02:00
mlorb
384ec40c4e
Merge pull request #2542 from mlorb/ml-sci-4582
Task details description corrections and some changes of locales [SCI-4582]
2020-05-25 09:10:37 +02:00
aignatov-bio
9973151278
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field
Fix new comment field [SCI-4662]
2020-05-25 09:09:33 +02:00
aignatov-bio
100108bd43
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search
Improve search through assigned tasks [SCI-4642]
2020-05-25 09:09:19 +02:00
Miha Mencin
24e5839319
Merge pull request #2600 from okriuchykhin/ok_SCI_4661
Improve handling of unassigned inventories with existing snapshots [SCI-4661]
2020-05-25 08:25:54 +02:00
Alex Kriuchykhin
af988b08ae
Merge pull request #2599 from biosistemika/dependabot/bundler/puma-4.3.5
Bump puma from 4.3.3 to 4.3.5
2020-05-22 17:38:27 +02:00
Oleksii Kriuchykhin
c98b042585 Improve handling of unassigned inventories with existing snapshots [SCI-4661] 2020-05-22 17:36:04 +02:00
aignatov-bio
f180a47c95
Merge pull request #2585 from aignatov-bio/ai-sci-4655-add-full-size-clickable-buttons
Make snapshots versions buttons full size clickable [SCI-4655]
2020-05-22 17:17:22 +02:00