Oleksii Kriuchykhin
|
c47d243b1f
|
Disable WOPI edit button in read only mode [SCI-3281]
|
2019-04-02 17:45:26 +02:00 |
|
Oleksii Kriuchykhin
|
ffa7c5ecb2
|
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
|
2019-04-02 16:38:53 +02:00 |
|
aignatov-bio
|
3a2f78d7a8
|
Fix freeze top pane tags bug (#1627)
|
2019-04-02 16:05:48 +02:00 |
|
Anton Ignatov
|
94efd2e649
|
Fix tests
|
2019-04-02 16:04:50 +02:00 |
|
Alex Kriuchykhin
|
93350d1ac8
|
Merge pull request #1626 from okriuchykhin/ok_SCI_3174
Fix comment menu position on canvas [SCI-3174]
|
2019-04-02 15:10:14 +02:00 |
|
Alex Kriuchykhin
|
76e016f164
|
Merge pull request #1628 from urbanrotnik/ur-sci-3282-fix-dates-for-activities
Show date value without link [SCI-3282]
|
2019-04-02 14:40:53 +02:00 |
|
Urban Rotnik
|
86ddbc68b6
|
fixup! Show date actual value without link
|
2019-04-02 14:21:06 +02:00 |
|
Jure Grabnar
|
a2623b5124
|
Fix non-existant current_team in WOPI create_activity
Closes SCI-3279
|
2019-04-02 14:20:01 +02:00 |
|
Anton Ignatov
|
c9f9523210
|
Remove src when save description and rename token tag
|
2019-04-02 13:41:32 +02:00 |
|
Urban Rotnik
|
8eaeeee9f8
|
Show date actual value without link
|
2019-04-02 13:15:34 +02:00 |
|
Oleksii Kriuchykhin
|
91a87cbf3a
|
Fix comment menu position on canvas [SCI-3174]
|
2019-04-02 12:54:21 +02:00 |
|
Jure Grabnar
|
ac1b43165d
|
Merge pull request #1625 from jbargu/jg_sci_3257
Remove html_safe on activities [SCI-3257]
|
2019-04-02 12:04:01 +02:00 |
|
aignatov-bio
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
Jure Grabnar
|
8443ed0fb3
|
Add sanitize input to old activity messages
|
2019-04-02 11:25:07 +02:00 |
|
Jure Grabnar
|
5dd0cf091f
|
Remove html_safe from activites head title
|
2019-04-02 11:16:08 +02:00 |
|
aignatov-bio
|
e93b0c3109
|
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities
* Adding link to task activities
|
2019-04-02 11:14:36 +02:00 |
|
Urban Rotnik
|
6ec22c0b3b
|
Merge pull request #1618 from urbanrotnik/ur-sci-3240-missing-activities-of-intentory
Missing activities, fix for showing report name, add step positions, fixed links [SCI-3240] [SCI-3246]
|
2019-04-02 11:02:57 +02:00 |
|
Jure Grabnar
|
85bbdcf4b3
|
Remove .html_safe from activity
Closes SCI-3257
|
2019-04-02 11:02:22 +02:00 |
|
Urban Rotnik
|
73dd6678ee
|
Fix for show date value
|
2019-04-02 10:36:11 +02:00 |
|
aignatov-bio
|
daaa6a367b
|
Adding custom scrollbar to global activities [SCI-3206] (#1623)
* Adding custom scrollbar to global activities
|
2019-04-02 09:56:50 +02:00 |
|
Urban Rotnik
|
dc0c629798
|
Fix to show report name in Activities
|
2019-04-01 15:58:28 +02:00 |
|
Urban Rotnik
|
0ed96d68de
|
Add step position for steps in Protocol repository. Add default value for blank names also.
|
2019-04-01 15:58:17 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
Jure Grabnar
|
5443bfcbd1
|
Merge pull request #1622 from jbargu/jg_3242
Remove JS memory leak on project index page
|
2019-04-01 15:36:30 +02:00 |
|
Alex Kriuchykhin
|
b3aa6be23d
|
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
Add global activities to reports [SCI-3255]
|
2019-04-01 15:07:06 +02:00 |
|
Jure Grabnar
|
d9c10c6c7b
|
Remove reapplying callback actions on project index page
Closes SCI-3242.
|
2019-04-01 15:02:47 +02:00 |
|
Jure Grabnar
|
e165459ef5
|
Merge pull request #1574 from jbargu/jg_sci_3149_3163
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
|
2019-04-01 14:32:54 +02:00 |
|
mlorb
|
b24a07f1c8
|
Merge pull request #1616 from mlorb/ml-sci-3237
Change activities for task protocols [SCI-3237]
|
2019-04-01 14:32:16 +02:00 |
|
Jure Grabnar
|
83130426e2
|
Merge pull request #1617 from jbargu/jg_3244
Duplicated activity, report activity ... [SCI-3244]
|
2019-04-01 14:31:53 +02:00 |
|
Urban Rotnik
|
213226fba8
|
Merge pull request #1620 from urbanrotnik/ur-sci-3245-activity-error-when-delete-result
Fix showing result icon when result is deleted [SCI-3245]
|
2019-04-01 14:25:19 +02:00 |
|
Jure Grabnar
|
111b0e2b7f
|
Merge pull request #1615 from jbargu/jg_sci_3252
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
|
2019-04-01 12:30:48 +02:00 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Urban Rotnik
|
03dcc91cf1
|
Fix showing result icon when result is deleted
|
2019-04-01 09:58:13 +02:00 |
|
Jure Grabnar
|
3a79f7ca01
|
Add activity to save_pdf_to_inventory_item
|
2019-03-29 16:01:36 +01:00 |
|
Jure Grabnar
|
6533368763
|
Add activity for importing inv items
|
2019-03-29 15:41:34 +01:00 |
|
Mojca Lorber
|
3c69225d6b
|
Change activities for task protocols
|
2019-03-29 15:09:20 +01:00 |
|
Jure Grabnar
|
f843092aac
|
Add activity for moving worklfows
Closes SCI-3252
|
2019-03-29 13:51:17 +01:00 |
|
Alex Kriuchykhin
|
a9501603c2
|
Merge pull request #1613 from okriuchykhin/ok_SCI_3172
Fix unconfirmed users clean-up issues [SCI-3172]
|
2019-03-29 13:10:34 +01:00 |
|
Jure Grabnar
|
fe3e92468f
|
Merge pull request #1611 from jbargu/jg_sci_3226_3243
Too much empty space between date buttons [SCI-3243] [SCI-3226]
|
2019-03-29 12:30:53 +01:00 |
|
Oleksii Kriuchykhin
|
7d4fbcb32e
|
Fix unconfirmed users clean-up issues [SCI-3172]
|
2019-03-29 11:11:53 +01:00 |
|
Jure Grabnar
|
8bc10e1ca7
|
Change breadcrumbs for cloning experiment to destination project
|
2019-03-29 09:52:07 +01:00 |
|
Alex Kriuchykhin
|
913bdd91be
|
Merge pull request #1610 from okriuchykhin/ok_SCI_3251
Make subject search more precise in global activities [SCI-3251]
|
2019-03-29 09:28:13 +01:00 |
|
aignatov-bio
|
b51dcc9d75
|
Adding children selector to global activities subjects [SCI-3247] (#1605)
* Adding children selector to global activities subjects
* Fix naming, add seperate check for project id
|
2019-03-29 09:26:27 +01:00 |
|
aignatov-bio
|
ba4b35d004
|
Fix date hot buttons (#1606)
|
2019-03-29 09:07:46 +01:00 |
|
aignatov-bio
|
ce7bbd6b07
|
Adding deselect button to objects filter and some localizations fix (#1608)
|
2019-03-29 09:04:58 +01:00 |
|
Jure Grabnar
|
226cf21787
|
No top margin for select custom dates button
|
2019-03-29 08:42:15 +01:00 |
|
Jure Grabnar
|
e9133bbea9
|
Remove empty space between date buttons
Closes SCI-3243
|
2019-03-29 08:29:16 +01:00 |
|
Jure Grabnar
|
e8a4fd5360
|
Fix date label
Closes SCI-3226
|
2019-03-29 08:18:15 +01:00 |
|
Alex Kriuchykhin
|
88b4ca0798
|
Merge pull request #1609 from okriuchykhin/ok_SCI_3213
Fix role name in change user role in team activity [SCI-3213]
|
2019-03-28 17:32:51 +01:00 |
|
Alex Kriuchykhin
|
9137740266
|
Merge pull request #1607 from okriuchykhin/ok_SCI_3229
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
|
2019-03-28 17:32:24 +01:00 |
|
Oleksii Kriuchykhin
|
58af23e9b5
|
Make subject search more precise in global activities [SCI-3251]
|
2019-03-28 17:03:05 +01:00 |
|
Oleksii Kriuchykhin
|
6bc944fcc7
|
Fix role name in change user role in team activity [SCI-3213]
|
2019-03-28 16:26:07 +01:00 |
|
Oleksii Kriuchykhin
|
5008339d81
|
Add handling of links for objects from another team [SCI-3229][SCI-3241]
|
2019-03-28 14:56:34 +01:00 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
4c3c0ef908
|
removing activity creation from demo project
|
2019-03-25 15:45:10 +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 |
|
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 |
|
aignatov-bio
|
e8827b0d74
|
Update tags in task info [SCI-3093] (#1575)
* Adding inline tags selection
|
2019-03-21 10:13:07 +01:00 |
|
Mojca Lorber
|
c55e314ed5
|
Refactor upon the review requests
|
2019-03-20 21:34:47 +01:00 |
|
Anton Ignatov
|
5d6f009ee8
|
fix error for delay deleting
|
2019-03-20 15:20:31 +01:00 |
|
Anton Ignatov
|
55c93922ea
|
markup fixes
|
2019-03-20 14:46:54 +01:00 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Mojca Lorber
|
e34ddeaefd
|
Remove activities from demo project
|
2019-03-20 13:25:59 +01:00 |
|
Jure Grabnar
|
5de51f9c58
|
Prevent smart annotations accessing other teams when importing protocol
Closes SCI-3163
|
2019-03-20 12:58:22 +01:00 |
|
aignatov-bio
|
5d9e4f30d4
|
Duplicates name protocol bug and rake task to rename duplicates [SCI-3047] (#1541)
* Fix double protocols bug and rake task to rename duplicates
|
2019-03-20 12:41:14 +01:00 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Mojca Lorber
|
4f9814b884
|
Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021
|
2019-03-20 11:03:00 +01:00 |
|
Jure Grabnar
|
cf5505d95f
|
Add missing inventory name in notification
Closes SCI-3149
|
2019-03-20 10:52:58 +01:00 |
|
Anton Ignatov
|
29b67be127
|
Fix team selection in global activities and add link from navbar
|
2019-03-20 10:33:22 +01:00 |
|
Mojca Lorber
|
42ff1c0a68
|
fix bug in revert protocol method
|
2019-03-20 09:43:38 +01:00 |
|
Oleksii Kriuchykhin
|
b46f3566ef
|
Fix rendering of HTML in RTE fields [SCI-3111]
|
2019-03-19 23:32:24 +01:00 |
|
Oleksii Kriuchykhin
|
eb3d1ea6fe
|
Update RTE for step description [SCI-3111]
|
2019-03-19 17:42:49 +01:00 |
|
Mojca Lorber
|
cd7a87348f
|
Protocol activities refactoring, without tests
|
2019-03-19 16:12:07 +01:00 |
|
Mojca Lorber
|
c476816359
|
Task activities refactoring, without tests
|
2019-03-19 15:33:57 +01:00 |
|
Mojca Lorber
|
7757096693
|
Results activities refactoring
|
2019-03-19 15:33:57 +01:00 |
|
Mojca Lorber
|
1418abc8d7
|
Reports activities refactoring
|
2019-03-19 15:33:57 +01:00 |
|
Mojca Lorber
|
d1e38e5bc9
|
Project activities refactoring
|
2019-03-19 15:33:57 +01:00 |
|
Mojca Lorber
|
70eebca5ee
|
experiment activities refactoring
|
2019-03-19 15:33:57 +01:00 |
|
Urban Rotnik
|
1017836c0e
|
Activities service fix
|
2019-03-19 14:12:39 +01:00 |
|
Urban Rotnik
|
fe35c805b7
|
Add model breadcrumbs, update activities_helper
|
2019-03-19 14:01:06 +01:00 |
|
aignatov-bio
|
6eae12efab
|
Updating permission check for image editing [SCI - 3153, 3159] (#1568)
*Add permission check for assets editing
* Add check for image format
|
2019-03-19 13:52:57 +01:00 |
|
Anton Ignatov
|
f606210652
|
Rubocop fix
|
2019-03-19 13:52:03 +01:00 |
|
Anton Ignatov
|
87280f083a
|
[SCI-3166] Finalize global activities front end
|
2019-03-19 13:50:55 +01:00 |
|
Alex Kriuchykhin
|
7db53fad7c
|
Merge pull request #1566 from okriuchykhin/ok_SCI_3062
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-19 13:28:05 +01:00 |
|
aignatov-bio
|
a0a3c4b97f
|
Fix file format bug (#1569)
|
2019-03-19 11:06:36 +01:00 |
|
Oleksii Kriuchykhin
|
0c71493fdb
|
Add viewing permissions for global activities [SCI-2997]
|
2019-03-18 15:38:19 +01:00 |
|
Oleksii Kriuchykhin
|
5bc41c1f06
|
Fix task tags field after merging latest master to feature branch
|
2019-03-15 14:21:34 +01:00 |
|
Urban Rotnik
|
5dccdbab17
|
fixup! Fix failing tests
|
2019-03-15 11:12:10 +01:00 |
|
Oleksii Kriuchykhin
|
ba41afe449
|
Re-orginize TinyMCE init callback [SCI-3062][SCI-3071]
|
2019-03-15 11:07:57 +01:00 |
|
Urban Rotnik
|
2ea2700837
|
fixup! Fix failing tests
|
2019-03-15 10:30:51 +01:00 |
|
Oleksii Kriuchykhin
|
2cc170c3d4
|
Close RTE on save [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Oleksii Kriuchykhin
|
a822227383
|
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
|
2019-03-14 16:27:33 +01:00 |
|
Oleksii Kriuchykhin
|
645930b8d7
|
Merge branch 'master' into features/note-section
|
2019-03-14 16:25:51 +01:00 |
|
Urban Rotnik
|
b6a8556601
|
Add activities for exporting Projects, Inventory items
|
2019-03-12 09:15:06 +01:00 |
|
Urban Rotnik
|
e7b57aa4f7
|
Add creating activities for Team actions
|
2019-03-12 09:15:06 +01:00 |
|
Urban Rotnik
|
3f18166320
|
Add Task and TaskTags activities
|
2019-03-12 09:15:06 +01:00 |
|
Urban Rotnik
|
7a05e817ef
|
Add new Protocol steps activities
|
2019-03-12 09:15:06 +01:00 |
|
Urban Rotnik
|
b33e95e18a
|
New Protocols actions logging
|
2019-03-12 09:14:53 +01:00 |
|
Urban Rotnik
|
cfe2888bea
|
Repository columns actions loggin
|
2019-03-12 09:11:00 +01:00 |
|
Urban Rotnik
|
32422c00eb
|
RepositoryRows actions loggin
|
2019-03-12 09:11:00 +01:00 |
|
Urban Rotnik
|
2a7bbac733
|
Repository actions logging
|
2019-03-12 09:11:00 +01:00 |
|
Urban Rotnik
|
976831e7d3
|
Edit and Archive experiment activity logging
|
2019-03-12 09:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
af94f79f0d
|
Submit image as FormData [SCI-2879]
|
2019-03-11 15:13:08 +01:00 |
|
Oleksii Kriuchykhin
|
7315db73f1
|
Add missing semicolon [SCI-2856]
|
2019-03-11 15:13:08 +01:00 |
|
Oleksii Kriuchykhin
|
9bbdc8fc89
|
Include tui image editor with webpack [SCI-2856]
|
2019-03-11 15:12:38 +01:00 |
|
Oleksii Kriuchykhin
|
ded74044de
|
Fix circle icon in image editor [SCI-2855]
|
2019-03-11 15:10:38 +01:00 |
|
Oleksii Kriuchykhin
|
feb75f62e1
|
Add workaround for image caching in fabric js [SCI-2855]
|
2019-03-11 15:10:32 +01:00 |
|
Oleksii Kriuchykhin
|
80e525fd97
|
Improve image editor behaviour [SCI-2855]
|
2019-03-11 15:09:49 +01:00 |
|
Oleksii Kriuchykhin
|
89e968c410
|
Add tui.image-editor [SCI-2815]
|
2019-03-11 15:08:15 +01:00 |
|
Urban Rotnik
|
3992336db9
|
Add type and value_for attributes to user hash
|
2019-03-11 08:37:22 +01:00 |
|
Urban Rotnik
|
b8e84b5685
|
Add logic for saving message items values and types
|
2019-03-11 08:37:22 +01:00 |
|
Urban Rotnik
|
9ed3313f0f
|
Create project activity refactored
|
2019-03-11 08:36:15 +01:00 |
|
Urban Rotnik
|
117944117b
|
Add service for activity creation
|
2019-03-11 08:36:15 +01:00 |
|
Oleksii Kriuchykhin
|
e3bacd6b9a
|
Fix global activities page after refactoring [SCI-2994][SCI-3024]
|
2019-03-08 13:09:27 +01:00 |
|
Jure Grabnar
|
eceda4909f
|
Move edit_file permission for wopi file in a special function
Used for overwritting it in addons.
Closes SCI-2949
|
2019-03-08 12:22:35 +01:00 |
|
Oleksii Kriuchykhin
|
0b87e8e1e4
|
Merge branch 'features/global-activities' into ok_SCI_3024_v3
|
2019-03-08 10:29:51 +01:00 |
|
Alex Kriuchykhin
|
bb29a97962
|
Merge pull request #1557 from okriuchykhin/ok_SCI_3151
Improve JS files inclusion in export all [SCI-3151]
|
2019-03-07 17:46:45 +01:00 |
|
Oleksii Kriuchykhin
|
af9daf3a5e
|
Improve JS files inclusion in export all [SCI-3151]
|
2019-03-07 17:42:47 +01:00 |
|
Alex Kriuchykhin
|
ec1aec3bf1
|
Merge pull request #1556 from okriuchykhin/ok_SCI_3048
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:58:30 +01:00 |
|
Oleksii Kriuchykhin
|
0c99ea9c5c
|
Fix local storage file download links [SCI-3048]
|
2019-03-07 16:46:05 +01:00 |
|
Oleksii Kriuchykhin
|
8cc95bf491
|
Embed tables JS files to main HTML of Export All [SCI-3151]
|
2019-03-07 14:23:10 +01:00 |
|
Alex Kriuchykhin
|
d5110a4f87
|
Merge pull request #1554 from okriuchykhin/ok_SCI_3150
Fix JS files inclusion in export all report [SCI-3150]
|
2019-03-07 11:17:51 +01:00 |
|
Oleksii Kriuchykhin
|
2b239e2f35
|
Fix JS files inclusion in export all report [SCI-3150]
|
2019-03-07 11:14:38 +01:00 |
|
aignatov-bio
|
ec2dbb897f
|
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521)
* Adding side pane filtering and top pane
|
2019-03-06 10:34:04 +01:00 |
|
aignatov-bio
|
125d2a3b9b
|
New inline tags editing in task [SCI 3093] (#1529)
* Adding inline tags selection
|
2019-03-06 09:18:45 +01:00 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Miha Mencin
|
8fbda40c49
|
Merge pull request #1552 from biosistemika/mm-sci-3119-create-templates-at-login
put the scheduling logic into session create action
|
2019-03-05 10:56:48 +01:00 |
|
Miha Mencin
|
9807c80286
|
move the create action to the tope section of controller
|
2019-03-05 10:49:36 +01:00 |
|
Miha Mencin
|
67fe486874
|
put the scheduling logic into session create action
|
2019-03-05 10:43:39 +01:00 |
|
aignatov-bio
|
6dcaea973d
|
Merge pull request #1550 from aignatov-bio/ai-sci-3123-keep-title-bold
Bold text for read messages SCI-3123
|
2019-03-05 10:30:16 +01:00 |
|
Miha Mencin
|
6deaff6382
|
fixing hound errors
|
2019-03-04 18:36:32 +01:00 |
|
Miha Mencin
|
fa7bba9de7
|
scheduling creation of demo project at the sign in time
remove wrong schema, fix comment, add migration
|
2019-03-04 18:26:15 +01:00 |
|
Anton Ignatov
|
33682bb561
|
Bold text for read messages
|
2019-03-04 13:48:25 +01:00 |
|
Oleksii Kriuchykhin
|
c3705ccb25
|
Improve group collapse JS code [SCI-2994][SCI-3024]
|
2019-03-04 13:44:43 +01:00 |
|
Miha Mencin
|
2ba040980f
|
reverting the team changes, the scope is not needed
|
2019-03-01 17:48:38 +01:00 |
|
Miha Mencin
|
844303ae7c
|
SCI-3119 schedule the creaton of template
|
2019-03-01 17:47:04 +01:00 |
|
aignatov-bio
|
d69f8c5636
|
Merge pull request #1547 from aignatov-bio/ai-sci-3114-recapthca-bug
Remove script from modal SCI-3114
|
2019-03-01 14:58:49 +01:00 |
|
Anton Ignatov
|
f636b5adff
|
Remove script from modal
|
2019-03-01 14:56:06 +01:00 |
|
aignatov-bio
|
9a007b5d75
|
Merge pull request #1542 from aignatov-bio/ai-sci-3108-missing-user-name-in-activity
Fix missing user name in activty, when moving experiment [SCI-3108]
|
2019-03-01 14:16:59 +01:00 |
|
Alex Kriuchykhin
|
985820a97c
|
Merge pull request #1527 from okriuchykhin/ok_SCI_3101
Move templates project creation for new team to delayed job [SCI-3101]
|
2019-03-01 13:55:49 +01:00 |
|
Alex Kriuchykhin
|
09ed7922da
|
Merge pull request #1543 from okriuchykhin/ok_SCI_3107
Improve speed of index query in projects overview service [SCI-3107]
|
2019-03-01 13:53:56 +01:00 |
|
Anton Ignatov
|
1ae4a60f79
|
Fix recaptha error
|
2019-03-01 12:58:31 +01:00 |
|
Oleksii Kriuchykhin
|
1fedb4c91e
|
Improve speed of index query in projects overview service [SCI-3107]
|
2019-02-28 17:46:34 +01:00 |
|
Anton Ignatov
|
9e472c0ccf
|
Fix missing user name in activty, when moving experiment
|
2019-02-28 16:06:23 +01:00 |
|
Miha Mencin
|
4f9daa9590
|
SCI-3112 Change the the comments in demo project generator
|
2019-02-28 11:39:44 +01:00 |
|
Miha Mencin
|
088a860683
|
Merge pull request #1539 from biosistemika/features/templates
Features/templates
|
2019-02-28 10:23:13 +01:00 |
|
Jure Grabnar
|
18c738263d
|
Merge pull request #1536 from jbargu/jg_sci_3100
Missing item smart annotation in Demo project [SCI-3100, 3098]
|
2019-02-28 09:52:28 +01:00 |
|
Miha Mencin
|
d03ef2cd2a
|
Merge branch 'master' into features/templates
|
2019-02-28 09:41:20 +01:00 |
|
Jure Grabnar
|
93490a1f47
|
Add missing created_at and fix typo
Closes SCI-3100, SCI-3098
|
2019-02-28 07:29:25 +01:00 |
|