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 |
|
Miha Mencin
|
4a87216a3d
|
Merge branch 'master' into features/global-activities
|
2019-03-25 14:35:24 +01:00 |
|
Anton Ignatov
|
2d5df1b3b7
|
Moving dropdown container to left
|
2019-03-25 13:56:32 +01:00 |
|
aignatov-bio
|
fd6e622b95
|
Merge pull request #1579 from aignatov-bio/ai-sci-3205-remove-whitespace-for-dates
Remove white spaces for date in global activities [SCI-3205]
|
2019-03-25 12:58:35 +01:00 |
|
aignatov-bio
|
282d67fdfd
|
Merge pull request #1578 from aignatov-bio/ai-sci-3218-reduce-white-space
Remove whitespace to breadcrumbs [SCI-3218]
|
2019-03-25 12:58:21 +01:00 |
|
Anton Ignatov
|
c584a0d606
|
Remove white spaces for date in global activites
|
2019-03-25 11:06:00 +01:00 |
|
Anton Ignatov
|
c8c211f245
|
Remove whitespace to breadcrumbs
|
2019-03-25 09:39:17 +01:00 |
|
Jure Grabnar
|
171b2eeedc
|
Remove the title of protocol steps when empty
Closes SCI-3072
|
2019-03-25 09:36:56 +01:00 |
|
aignatov-bio
|
9fff93ab0e
|
Merge pull request #1576 from biosistemika/image-editor-prototype
Feature/Image annotation
|
2019-03-22 16:31:00 +01:00 |
|
Anton Ignatov
|
fc7400bec9
|
fix markup
|
2019-03-22 13:42:12 +01:00 |
|
Anton Ignatov
|
65521533b4
|
change js.erb to js
|
2019-03-22 13:35:11 +01:00 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +01:00 |
|
aignatov-bio
|
723024202e
|
Image editor improvements [SCI - 3158, 3160, 3156, 3154] (#1563)
* Improvments SCI - 3158, 3160, 3156, 3154
|
2019-03-22 09:27:50 +01:00 |
|
Anton Ignatov
|
bc58f0aecd
|
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
|
2019-03-21 11:48:51 +01:00 |
|
Jure Grabnar
|
f3e6a35121
|
Update PermissionEval tests with team check
|
2019-03-21 10:45:21 +01:00 |
|
aignatov-bio
|
e8827b0d74
|
Update tags in task info [SCI-3093] (#1575)
* Adding inline tags selection
|
2019-03-21 10:13:07 +01:00 |
|