Commit graph

6126 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +01:00
mlorb
5f663b3c74
Merge pull request #1600 from mlorb/ml-sci-3215
Implement missing tests for global activities [SCI-3215][SCI-3219]
2019-03-28 11:10:38 +01:00
aignatov-bio
08263ab64e
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
2019-03-28 10:55:48 +01:00
Alex Kriuchykhin
9f5b331b9f
Merge pull request #1604 from okriuchykhin/ok_SCI_3177
Fix experiment workflow image display after touching [SCI-3177]
2019-03-28 09:51:01 +01:00
Urban Rotnik
685b7138b7
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list
Add message for empty activity list [SCI-3224]
2019-03-28 09:16:29 +01:00
aignatov-bio
e804285f55
Merge pull request #1602 from aignatov-bio/ai-sci-3239-add-localization-team-for-objects
Adding localization to subjects group name in filters [SCI-3239]
2019-03-28 09:14:08 +01:00
Urban Rotnik
d0a8652969 Add message for empty activity list 2019-03-28 09:14:01 +01:00
aignatov-bio
8416d1ab1c
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects 2019-03-28 09:13:34 +01:00
aignatov-bio
5c9d2cbc60
Merge pull request #1601 from aignatov-bio/ai-sci-3175-help-window-does-not-close-bug
Fix tooltip freeze bug [SCi-3175]
2019-03-28 09:12:37 +01:00
Jure Grabnar
74a10dfd04
Merge pull request #1603 from jbargu/jg_3226
When user clicks on one of the date button filter button is not highlighted
2019-03-28 06:27:34 +01:00
Jure Grabnar
aa186f675a Fix clear filter not clearing date label
Closes SCI-3226
2019-03-27 18:47:34 +01:00
Oleksii Kriuchykhin
37c559debd Fix experiment workflow image display after touching [SCI-3177] 2019-03-27 17:02:59 +01:00
Jure Grabnar
07609d34c8 User/teams are now alphabetically listed 2019-03-27 15:34:01 +01:00
Jure Grabnar
9881ff38ee Add color to HOT buttons 2019-03-27 15:34:01 +01:00
Anton Ignatov
3676aeb83c Adding localization to subjects group name in filters 2019-03-27 15:30:04 +01:00
aignatov-bio
5258c05c69
Merge pull request #1599 from aignatov-bio/ai-sci-3210-add-placeholder-to-filters
Adding placeholders to filters [SCI-3210]
2019-03-27 14:40:22 +01:00
Anton Ignatov
03123c34f8 adding date placeholder 2019-03-27 14:39:29 +01:00
Anton Ignatov
46ee2557d4 Fix tooltip stuck bug 2019-03-27 13:53:32 +01:00
Matej Zrimšek
318c322a1c Fix sorting of custom columns on repository datatables 2019-03-27 12:58:55 +01:00
Matej Zrimšek
632835cf30 Fix fetching assigned repository rows when using filter & refactor it 2019-03-27 12:58:55 +01:00
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Anton Ignatov
1d244508f5 Adding placeholders to filters 2019-03-27 11:19:58 +01:00
aignatov-bio
c2e1e85913
Adding localization for activity name and activity group (#1598) 2019-03-27 10:33:33 +01:00
Miha Mencin
1b19e67c07 Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d.
2019-03-27 10:21:40 +01:00
Alex Kriuchykhin
d0a5f4fd6e
Merge pull request #1596 from okriuchykhin/ok_SCI_3173
Fix duplicated projects in new report modal [SCI-3173]
2019-03-27 09:28:40 +01:00
Urban Rotnik
af93694560
Merge pull request #1591 from urbanrotnik/ur-SCI-3201-rename-button-all-activities
Rename dropdown labels for Activities, Users and Teams [SCI-3201]
2019-03-27 05:49:50 +01:00
Urban Rotnik
2487089dd3 Rename dropdown labels for Activities, Users and Teams 2019-03-27 05:47:54 +01:00
Oleksii Kriuchykhin
dab75d5aec Fix duplicated projects in new report modal [SCI-3173] 2019-03-26 17:24:30 +01:00
Miha Mencin
c3c940b7a3
Merge pull request #1595 from biosistemika/SCI-3236-bug-when-adding-result-commnet
[SCI-3236] showing font-awesome icon based on result type
2019-03-26 17:14:30 +01:00
Miha Mencin
8e12e0f5b3 [SCI-3236] showing font-awesome icon based on result type 2019-03-26 17:04:31 +01:00
aignatov-bio
a3c1796497
Adding arrow to drop down [SCI-3212] (#1594)
* Adding arrow to dropdown
2019-03-26 16:49:12 +01:00
aignatov-bio
6012513c13
Reduce font size of filters title [SCI-3208] (#1592)
* reduce font size of filters titles;

* fix new title
2019-03-26 16:47:36 +01:00
Alex Kriuchykhin
db7bfbc3fa
Merge pull request #1593 from okriuchykhin/ok_SCI_3223
Change filtering logic when no filters are selected [SCI-3223]
2019-03-26 16:09:05 +01:00
Oleksii Kriuchykhin
2ff43a3320 Change filtering logic when no filters are selected [SCI-3223] 2019-03-26 16:04:03 +01:00
Alex Kriuchykhin
935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
2019-03-26 16:02:44 +01:00
aignatov-bio
54fd3a748b
Adding activity groups [SCI-3203] (#1588)
* Adding activty groups
2019-03-26 15:29:21 +01:00
Urban Rotnik
738d6f0f8c
Merge pull request #1590 from urbanrotnik/ur-SCI-3209-circles-to-checkboxes
Add fontawesome checkmark before dropdown item [SCI-3209]
2019-03-26 13:49:19 +01:00
Miha Mencin
6e5362453b
Merge pull request #1589 from biosistemika/SCI-3232-bugfixes
[SCI-3232] Can not save new/edited text/table result, can not archive text/table result, can not save edited file result.
2019-03-26 13:02:23 +01:00
Urban Rotnik
68d87efaa0
Merge pull request #1582 from urbanrotnik/ur-SCI-3134-changes-to-step-design
Step header changes, removed vertical line [SCI-3134]
2019-03-26 12:38:04 +01:00
Urban Rotnik
80cd01c2e5
Merge pull request #1587 from urbanrotnik/ur-SCI-3207-remove-search-field
Comment out search field for global activities [SCI-3207]
2019-03-26 12:37:07 +01:00
Urban Rotnik
96fa620c4c Add fontawesome checkmark before dropdown item
SCI-3209
2019-03-26 12:35:17 +01:00
Miha Mencin
9a30d7be9d SCI-3232 renaming the attribute name so it doesnt get 'constantized' 2019-03-26 11:39:54 +01:00
Jure Grabnar
35743434fc
Merge pull request #1577 from jbargu/jg_sci_3072
Adding steps to Protocol on the task [SCI-3072]
2019-03-26 10:26:37 +01:00
aignatov-bio
cee3796f35
Merge pull request #1583 from aignatov-bio/ai-sci-3203-show-selection-left
Move dropdown container to left [SCI-3203]
2019-03-26 09:37:12 +01:00
Urban Rotnik
790f4450cc Comment out search field for global activities 2019-03-25 18:15:31 +01:00
Oleksii Kriuchykhin
e3a3ec4491 Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225] 2019-03-25 17:38:13 +01:00
Urban Rotnik
b0f0ded87d Step header changes, removed vertical line
SCI-3134
2019-03-25 17:25:13 +01:00
Miha Mencin
37c8d9b36f
Merge pull request #1585 from biosistemika/fix-failing-tests
removing activity creation from demo project
2019-03-25 16:05:06 +01:00
Miha Mencin
4c3c0ef908 removing activity creation from demo project 2019-03-25 15:45:10 +01:00
Miha Mencin
4e9d566934
Merge pull request #1584 from biosistemika/features/global-activities
Features/global activities
2019-03-25 14:37:50 +01:00