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 |
|
Miha Mencin
|
a372ebf07d
|
Revert "Task info section improvements [SCI - 3058]"
|
2019-02-27 21:00:11 +01:00 |
|
Jure Grabnar
|
0fbbe8b5de
|
Add result comments to demo project
Closes [SCI-3100].
|
2019-02-27 20:32:28 +01:00 |
|
Miha Mencin
|
576520659c
|
Merge pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations
added uniquness validator and index on user_projects and user_teams r…
|
2019-02-27 19:53:25 +01:00 |
|
Oleksii Kriuchykhin
|
0930277c4e
|
Add views and helpers for global activities individual cards [SCI-2994][SCI-3024]
|
2019-02-27 16:02:53 +01:00 |
|
Jure Grabnar
|
3acf9b71f8
|
Merge pull request #1525 from jbargu/jg_sci_3096_and_other_demo_issues
Demo project improvements [SCI-3096], [SCI-3097], [SCI-3098], [SCI-3099], [SCI-3102]
|
2019-02-27 15:43:14 +01:00 |
|
aignatov-bio
|
7ced0b367b
|
Merge pull request #1531 from aignatov-bio/ai-sci-3095-notification-bug-on-signup
First what's up notification user gets already at signup [SCI-3095]
|
2019-02-27 15:42:20 +01:00 |
|
Jure Grabnar
|
0699204d3b
|
Add changes for parallel exec discussed with Miha
|
2019-02-27 15:22:19 +01:00 |
|
Miha Mencin
|
51b3aea49a
|
added uniquness validator and index on user_projects and user_teams relations
finxing typo, fixied failing test
fixing mistakenly commited file
fixing schema to include bigint migration
|
2019-02-27 15:09:47 +01:00 |
|
Urban Rotnik
|
3121bf1d39
|
Update tooltip for system notifications dropdown
|
2019-02-27 14:49:18 +01:00 |
|
Anton Ignatov
|
a6666c688c
|
Adding check for user tutorial
|
2019-02-27 13:55:46 +01:00 |
|
Oleksii Kriuchykhin
|
0266f6bd3c
|
Change search on subject query constaruction logic [SCI-3014]
|
2019-02-27 13:21:05 +01:00 |
|
Anton Ignatov
|
978c4bcb69
|
Fixed, trying to save object instead name
|
2019-02-27 10:43:46 +01:00 |
|
Jure Grabnar
|
30bc536d07
|
Fix smart annotations in demo project
Closes SCI-3097, SCI-3102.
|
2019-02-26 14:36:48 +01:00 |
|
Oleksii Kriuchykhin
|
74a60d443d
|
Merge branch 'features/global-activities' into ok_SCI_3014_v2
|
2019-02-26 13:46:25 +01:00 |
|
Oleksii Kriuchykhin
|
a0d2f7c676
|
Move templates project creation for new team to delayed job [SCI-3101]
|
2019-02-26 13:32:00 +01:00 |
|
Oleksii Kriuchykhin
|
61147b480c
|
Add main global activities bussiness logic [SCI-3014]
|
2019-02-26 11:01:15 +01:00 |
|
Jure Grabnar
|
2464a45f83
|
Fix ordering for another step in demo project
Closes SCI-3098.
|
2019-02-26 08:34:50 +01:00 |
|
Jure Grabnar
|
c409c39e60
|
Fix demo project's checklist item ordering
Closes SCI-3099.
|
2019-02-26 08:26:02 +01:00 |
|
Jure Grabnar
|
b6dd783114
|
Improve generation of a demo project
Closes SCI-3096
|
2019-02-26 08:06:07 +01:00 |
|
Urban Rotnik
|
c8ab9f8ff8
|
Fix tests
|
2019-02-26 08:04:05 +01:00 |
|
Urban Rotnik
|
5a123d26ac
|
Activity model update
|
2019-02-26 07:15:05 +01:00 |
|
Anton Ignatov
|
a4cabb203b
|
Task info section improvements
|
2019-02-25 16:55:09 +01:00 |
|
Urban Rotnik
|
3ad6cee766
|
Fix tests, remove nullable field
|
2019-02-25 16:50:38 +01:00 |
|
Miha Mencin
|
76c3db0b11
|
added layout, added css, added select2 lib, WIP
|
2019-02-25 16:50:38 +01:00 |
|
Urban Rotnik
|
5b5c6c7122
|
Changes to Activity model
|
2019-02-25 16:49:55 +01:00 |
|
aignatov-bio
|
0bf7cb4c59
|
Merge pull request #1519 from biosistemika/ai-adding-multiple-select-plugin
Adding new Select2 library with customizations
|
2019-02-25 16:46:07 +01:00 |
|
Jure Grabnar
|
4edab957a4
|
Merge pull request #1516 from jbargu/jg_sci_3069_due_date_red
Due date is not red for today anymore [SCI-3069]
|
2019-02-25 13:20:50 +01:00 |
|
Jure Grabnar
|
d7e91676c3
|
Rename initial experiment back to the old one
|
2019-02-24 08:13:57 +01:00 |
|
Jure Grabnar
|
b4199b28e4
|
Remove turbolinks:load from the project show page
Also rename Demo project experiment back to PCR.
Closes SCI-3081.
|
2019-02-22 19:46:42 +01:00 |
|
Anton Ignatov
|
6971d1a55d
|
Adding new Select2 library with customization
|
2019-02-22 16:40:33 +01:00 |
|
aignatov-bio
|
aa8a2b040a
|
Merge pull request #1518 from biosistemika/features/system-notifications
Notification changes on settings page [SCI 3084] (#1517)
|
2019-02-22 14:01:38 +01:00 |
|
aignatov-bio
|
606708987f
|
Notification changes on settings page [SCI 3084] (#1517)
* Fix css and update text settings
|
2019-02-22 13:20:51 +01:00 |
|
Jure Grabnar
|
f98d6fbd4d
|
Remove archived task in Demo project
Closes SCI-3082.
|
2019-02-22 11:58:32 +01:00 |
|
Jure Grabnar
|
f9cb8c8803
|
Add utc conversion to due_date
|
2019-02-22 10:47:39 +01:00 |
|
Jure Grabnar
|
87dcf301fb
|
Change due_date calculation to DateTime#end_of_day
|
2019-02-22 10:23:12 +01:00 |
|
Jure Grabnar
|
fb533eb9d3
|
Merge pull request #1507 from jbargu/jg_sci_2930_navigation_changed
Add action_name to sidebar cache as dependency [SCI-2930]
|
2019-02-22 10:04:57 +01:00 |
|
Jure Grabnar
|
7f0ea48dff
|
Merge pull request #1515 from jbargu/jg_sci_3080_demo_project_rename
Rename Demo project and create rake task to create it on existing users [SCI-3080]
|
2019-02-22 10:01:39 +01:00 |
|
Jure Grabnar
|
96f2da1e8b
|
Shift due day calculations for 1 day
Closes SCI-3069.
|
2019-02-22 08:01:15 +01:00 |
|
Jure Grabnar
|
ffe0493013
|
Rename Demo project and create rake task to create it on existing users
Closes SCI-3080.
|
2019-02-21 23:31:55 +01:00 |
|
Miha Mencin
|
bcd0b433b6
|
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-21 16:38:58 +01:00 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
Urban Rotnik
|
b50320a4bc
|
Add margin for system notification modal
|
2019-02-21 15:15:33 +01:00 |
|
Oleksii Kriuchykhin
|
db18f88807
|
Update templates to final version [SCI-3053]
|
2019-02-21 15:06:34 +01:00 |
|
Jure Grabnar
|
0fa06ea9fc
|
Merge pull request #1505 from jbargu/jg_sci_2928_few_turbolinks_bugs
Check for recaptcha enabled boolean value
|
2019-02-20 18:29:40 +01:00 |
|
aignatov-bio
|
5fdba554d2
|
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-20 17:22:57 +01:00 |
|
Urban Rotnik
|
82ea31e275
|
Add validation limits for system notification fields
|
2019-02-20 16:05:15 +01:00 |
|
Jure Grabnar
|
61f9df0656
|
Add action_name to sidebar cache as dependency
Closes SCI-2930.
|
2019-02-20 14:13:51 +01:00 |
|
aignatov-bio
|
35268252c8
|
After reading What’s new notification and reloading the page, gift status is unseen again [SCI 3051] (#1504)
* Change relative path to absolute to mark_as_read and make clickable whole system notification with hover effecr
|
2019-02-20 13:15:16 +01:00 |
|
Jure Grabnar
|
e392f9e61f
|
Check for recaptcha enabled boolean value
Closes SCI-2928.
|
2019-02-20 10:14:37 +01:00 |
|
Jure Grabnar
|
27ed8e781e
|
Merge pull request #1501 from jbargu/jg_sci_2985_recaptcha_invite_not_working
Recaptcha input field now addressed with jQuery
|
2019-02-20 08:44:23 +01:00 |
|
Alex Kriuchykhin
|
0a54eb8ebe
|
Merge pull request #1503 from biosistemika/features/templates
Merge features/templates to master
|
2019-02-19 15:07:42 +01:00 |
|
Urban Rotnik
|
7b6c6c414d
|
Merge branch 'master' into features/templates
|
2019-02-19 14:46:15 +01:00 |
|
Mojca Lorber
|
ebfacdd62c
|
change experiments title color
|
2019-02-19 14:24:23 +01:00 |
|
aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +01:00 |
|
Jure Grabnar
|
ebdf9adab0
|
Recaptcha input field now addressed with jQuery
Fix SCI-2985
|
2019-02-19 13:05:33 +01:00 |
|
Urban Rotnik
|
d3d9868ba4
|
Set version for HTTParty dependency, add opts in mailer
|
2019-02-19 11:23:01 +01:00 |
|
Urban Rotnik
|
f63eaaefe7
|
Add user_system_notification records when syncing notifications, update email sending
|
2019-02-19 11:22:58 +01:00 |
|
Urban Rotnik
|
29d77ca81d
|
Add system_notification sending email feature
|
2019-02-19 11:20:25 +01:00 |
|
aignatov-bio
|
8e905b67b2
|
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
|
2019-02-19 11:08:59 +01:00 |
|
aignatov-bio
|
c598541e09
|
System notification modal window [SCI-2957 and SCI-2958] (#1484)
* Added new system notification modal
* Adding loading system notification on sign in
|
2019-02-15 13:07:29 +01:00 |
|
Oleksii Kriuchykhin
|
c186498a5e
|
Merge branch 'features/templates' into ok_SCI_3037
|
2019-02-15 10:47:38 +01:00 |
|
Alex Kriuchykhin
|
185e3b4832
|
Merge pull request #1495 from okriuchykhin/ok_SCI_3039
Create templates project when syncing templates if team doesn't have it [SCI-3039]
|
2019-02-14 17:40:01 +01:00 |
|
Mojca Lorber
|
343a46584f
|
Rename scope
|
2019-02-14 14:54:04 +01:00 |
|
Mojca Lorber
|
0e14c126e5
|
Add scope instead of method for active my_module_group
|
2019-02-14 10:53:48 +01:00 |
|
Urban Rotnik
|
5b55860dea
|
Add scheduler
|
2019-02-13 15:48:15 +01:00 |
|
Urban Rotnik
|
9f3187abdf
|
Add service for sync system notifications
|
2019-02-13 15:48:15 +01:00 |
|
Oleksii Kriuchykhin
|
da30d187a6
|
Create templates project when syncing templates if team doesn't have it [SCI-3039]
|
2019-02-13 15:17:33 +01:00 |
|
mlorb
|
71e4cc4dbd
|
Merge branch 'master' into ml-sci-2940
|
2019-02-13 14:35:03 +01:00 |
|
Mojca Lorber
|
0adb8b2b61
|
Fix failing tests
|
2019-02-13 14:31:26 +01:00 |
|
aignatov-bio
|
5c85595ab4
|
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482)
* System notification view and notification partial (SCI 2956 and SCI 3001)
|
2019-02-13 13:06:14 +01:00 |
|
Mojca Lorber
|
16f99afbc0
|
Minor fixes
|
2019-02-13 12:20:14 +01:00 |
|
Oleksii Kriuchykhin
|
f3ad4f7fc9
|
Fix failing test [SCI-3037]
|
2019-02-12 13:39:38 +01:00 |
|
Mojca Lorber
|
d706a18e2d
|
Add flag for archived tasks to experiment exporter
|
2019-02-12 13:29:48 +01:00 |
|
mlorb
|
8bad68c854
|
Merge pull request #1457 from mlorb/ml-sci-2933
Change experiment cards look and feel [SCI-2933]
|
2019-02-12 11:49:24 +01:00 |
|
Mojca Lorber
|
3b4a894124
|
fix hound
|
2019-02-12 11:24:44 +01:00 |
|
Oleksii Kriuchykhin
|
7854b9d281
|
Merge branch 'features/templates' into ok_SCI_3037
|
2019-02-12 11:18:31 +01:00 |
|
Oleksii Kriuchykhin
|
445098fe45
|
Fix protocols in team export service [SCI-3037]
|
2019-02-12 10:56:15 +01:00 |
|
Alex Kriuchykhin
|
b71c9d96a2
|
Merge pull request #1476 from okriuchykhin/ok_SCI_2944
Add test for templates service [SCI-2944]
|
2019-02-12 09:39:03 +01:00 |
|
Mojca Lorber
|
d8cc482cbf
|
remove electronic signatures from templates
|
2019-02-11 17:51:48 +01:00 |
|
Mojca Lorber
|
78a29c4141
|
add templates after protocol_keyword_team rake task was run
|
2019-02-11 16:15:56 +01:00 |
|
Mojca Lorber
|
087832c29d
|
add templates
|
2019-02-11 14:02:49 +01:00 |
|
aignatov-bio
|
de75ec4600
|
Merge pull request #1485 from biosistemika/ai-sci-3006-inventory-order-bug
[SCI-3006] After changing order of inventory columns item can not be edited, deleted, copied
|
2019-02-11 13:50:13 +01:00 |
|
aignatov-bio
|
16164477ac
|
Merge pull request #1487 from biosistemika/ai-sci-3005-user-counter-card-not-updated
User counter on task card is not updated [SCI-3005]
|
2019-02-11 13:49:49 +01:00 |
|
Alex Kriuchykhin
|
b7d7e4bf10
|
Merge pull request #1488 from okriuchykhin/ok_SCI_3030
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-11 13:41:01 +01:00 |
|
Alex Kriuchykhin
|
11e0ccc24a
|
Merge pull request #1479 from okriuchykhin/ok_SCI_2967
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-11 12:56:31 +01:00 |
|
Oleksii Kriuchykhin
|
2ff5199be0
|
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-07 16:58:38 +01:00 |
|
Anton Ignatov
|
c389b7ab06
|
remove console.log from js
|
2019-02-07 14:26:15 +01:00 |
|
Anton Ignatov
|
c6ab6da381
|
Fixed counter bug SCI-3005
|
2019-02-07 14:23:37 +01:00 |
|
Oleksii Kriuchykhin
|
3376fd012c
|
Improve error loggin in protocol import [SCI-3023]
|
2019-02-07 14:00:24 +01:00 |
|
Anton Ignatov
|
4145b2565c
|
Fixed bug with order in inventories SCI-3006
|
2019-02-07 11:34:04 +01:00 |
|
Oleksii Kriuchykhin
|
fdff69f22e
|
Add comment for Tika start up code [SCI-2967]
|
2019-02-07 11:06:25 +01:00 |
|
Jure Grabnar
|
0fa403d6b0
|
Refactor tests fro experiment import
Closes [SCI-2946]
|
2019-02-06 14:27:43 +01:00 |
|
Matej Zrimšek
|
f68adf1e5e
|
Fix workflow image loading for moved experiments [SCI-3003]
|
2019-02-06 07:51:43 +01:00 |
|
Mojca Lorber
|
227aeb284c
|
change mydemo projects data
|
2019-02-05 11:15:16 +01:00 |
|
Oleksii Kriuchykhin
|
13c4bd25af
|
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-04 16:47:29 +01:00 |
|
Oleksii Kriuchykhin
|
a033e9b207
|
Fix Lato font loading [SCI-2969]
|
2019-02-04 15:36:17 +01:00 |
|
Oleksii Kriuchykhin
|
19f1585352
|
Add test for templates service [SCI-2944]
|
2019-02-01 18:06:36 +01:00 |
|
Miha Mencin
|
e84ab5b550
|
Merge pull request #1475 from biosistemika/mm-sci-2982-user-variables-bug
SciNoteSCI-2982 Investigate (plus, fix) the User.variables on my.scinote.net
|
2019-02-01 09:46:19 +01:00 |
|
mz3944
|
a315808d58
|
Merge pull request #1473 from mz3944/mz-SCI-2918
In html project export there is formula instead of result in table [SCI-2918]
|
2019-02-01 04:49:14 +01:00 |
|
Urban Rotnik
|
8ebb7561d9
|
Add last_time_changed_at columnd to SystemNotifications
|
2019-01-31 16:44:20 +01:00 |
|
Miha Mencin
|
d2dfe68e46
|
Changing double quotes to single quotes
|
2019-01-31 10:31:03 +01:00 |
|
Miha Mencin
|
3ec62758fe
|
SCI-2982, handle the empty json condition
|
2019-01-31 09:43:41 +01:00 |
|
Matej Zrimšek
|
ac78c7d21b
|
Process Handsontable formulas in project HTML files in team export [SCI-2918]
|
2019-01-31 07:39:17 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +01:00 |
|
mz3944
|
2ae56eb13f
|
Merge pull request #1448 from mz3944/mz-SCI-2929
Can not switch team [SCI-2929]
|
2019-01-31 04:43:39 +01:00 |
|
Oleksii Kriuchykhin
|
cc57a8d4ef
|
Fix template project name generation [SCI-2939]
|
2019-01-30 10:56:22 +01:00 |
|
Oleksii Kriuchykhin
|
cc92de3726
|
Merge latest features/templates [SCI-2939]
|
2019-01-30 10:43:54 +01:00 |
|
Urban Rotnik
|
3e2c9934d0
|
Add SystemNotification model
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
|
2019-01-29 11:40:26 +01:00 |
|
Luka Murn
|
1f7bca485a
|
Merge pull request #1471 from biosistemika/master
Merge master into features/templates
|
2019-01-29 10:14:09 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
Oleksii Kriuchykhin
|
f7b73c617a
|
Fix code styling [SCI-2939]
|
2019-01-28 15:37:24 +01:00 |
|
Urban Rotnik
|
4cf12d12d1
|
Refactor 'move_experiment' method into service object
Jira Ticket: SCI-2926
|
2019-01-28 11:45:36 +01:00 |
|
Oleksii Kriuchykhin
|
05edfae766
|
Fix failing tests [SCI-2939]
|
2019-01-25 14:13:00 +01:00 |
|
Miha Mencin
|
b67cee2e65
|
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug
SCI-2928 moving team modal js file to application.js.erb in order to …
|
2019-01-25 11:54:14 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
Urban Rotnik
|
247bae8a9f
|
Refactor export_all_counter increasing/reseting logic
- Remove daily task
- Add method to user Model
|
2019-01-25 11:16:31 +01:00 |
|
Oleksii Kriuchykhin
|
bd2efa55ac
|
Add templates business logic [SCI-2939]
|
2019-01-25 10:55:08 +01:00 |
|
mlorb
|
a297ef2094
|
Merge pull request #1443 from mlorb/ml-sci-2914
Allow org. administrators to invite them onto all projects [SCI-2914]
|
2019-01-24 16:24:57 +01:00 |
|
Mojca Lorber
|
fa1dff6352
|
refactor Demo project generation
|
2019-01-24 13:40:53 +01:00 |
|
mz3944
|
79d35de794
|
Merge pull request #1435 from mz3944/mz-SCI-2912
An error at archiving experiment with locked task [SCI-2912]
|
2019-01-24 05:27:58 +01:00 |
|
Miha Mencin
|
126a031498
|
SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded
|
2019-01-23 15:30:23 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +01:00 |
|
Urban Rotnik
|
f1d59e65f3
|
Add module and rename service object
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
47cc6a9d10
|
Refactor workflow_image_generation and move to service class
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
686f10cbd0
|
Refactor instance method 'ordered_modules' to scope
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
1b70f42817
|
Refactor 'Experiment.modules_without_group' to Module's scope
|
2019-01-18 16:54:00 +01:00 |
|
mlorb
|
d2108ac3ea
|
fix hound
|
2019-01-18 16:16:00 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
fdf7db425b
|
Merge branch 'master' into features/templates
|
2019-01-18 14:41:21 +01:00 |
|
Oleksii Kriuchykhin
|
1861f86b2c
|
Improve export all modal messages in case of unlimited exports [SCI-2965]
|
2019-01-17 17:27:32 +01:00 |
|
Oleksii Kriuchykhin
|
e62e1873b0
|
Fix issue with caching in inventories dropdown [SCI-2776]
|
2019-01-17 15:04:20 +01:00 |
|
Alex Kriuchykhin
|
88cea198f0
|
Merge pull request #1452 from okriuchykhin/ok_SCI_2950
Fix binary files in Export All archive [SCI-2950]
|
2019-01-16 17:29:48 +01:00 |
|
Oleksii Kriuchykhin
|
4f9eb7e165
|
Fix binary files in Export All archive [SCI2950]
|
2019-01-16 17:07:05 +01:00 |
|
Jure Grabnar
|
761932282b
|
Fix Hound formatting
Closes SCI-2937
|
2019-01-16 16:11:38 +01:00 |
|
Jure Grabnar
|
d1f966ee05
|
Add importing of the experiment templates
|
2019-01-16 15:54:03 +01:00 |
|
Miha Mencin
|
0766ee96a7
|
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-16 12:44:50 +01:00 |
|
Jure Grabnar
|
5b496a85d3
|
Experiment exporting works
|
2019-01-16 08:37:05 +01:00 |
|
Jure Grabnar
|
0184c97c61
|
Refactor TeamExporter into ModelExporter
|
2019-01-16 08:00:01 +01:00 |
|
Jure Grabnar
|
ff17a7e367
|
Fix S3_BUCKET not being defined
|
2019-01-14 16:49:08 +01:00 |
|
Oleksii Kriuchykhin
|
3a4b992f4e
|
Code style fixies []SCI-2875]
|
2019-01-14 16:31:23 +01:00 |
|
Matej Zrimšek
|
a5c1cf4450
|
Switch user's team if he's no longer a member of the currently selected one
|
2019-01-12 23:39:31 +01:00 |
|
Matej Zrimšek
|
838455af0d
|
Fix protocols.io Date handling at import
|
2019-01-12 19:28:45 +01:00 |
|
Oleksii Kriuchykhin
|
89240659a7
|
Fix task tags update on canvas cards [SCI-2875]
|
2019-01-11 17:20:39 +01:00 |
|
Alex Kriuchykhin
|
b530cea771
|
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-11 16:27:22 +01:00 |
|
Alex Kriuchykhin
|
be514fd62d
|
Merge pull request #1445 from okriuchykhin/ok_SCI_2931
Fix image URLs in export all document [SCI-2931]
|
2019-01-11 12:03:06 +01:00 |
|
Oleksii Kriuchykhin
|
132f46b136
|
Improve error handling in task inventories dropdown [SCI-2776]
|
2019-01-10 21:11:20 +01:00 |
|
Oleksii Kriuchykhin
|
ec28db6f4f
|
Fix image URLs in export all document [SCI-2931]
|
2019-01-10 14:19:40 +01:00 |
|
Alex Kriuchykhin
|
c2b38af91e
|
Merge pull request #1439 from okriuchykhin/ok_SCI_2888
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-10 11:05:07 +01:00 |
|
Alex Kriuchykhin
|
8ea37c541b
|
Merge pull request #1436 from okriuchykhin/ok_SCI_2904
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2019-01-10 11:04:26 +01:00 |
|
mlorb
|
06b1e5cf20
|
Allow org. administrators to invite them onto all projects
|
2019-01-08 16:30:52 +01:00 |
|
Jure Grabnar
|
fe46f9c9fe
|
Reinit tooltips after cancel/save step
Closes SCI-2891.
|
2019-01-08 15:36:44 +01:00 |
|
Matej Zrimšek
|
8070b7f8b5
|
Fix Date and Time display formats on JS side
|
2019-01-08 08:07:24 +01:00 |
|
Matej Zrimšek
|
b64df7d8cc
|
Fix additional Date and Time display formats
|
2019-01-08 06:29:37 +01:00 |
|
Oleksii Kriuchykhin
|
6a64b23f90
|
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
|
2019-01-04 10:44:38 +01:00 |
|
Alex Kriuchykhin
|
8ffe5dafee
|
Merge pull request #1437 from okriuchykhin/ok_SCI_2907
Change sample date in date format settings [SCI-2907]
|
2019-01-03 16:10:19 +01:00 |
|
Oleksii Kriuchykhin
|
5ea5b76d39
|
Change sample date in date format settings [SCI-2907]
|
2019-01-03 14:15:41 +01:00 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Matej Zrimšek
|
c84457e1ed
|
Prevent archiving of experiments with at least one locked task
|
2018-12-23 21:17:51 +01:00 |
|
Matej Zrimšek
|
b74105abc2
|
Fix Date and Time display formats
|
2018-12-23 20:30:09 +01:00 |
|
Luka Murn
|
1c8407e4f4
|
Merge pull request #1433 from okriuchykhin/ok_SCI_2864
Additional fix for export all S3 path [SCI-2864]
|
2018-12-20 13:27:50 +01:00 |
|
Oleksii Kriuchykhin
|
2fa4f42883
|
Additional fix for export all S3 path [SCI-2864]
|
2018-12-20 13:22:56 +01:00 |
|
Luka Murn
|
faf6601962
|
Merge pull request #1432 from okriuchykhin/ok_SCI_2864
Fix S3 zip exports path [SCI-2864]
|
2018-12-20 11:08:48 +01:00 |
|
Oleksii Kriuchykhin
|
c880f3fd84
|
Fix S3 zip exports path [SCI-2864]
|
2018-12-20 11:07:19 +01:00 |
|
Luka Murn
|
ac5c809d20
|
Add force_encoding to export all report view template
|
2018-12-18 21:03:10 +01:00 |
|
Luka Murn
|
cb1cfe2ef3
|
Merge pull request #1429 from Ducz0r/lm-sci-2902-fix-2
Fix assets include in export all report to work on production env [SCI-2902]
|
2018-12-18 09:14:44 +01:00 |
|
Luka Murn
|
097e871228
|
Fix assets include in export all report to work on production env
Closes SCI-2902.
|
2018-12-18 09:10:55 +01:00 |
|
Oleksii Kriuchykhin
|
3610960ee3
|
Fix ajax calls duplication [SCI-2916]
|
2018-12-17 20:59:22 +01:00 |
|
mlorb
|
5ebcd1dfe1
|
Merge pull request #1423 from mlorb/ml-sci-2911
Fix export projects getting fired multiple times [SCI-2911]
|
2018-12-17 11:26:40 +01:00 |
|
mlorb
|
37f1d66268
|
Merge pull request #1421 from mlorb/ml-sci-2800-v2
Fix tooltip style [SCI-2800]
|
2018-12-17 11:25:31 +01:00 |
|
Luka Murn
|
8935e4c7c1
|
Merge pull request #1426 from Ducz0r/lm-add-queue-to-export-all-jobs
Add team_zip_export job queue to export all delayed jobs
|
2018-12-16 22:16:10 +01:00 |
|
Alex Kriuchykhin
|
94e6143ac0
|
Merge pull request #1425 from okriuchykhin/ok_SCI_2907
Use fixed date example in date format drop down [SCI-2907]
|
2018-12-16 20:11:58 +01:00 |
|
Alex Kriuchykhin
|
a6bfa38ceb
|
Merge pull request #1424 from okriuchykhin/ok_SCI_2909
Change color of the selected element in the side navigation [SCI-2909]
|
2018-12-16 20:11:41 +01:00 |
|
Alex Kriuchykhin
|
ab0924c8e6
|
Merge pull request #1415 from okriuchykhin/ok_SCI_2864
Use built-in methods for Postgres extensions enabling [SCI-2864]
|
2018-12-16 19:45:56 +01:00 |
|
Alex Kriuchykhin
|
8a348b8504
|
Merge pull request #1422 from okriuchykhin/ok_SCI_2910
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-16 19:45:29 +01:00 |
|
Alex Kriuchykhin
|
abdf64a8c7
|
Merge pull request #1420 from okriuchykhin/ok_SCI_2894
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-16 19:44:50 +01:00 |
|
Luka Murn
|
7ba9628cfb
|
Add team_zip_export job queue to export all delayed jobs
|
2018-12-13 18:40:56 +01:00 |
|
Oleksii Kriuchykhin
|
23f8602872
|
Use fixed date example in date format dropdown [SCI-2907]
|
2018-12-13 17:53:04 +01:00 |
|
Oleksii Kriuchykhin
|
97bde075b2
|
Change color of the selected element in the side navigation [SCI-2909]
|
2018-12-13 16:50:22 +01:00 |
|
mlorb
|
55cab34eb4
|
fix export projects getting fired miltiple times
|
2018-12-13 16:46:08 +01:00 |
|
Oleksii Kriuchykhin
|
d5c07fd22a
|
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-13 16:17:22 +01:00 |
|
Luka Murn
|
022d0d9512
|
Merge pull request #1419 from Ducz0r/lm-sci-2902-fix
Change export all to use HTML instead of PDF [SCI-2902]
|
2018-12-13 15:19:37 +01:00 |
|
mlorb
|
b7efce579b
|
fix tooltip style
|
2018-12-13 12:43:12 +01: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 |
|
Luka Murn
|
3d7b633c25
|
Hound is love, Hound is life
|
2018-12-12 14:03:16 +01:00 |
|
Alex Kriuchykhin
|
4e416fe81b
|
Merge pull request #1404 from okriuchykhin/ok_SCI_2822
Return task inputs/outputs as references [SCI-2822]
|
2018-12-12 11:36:39 +01:00 |
|
mlorb
|
3f79cc5f93
|
Merge pull request #1418 from mlorb/ml-sci-2905
Fix due date can not be set [SCI-2905]
|
2018-12-12 11:27:57 +01:00 |
|
mlorb
|
cfd5156c09
|
Merge pull request #1416 from mlorb/ml-sci-2871
Fix behavior when user has no teams [SCI-2871]
|
2018-12-12 11:27:28 +01:00 |
|
mlorb
|
8170e1b367
|
Merge pull request #1414 from mlorb/ml-sci-2899
Fix invited member is added multiple times to team [SCI-2899]
|
2018-12-12 11:26:41 +01:00 |
|
Luka Murn
|
65adc7a556
|
Fix 2 minor visual bugs in reports
|
2018-12-12 11:15:32 +01:00 |
|
Luka Murn
|
24af108e98
|
Change PDF in export all to HTML
|
2018-12-12 11:15:16 +01:00 |
|
mlorb
|
426fadc10a
|
Fix due date can not be set
|
2018-12-11 10:31:13 +01:00 |
|
mlorb
|
4040b31143
|
Fix behavior when user has no teams
|
2018-12-10 15:42:05 +01:00 |
|
Oleksii Kriuchykhin
|
7cd1c12a4f
|
Use built-in methods for Postgres extensions enabling [SCI-2864]
|
2018-12-10 14:14:49 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +01:00 |
|
Alex Kriuchykhin
|
51ba74cbab
|
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
Enable caching for navigation sidebar [SCI-2757]
|
2018-12-10 14:11:05 +01:00 |
|
mlorb
|
33d5d2a1cc
|
Merge pull request #1412 from mlorb/ml-sci-2893
Fix download exported project from email link [SCI-2893]
|
2018-12-10 09:48:00 +01:00 |
|
mlorb
|
7c3bad1e86
|
Merge pull request #1410 from mlorb/ml-sci-2789
Fix missing protocols link tooltip [SCI-2789]
|
2018-12-10 09:15:31 +01:00 |
|
Luka Murn
|
3663320cf1
|
Merge pull request #1411 from Ducz0r/lm-fix-team-importer
Refactor team importer to use closed File.open blocks
|
2018-12-10 08:52:26 +01:00 |
|
Matej Zrimšek
|
9480234682
|
Show all smart annotations when they contain special characters [SCI-2816]
|
2018-12-09 11:15:31 +01:00 |
|
mlorb
|
d761a81b26
|
fix download link in email again
|
2018-12-07 15:02:45 +01:00 |
|
mlorb
|
2246166107
|
fix protocol link tooltip again
|
2018-12-07 12:00:42 +01:00 |
|
mlorb
|
d37f3a3c09
|
fix invited member is added multiple times to team
|
2018-12-07 11:36:26 +01:00 |
|
mlorb
|
5dee804006
|
fix download exported project from email link
|
2018-12-06 09:42:58 +01:00 |
|
mlorb
|
3031fb7a4b
|
Merge pull request #1398 from mlorb/ml-sci-2786
Fix projects table css [SCI-2786]
|
2018-12-06 09:15:51 +01:00 |
|
Luka Murn
|
f56847e44a
|
Refactor team importer to use closed File.open blocks
|
2018-12-05 18:34:32 +01:00 |
|
mlorb
|
c7f5c17e7e
|
change css again
|
2018-12-04 11:21:54 +01:00 |
|
mlorb
|
7d1817350a
|
fix missing protocols link tooltip
|
2018-12-04 10:45:16 +01:00 |
|
Oleksii Kriuchykhin
|
d2b1fd8ef2
|
Remove unneeded check [SCI-2757]
|
2018-12-03 13:03:22 +01:00 |
|
Alex Kriuchykhin
|
9621f0b372
|
Merge pull request #1408 from okriuchykhin/ok_SCI_2802
Search for IDs on inventory table as text [SCI-2802]
|
2018-12-03 11:39:57 +01:00 |
|
Oleksii Kriuchykhin
|
2c0927b254
|
Search for IDs on inventory table as text [SCI-2802]
|
2018-11-30 15:32:01 +01:00 |
|
Oleksii Kriuchykhin
|
bf3c7e7840
|
Fix search across reports, search all readable projects [SCI-2823]
|
2018-11-30 11:46:13 +01:00 |
|
Oleksii Kriuchykhin
|
e43b366cdb
|
Disable fragment caching
|
2018-11-29 18:07:31 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
Luka Murn
|
8b1449b5a2
|
Add bottom margin to OAuth authorize page, for better mobile xp
|
2018-11-28 21:46:33 +01:00 |
|
Oleksii Kriuchykhin
|
5b566b48ae
|
Improve error messages and fix task users/items endpoints [SCI-2886]
|
2018-11-28 14:14:45 +01:00 |
|
Oleksii Kriuchykhin
|
b3a377f949
|
Return task inputs/outputs as references [SCI-2822]
|
2018-11-28 11:33:00 +01:00 |
|
Alex Kriuchykhin
|
20e2cbf0ca
|
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
|
2018-11-28 09:47:20 +01:00 |
|
mlorb
|
15ddd0ab91
|
fix projects table css
|
2018-11-27 12:37:10 +01:00 |
|
Alex Kriuchykhin
|
676d4da7d2
|
Merge pull request #1397 from okriuchykhin/ok_SCI_2885
Fix support menu for Safari [SCI-2885]
|
2018-11-27 11:21:29 +01:00 |
|
mlorb
|
398c2f0576
|
Merge pull request #1392 from mlorb/ml-sci-2676
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
|
2018-11-27 11:06:45 +01:00 |
|
mlorb
|
0b6b3b3609
|
code simplify
|
2018-11-27 10:58:51 +01:00 |
|
Oleksii Kriuchykhin
|
79544e789d
|
Fix support menu for Safari [SCI-2885]
|
2018-11-26 18:47:21 +01:00 |
|
Alex Kriuchykhin
|
d475197e65
|
Merge pull request #1396 from okriuchykhin/ok_SCI_2882
Fix handsontable initialization [SCI-2882]
|
2018-11-26 15:19:23 +01:00 |
|
Oleksii Kriuchykhin
|
d67abfda2c
|
Additional fixies for smart annotations [SCI-2880]
|
2018-11-26 15:17:18 +01:00 |
|
Jure Grabnar
|
7812f70c2f
|
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
Protocols - import from protocols.io doesn't work
|
2018-11-26 14:56:25 +01:00 |
|
mlorb
|
18d9ab5888
|
fixes upon @Ducz0r request
|
2018-11-26 14:23:26 +01:00 |
|
Oleksii Kriuchykhin
|
2e00f1546a
|
Fix handsontable initialization [SCI-2882]
|
2018-11-26 14:11:46 +01:00 |
|
Jure Grabnar
|
6ec2c99a28
|
Hound styling
|
2018-11-26 13:52:01 +01:00 |
|
Jure Grabnar
|
0086e4dcf3
|
Catch some of templates error when import protocols.io
|
2018-11-26 13:43:05 +01:00 |
|
Luka Murn
|
eb2bf184b2
|
Merge pull request #1394 from Ducz0r/lm-sci-2884-fix
Update export email's look & feel [SCI-2884]
|
2018-11-26 11:50:31 +01:00 |
|
Jure Grabnar
|
c7d108ec16
|
Update according to Hound
Closes [SCI-2790]
|
2018-11-23 20:52:07 +01:00 |
|
Jure Grabnar
|
1c7a051551
|
Catch all errors on PIO import and show message
|
2018-11-23 20:47:48 +01:00 |
|
Jure Grabnar
|
2834edb286
|
Add command/subprotocol/safety for PIO
|
2018-11-23 20:13:34 +01:00 |
|
Jure Grabnar
|
c00b08b101
|
Add sw_package and dataset component for PIO
|
2018-11-23 19:44:10 +01:00 |
|
Jure Grabnar
|
5ab2556632
|
Importing of protocols now works
|
2018-11-23 18:54:37 +01:00 |
|
Jure Grabnar
|
2c8a7f8eca
|
Add last_modified evaluation for PIO import
|
2018-11-23 17:51:47 +01:00 |
|
Jure Grabnar
|
87d5e5029a
|
Fix publish_date in PIO import
|
2018-11-23 17:37:26 +01:00 |
|
Luka Murn
|
87ff7c71e3
|
Update the delivery email look & feel
Closes SCI-2884.
|
2018-11-23 17:24:10 +01:00 |
|
Jure Grabnar
|
76c2da4bae
|
Add uniq tables
|
2018-11-23 16:30:29 +01:00 |
|
mlorb
|
f61187dd18
|
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows
|
2018-11-23 15:44:04 +01:00 |
|
Oleksii Kriuchykhin
|
b926cadba4
|
Fix smartannotations rendering issues [SCI-2880]
|
2018-11-23 15:07:08 +01:00 |
|
Luka Murn
|
af307eae73
|
Move some text into localization file
|
2018-11-23 11:12:10 +01:00 |
|
Luka Murn
|
d071454fc8
|
Remove byebug from HTML template
Closes SCI-2883.
|
2018-11-23 10:31:41 +01:00 |
|
Alex Kriuchykhin
|
95e19e1229
|
Merge pull request #1381 from okriuchykhin/ok_SCI_2859
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-22 13:06:13 +01:00 |
|
mlorb
|
de803e70a8
|
Merge pull request #1385 from mlorb/ml-sci-2866
Fix in app help window does not close in some cases [SCI-2866]
|
2018-11-22 10:48:52 +01:00 |
|
mlorb
|
4ace5bf49f
|
Merge pull request #1384 from mlorb/ml-sci-2846
Fix teams switch not working at navigating from task [SCI-2846]
|
2018-11-22 10:48:33 +01:00 |
|
Alex Kriuchykhin
|
f811afc7e2
|
Merge pull request #1387 from okriuchykhin/ok_SCI_2877
Fix comments form for new results [SCI-2877]
|
2018-11-22 10:28:09 +01:00 |
|
Oleksii Kriuchykhin
|
6cd033767c
|
Fix comments form for new results [SCI-2877]
|
2018-11-21 23:48:43 +01:00 |
|
Oleksii Kriuchykhin
|
df938a8ba5
|
Fix task tags modal [SCI-2875]
|
2018-11-21 22:24:12 +01:00 |
|
Alex Kriuchykhin
|
afe5db5cf3
|
Merge pull request #1382 from okriuchykhin/ok_SCI_2872
Change text color on project cards tabs [SCI-2872]
|
2018-11-21 10:59:03 +01:00 |
|
mlorb
|
39b01bc8ed
|
fix in app help window does not close in some cases
|
2018-11-21 10:19:41 +01:00 |
|
mlorb
|
8bf1056bf5
|
fix teams switch not working at navigating from task
|
2018-11-21 10:12:21 +01:00 |
|
Alex Kriuchykhin
|
c3ef391641
|
Merge pull request #1380 from okriuchykhin/ok_SCI_2869
Prevent user being added to project/task multiple times [SCI-2869]
|
2018-11-20 22:38:38 +01:00 |
|
mz3944
|
6b996fc000
|
Merge pull request #1362 from mz3944/mz-SCI-2817
Export - various small changes/fixes [SCI-2817]
|
2018-11-20 21:32:47 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
mz3944
|
a9eb2fc249
|
Merge pull request #1377 from mz3944/mz-SCI-2863
Fix DataTable display for protocol modal [SCI-2863]
|
2018-11-20 21:21:29 +01:00 |
|
Oleksii Kriuchykhin
|
59fb971394
|
Change text color on project cards tabs [SCI-2872]
|
2018-11-20 17:31:27 +01:00 |
|
Oleksii Kriuchykhin
|
d98f11abdc
|
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-20 17:02:45 +01:00 |
|
Oleksii Kriuchykhin
|
5deaf25fd9
|
Prevent user being added to project/task multiple times [SCI-2869]
|
2018-11-20 14:29:33 +01:00 |
|
Alex Kriuchykhin
|
a6bc02a2cb
|
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
Refactor result and step comments [SCI-2830]
|
2018-11-20 00:13:15 +01:00 |
|
Oleksii Kriuchykhin
|
b7ccfccfe0
|
Imrove tags update behaviour on canvas [SCI-2830]
|
2018-11-19 11:48:53 +01:00 |
|
mlorb
|
3b96a60938
|
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
|
2018-11-19 11:36:08 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
Matej Zrimšek
|
716e74ceb4
|
Fix DataTable display for protocol modal [SCI-2863]
|
2018-11-19 07:21:29 +01:00 |
|
Matej Zrimšek
|
dea4ed4e15
|
Add model name to the archive folders in export-all ZIP structure [SCI-2817]
|
2018-11-19 04:46:33 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Oleksii Kriuchykhin
|
7642d8d472
|
Fix sorting on projects table [SCI-2860]
|
2018-11-15 10:36:37 +01:00 |
|
Luka Murn
|
e9c0b34662
|
Merge branch 'core-api' into 'master'
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
|
2018-11-14 16:59:04 +01:00 |
|
Alex Kriuchykhin
|
324069c071
|
Merge pull request #1370 from okriuchykhin/ok_SCI_2853
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
|
2018-11-14 13:51:43 +01:00 |
|
Oleksii Kriuchykhin
|
3fd687161f
|
Remove unused variables from activities controller [SCI-2778]
|
2018-11-14 13:17:38 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Oleksii Kriuchykhin
|
c44109958a
|
Allow automatic redirection to the O365 sign-in page in the business user flow [SCI-2853]
|
2018-11-14 12:56:04 +01:00 |
|
Oleksii Kriuchykhin
|
380a96dcce
|
Add caching for step and result fragments [SCI-2830]
|
2018-11-14 11:57:53 +01:00 |
|
Luka Murn
|
98a39ecd72
|
Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
|
2018-11-14 11:33:27 +01:00 |
|
Luka Murn
|
c0940b143a
|
Fix root page bug introduced with merge features/core-api -> master
|
2018-11-13 21:24:20 +01:00 |
|
mz3944
|
056efe170b
|
Merge pull request #1358 from mz3944/mz-SCI-2646
Removal of the temporary files for export all [SCI-2646]
|
2018-11-13 20:31:04 +01:00 |
|
Oleksii Kriuchykhin
|
fb309a12b9
|
Refactor result and step comments initialization [SCI-2830]
|
2018-11-13 16:57:42 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
Alex Kriuchykhin
|
b16646b0b4
|
Merge pull request #1366 from okriuchykhin/ok_SCI_2839
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 17:32:33 +01:00 |
|
Oleksii Kriuchykhin
|
98d1ea8542
|
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 15:51:03 +01:00 |
|
Oleksii Kriuchykhin
|
145c66a834
|
Fix user counters on projects overview page [SCI-2847]
|
2018-11-12 11:52:38 +01:00 |
|
Oleksii Kriuchykhin
|
e89d60785f
|
Fix dates on activities and experiments [SCI-2778]
|
2018-11-12 10:26:48 +01:00 |
|
Matej Zrimšek
|
57dbd63aa3
|
Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817]
|
2018-11-12 01:34:00 +01:00 |
|
Oleksii Kriuchykhin
|
8d0dbc7076
|
Add time format selection to settings [SCI-2778]
|
2018-11-09 16:19:40 +01:00 |
|
mlorb
|
75875e5421
|
fix user_project manage permission
|
2018-11-09 11:36:44 +01:00 |
|
Alex Kriuchykhin
|
eb72ea69dd
|
Merge pull request #1361 from okriuchykhin/ok_SCI_2785_v2
Improve counters on projects overview table [SCI-2785]
|
2018-11-09 09:37:41 +01:00 |
|
Matej Zrimšek
|
2a5b36b3c2
|
Fix index/position for export-all folder names [SCI-2817]
|
2018-11-09 01:21:30 +01:00 |
|
Matej Zrimšek
|
6ff117d662
|
Fix path creation and construction for export-all [SCI-2817]
|
2018-11-09 00:44:17 +01:00 |
|
Matej Zrimšek
|
f23160ba6d
|
Refactor logic for handling model path in export-all [SCI-2817]
|
2018-11-08 23:23:23 +01:00 |
|
Matej Zrimšek
|
58b2310d26
|
Add archived models in corresponding archive directory [SCI-2817]
|
2018-11-08 23:21:25 +01:00 |
|
Matej Zrimšek
|
efb4e0c549
|
Change indexing in task names in export-all PDF [SCI-2817]
|
2018-11-08 21:48:09 +01:00 |
|
Matej Zrimšek
|
dc91be3749
|
Preserve task order from project sidebar in export-all file structure [SCI-2817]
|
2018-11-08 21:48:09 +01:00 |
|
Matej Zrimšek
|
08396b2101
|
Make folder and file names more readable for export-all ZIP [SCI-2817]
|
2018-11-08 21:48:09 +01:00 |
|
Matej Zrimšek
|
d65fcdc312
|
Change datetime to human friendly format for ZIP exports [SCI-2817]
|
2018-11-08 21:48:09 +01:00 |
|
Matej Zrimšek
|
159f6d1ee2
|
Minor refactoring of exports [SCI-2646]
|
2018-11-08 21:39:09 +01:00 |
|
Matej Zrimšek
|
b7fdd82409
|
Ensure temp files deletion after export is done [SCI-2646]
|
2018-11-08 21:32:07 +01:00 |
|
mlorb
|
a56d22a329
|
change count to size
|
2018-11-08 09:43:32 +01:00 |
|
Oleksii Kriuchykhin
|
1feb13c74a
|
Improve counters on projects overview table [SCI-2785]
|
2018-11-07 22:27:57 +01:00 |
|
Oleksii Kriuchykhin
|
23ee4760ae
|
Fix failing tests [SCI-2773]
|
2018-11-07 16:39:00 +01:00 |
|
Oleksii Kriuchykhin
|
30885e060d
|
Merge latest core-api branch [SCI-2773]
|
2018-11-07 15:53:21 +01:00 |
|
Oleksii Kriuchykhin
|
60e78fa868
|
Improve code style for error handling [SCI-2773]
|
2018-11-07 15:43:44 +01:00 |
|
mlorb
|
4d156080ac
|
fix empty projects page bug and projects tree bug
|
2018-11-07 13:45:46 +01:00 |
|
mlorb
|
039faf2964
|
Merge pull request #1359 from mlorb/ml-sci-2843
Fix bug with new project button not working [SCI-2843]
|
2018-11-07 11:02:47 +01:00 |
|
Oleksii Kriuchykhin
|
82a11ebca2
|
Remove duplicate destroy for report [SCI-2834]
|
2018-11-07 09:55:06 +01:00 |
|
Matej Zrimšek
|
2f6a6072e1
|
Fix repository ZIP export test to work with enabled workers [SCI-2646]
|
2018-11-07 06:14:40 +01:00 |
|
Matej Zrimšek
|
8fe0249f45
|
Fix test for repository ZIP export & return path for ZIP exports [SCI-2646]
|
2018-11-07 05:04:29 +01:00 |
|
mlorb
|
63e039e235
|
fix bug with new project button not working
|
2018-11-06 11:38:31 +01:00 |
|
Oleksii Kriuchykhin
|
0e192cc830
|
Ensure that temporary report is always deleted [SCI-2834]
|
2018-11-06 09:33:18 +01:00 |
|
Matej Zrimšek
|
ee611a45d9
|
Also remove temp file after other types of ZIP export generation [SCI-2646]
|
2018-11-04 01:39:16 +01:00 |
|
Matej Zrimšek
|
5defbdd76e
|
Remove temp files after export-all ZIP generation [SCI-2646]
|
2018-11-04 01:33:50 +01:00 |
|
mlorb
|
ad5f4c2ebb
|
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint
Remove show protocol api endpoint
|
2018-10-30 14:04:17 +01:00 |
|
Oleksii Kriuchykhin
|
daaeb385bb
|
Fix permission helpers in delayed export job [SCI-2834]
|
2018-10-30 14:04:01 +01:00 |
|
Alex Kriuchykhin
|
2f466383a5
|
Merge pull request #1333 from okriuchykhin/ok_SCI_2742
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
|
2018-10-29 16:26:58 +01:00 |
|
Alex Kriuchykhin
|
126fa03305
|
Merge pull request #1349 from okriuchykhin/ok_SCI_2818
Fix project index endpoint permission bug [SCI-2818]
|
2018-10-29 14:59:22 +01:00 |
|
Alex Kriuchykhin
|
1083ce61fb
|
Merge pull request #1352 from okriuchykhin/ok_SCI_2814
Rename user_id to sub in JWT [SCI-2814]
|
2018-10-29 14:54:00 +01:00 |
|
Alex Kriuchykhin
|
d0804c8969
|
Merge pull request #1350 from okriuchykhin/ok_SCI_2821
Fix relationships in activities serializer [SCI-2821]
|
2018-10-29 14:53:15 +01:00 |
|
Alex Kriuchykhin
|
098b18b405
|
Merge pull request #1348 from okriuchykhin/ok_SCI_2782
Fix inventory column creation permission check [SCI-2782]
|
2018-10-29 14:52:57 +01:00 |
|
Alex Kriuchykhin
|
4320af794b
|
Merge pull request #1353 from okriuchykhin/ok_SCI_2771
Fix API endpoints that return file URLs [SCI-2771]
|
2018-10-29 13:44:55 +01:00 |
|
Alex Kriuchykhin
|
2b4ef619c2
|
Merge pull request #1345 from okriuchykhin/ok_SCI_2785
Show all experiments and tasks for archived projects [SCI-2785]
|
2018-10-29 11:56:38 +01:00 |
|
mlorb
|
0f8c80172e
|
remove show protocol api endpoint
|
2018-10-29 11:21:48 +01:00 |
|
Alex Kriuchykhin
|
c1d853f7bd
|
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-29 10:56:02 +01:00 |
|
Oleksii Kriuchykhin
|
5708e9bbe7
|
Fix project start day in serializer [SCI-2820]
|
2018-10-28 19:02:44 +01:00 |
|
Oleksii Kriuchykhin
|
d1e6c64d5e
|
Fix API endpoints that return file URLs [SCI-2771]
|
2018-10-28 18:39:34 +01:00 |
|
mz3944
|
d733f4e357
|
Merge pull request #1346 from mz3944/mz-SCI-2787
In project list table table is not updated when archiving/restoring project [SCI-2787]
|
2018-10-28 14:36:17 +01:00 |
|
Oleksii Kriuchykhin
|
04ff5870af
|
Rename user_id to sub in JWT [SCI-2814]
|
2018-10-28 14:34:51 +01:00 |
|
Jure Grabnar
|
0977f5251d
|
Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export
Fix zero limit config on export all
|
2018-10-28 13:38:21 +01:00 |
|
Jure Grabnar
|
cab0b78afa
|
Fix zero limit config on export all
|
2018-10-28 09:43:34 +01:00 |
|
Oleksii Kriuchykhin
|
012447d762
|
Fix relationships in activities serializer [SCI-2821]
|
2018-10-26 17:30:04 +02:00 |
|
Oleksii Kriuchykhin
|
9ad2718f32
|
Fix project index endpoint permission bug [SCI-2818]
|
2018-10-26 16:46:01 +02:00 |
|
Oleksii Kriuchykhin
|
93e7c3f390
|
Fix inventory column creation permission check [SCI-2782]
|
2018-10-26 14:38:47 +02:00 |
|
Alex Kriuchykhin
|
802290df8b
|
Merge pull request #1343 from okriuchykhin/ok_SCI_2826
Skip missing files in assets [SCI-2826]
|
2018-10-26 14:23:23 +02:00 |
|
Alex Kriuchykhin
|
b51f064c28
|
Merge pull request #1347 from okriuchykhin/ok_SCI_2756
Remove double initialization of comments on steps [SCI-2756]
|
2018-10-26 14:19:58 +02:00 |
|
Jure Grabnar
|
7d2f2c3b5f
|
Merge pull request #1337 from jbargu/jg_bug_sci_2805
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
|
2018-10-26 11:23:57 +02:00 |
|
mz3944
|
ee2cc90825
|
Merge pull request #1324 from mz3944/mz-SCI-2732
Export all - Projects view - projects endpoints (unit tests) [SCI-2732]
|
2018-10-26 11:20:09 +02:00 |
|
Jure Grabnar
|
04b1d0e142
|
Remove blank line
|
2018-10-26 11:00:13 +02:00 |
|
Jure Grabnar
|
3903b4a6f2
|
Refactor read_project/export_project permissions
|
2018-10-26 10:58:59 +02:00 |
|
Alex Kriuchykhin
|
f581829357
|
Merge pull request #1339 from okriuchykhin/ok_SCI_2804
Fix relative links to files in export all PDF [SCI-2804]
|
2018-10-26 10:57:04 +02:00 |
|
Oleksii Kriuchykhin
|
6e6bb73d2f
|
Remove double initialization of comments on steps [SCI-2756]
|
2018-10-26 09:29:42 +02:00 |
|
Matej Zrimšek
|
6447750ff7
|
Fix showing projects in table view when all are archived [SCI-2787]
|
2018-10-25 22:31:00 +02:00 |
|
Alex Kriuchykhin
|
ababa0b157
|
Merge pull request #1340 from okriuchykhin/ok_SCI_2793
Fix helpers to use with export all [SCI-2793]
|
2018-10-25 16:55:39 +02:00 |
|
Oleksii Kriuchykhin
|
e9a8826a1e
|
Show all experiments and tasks for archived projects [SCI-2785]
|
2018-10-24 18:49:59 +02:00 |
|
Oleksii Kriuchykhin
|
641d74829a
|
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-24 17:52:40 +02:00 |
|
Oleksii Kriuchykhin
|
744ad5b196
|
Skip missimg files in assets [SCI-2826]
|
2018-10-24 14:58:59 +02:00 |
|
Luka Murn
|
42793d25b7
|
Add bottom padding to sign in/up/forgot password pages
Closes SCI-2764.
|
2018-10-24 13:57:58 +02:00 |
|
Luka Murn
|
95340bcf36
|
Update team name placeholder & sublabel on sign up pages
|
2018-10-24 13:43:56 +02:00 |
|
Oleksii Kriuchykhin
|
990d3a34ca
|
Fix link to inventory CSV file [SCI-2804]
|
2018-10-24 12:59:04 +02:00 |
|
Matej Zrimšek
|
c89488e105
|
Fix displaying projects when all are archived [SCI-2787]
|
2018-10-24 03:34:13 +02:00 |
|
Matej Zrimšek
|
43fdab561f
|
Fix project archiving and restoring edge case [SCI-2787]
|
2018-10-24 01:37:57 +02:00 |
|
Matej Zrimšek
|
18e52e2c6f
|
Fix fetching all user projects [SCI-2787]
|
2018-10-24 00:29:30 +02:00 |
|
Matej Zrimšek
|
c8d170f9ec
|
Add default page size when it's not in request params when fetching projects
|
2018-10-23 19:51:50 +02:00 |
|
Oleksii Kriuchykhin
|
b53f2c8347
|
Improve error messages in API [SCI-2773]
|
2018-10-23 17:52:48 +02:00 |
|
Oleksii Kriuchykhin
|
81d751974d
|
Fix helpers to use with export all [SCI-2793]
|
2018-10-22 14:32:10 +02:00 |
|
Oleksii Kriuchykhin
|
83566cc9d5
|
Fix relative links to files in export all PDF [SCI-2804]
|
2018-10-19 16:25:43 +02:00 |
|
Alex Kriuchykhin
|
e9b64b65a3
|
Merge pull request #1330 from okriuchykhin/ok_SCI_2770
Add request rate throttling for API [SCI-2770]
|
2018-10-19 09:38:31 +02:00 |
|
Jure Grabnar
|
bd5a2a43fd
|
Add can_export_project? permission
Closes [SCI-2805].
|
2018-10-19 08:41:39 +02:00 |
|
mlorb
|
e5fca1b1cd
|
change the rich text max limit on frontend to 50000
|
2018-10-18 14:22:15 +02:00 |
|
Alex Kriuchykhin
|
18b1cad8a4
|
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
Implement inventory column data type name mappings [SCI-2772]
|
2018-10-17 10:37:23 +02:00 |
|
Oleksii Kriuchykhin
|
e4e66d3e5d
|
Merge branch 'core-api' into ok_SCI_2742
|
2018-10-16 17:38:30 +02:00 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Oleksii Kriuchykhin
|
ed46115b3f
|
Implement inventory column data type name mappings [SCI-2772]
|
2018-10-16 15:35:02 +02:00 |
|
Oleksii Kriuchykhin
|
f6b039d54e
|
Merge latest core-api branch [SCI-2765]
|
2018-10-16 12:07:47 +02:00 |
|
Jure Grabnar
|
c13e7531ea
|
Change generate_team method name
|
2018-10-16 11:13:01 +02:00 |
|
Jure Grabnar
|
447cad083d
|
Fix formatting according to HoundBot
|
2018-10-16 11:01:58 +02:00 |
|
Jure Grabnar
|
d50f56e319
|
Disable/enable export proejct button
Fix filesystem saving
|
2018-10-16 11:01:58 +02:00 |
|
Jure Grabnar
|
ed16e8d479
|
Fix reviewers errors
|
2018-10-16 11:00:38 +02:00 |
|
Jure Grabnar
|
6b47165ac1
|
Fix formatting according to Houndbot
|
2018-10-16 11:00:38 +02:00 |
|
Jure Grabnar
|
2558b7a313
|
Fix formatting according to HoundBot
|
2018-10-16 11:00:38 +02:00 |
|
Jure Grabnar
|
26df1e5a98
|
Add export project modal
Closes [SCI-2645]
|
2018-10-16 11:00:38 +02:00 |
|
Oleksii Kriuchykhin
|
0db9ef44e2
|
Add experiment, task, result READ endpoints tests [SCI-2742]
|
2018-10-15 16:27:22 +02:00 |
|
Luka Murn
|
1093ea11f4
|
Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes
Conflicts:
app/serializers/api/v1/activity_serializer.rb
app/serializers/api/v1/inventory_column_serializer.rb
app/serializers/api/v1/project_serializer.rb
|
2018-10-15 15:20:26 +02:00 |
|
Jure Grabnar
|
b9bb0db62d
|
Merge pull request #1314 from mz3944/mz-SCI-2752
Render SciNote tables within exported PDF as using HTML Tables [SCI-2752]
|
2018-10-15 10:03:42 +02:00 |
|
Jure Grabnar
|
ab71471a49
|
Fix inventories attachment/CSV file path
|
2018-10-15 08:55:00 +02:00 |
|
Matej Zrimšek
|
ef5bf42fc2
|
Refactor table styling for export all PDF; remove 'min-width' from table cells to also display bigger tables nicely
|
2018-10-15 08:00:04 +02:00 |
|
Matej Zrimšek
|
7fe6837206
|
Style tables in export all PDF (in same way as in PDF reports) [SCI-2752]
|
2018-10-15 07:59:28 +02:00 |
|
Matej Zrimšek
|
97e6fe34a1
|
Add unstyled tables to the export all PDF [SCI-2752]
|
2018-10-15 07:58:44 +02:00 |
|
Matej Zrimšek
|
46da1e6b7d
|
Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641]
|
2018-10-15 07:13:41 +02:00 |
|
Matej Zrimšek
|
9fb5520970
|
Refactor/match exported filenames in export all PDF [SCI-2641]
|
2018-10-15 05:54:19 +02:00 |
|
Matej Zrimšek
|
17380ba0ca
|
Refactoring rebased code [SCI-2641]
|
2018-10-15 01:12:25 +02:00 |
|
Matej Zrimšek
|
1bf16537f6
|
Add PDF content to the export all ZIP [SCI-2641]
|
2018-10-14 23:56:10 +02:00 |
|
Matej Zrimšek
|
48a6a64502
|
Move PDF generation and export logic of export all PDF to the model
|
2018-10-14 22:52:54 +02:00 |
|
Oleksii Kriuchykhin
|
1cafbd8c50
|
Move generic code to Viewable Concern [SCI-2733]
|
2018-10-12 16:14:24 +02:00 |
|
Oleksii Kriuchykhin
|
f221d71bbc
|
Fix datatables state restore [SCI-2733]
|
2018-10-12 15:15:43 +02:00 |
|
Matej Zrimšek
|
69f3a919db
|
Some specification and syntax fixes [SCI-2641]
|
2018-10-12 07:42:17 +02:00 |
|
Matej Zrimšek
|
e242e9a516
|
Refactor export all PDF content generation [SCI-2641]
|
2018-10-12 07:40:22 +02:00 |
|
Matej Zrimšek
|
67d51a8880
|
Refactor ReportsHelper#render_report_element
|
2018-10-12 07:40:22 +02:00 |
|
Matej Zrimšek
|
aa30cf6130
|
Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641]
|
2018-10-12 07:40:22 +02:00 |
|
Matej Zrimšek
|
1575da6edb
|
Make filenames and folder names in export all PDF compatible with filesystems (improved function should be used from another PR) [SCI-2641]
|
2018-10-12 07:40:22 +02:00 |
|
Matej Zrimšek
|
d970576d60
|
Switch between generating report PDF and export all PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
a16d16bc5b
|
Move export all report business logic to model [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
5ce94b5ecd
|
Remove dynamically created export all report after it's no longer needed
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
476b6d50a2
|
Create export all PDF when it's needed [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
c0dc4f6951
|
Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
ed6dfc90b0
|
Also shorten too long folder names, fix filename shortening [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
7152d2f0f1
|
Fix/update file naming convection for exported files [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
d598bb8366
|
Make relative links work in export all PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
6f77c4772c
|
Minor fix for assets & tables naming in export all PDF
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
0ebce8e283
|
Add relative links (not working) to files and tables into the PDF [SCI-2641]
|
2018-10-12 07:40:21 +02:00 |
|
Matej Zrimšek
|
b15cc66b2f
|
Add export project PDF for dummy project
|
2018-10-12 07:40:21 +02:00 |
|
Luka Murn
|
1e46631c02
|
Merge pull request #1316 from czbiohub/mc-SCI-2700
close sci-2700; add unit tests for inventory column update [SCI-2700]
|
2018-10-11 10:20:15 +02:00 |
|
Luka Murn
|
c11345d6a1
|
Minorly update inventory_column_serializer so tests pass
|
2018-10-11 09:49:54 +02:00 |
|
Oleksii Kriuchykhin
|
8cf59d8d22
|
Add request rate throttling for API [SCI-2770]
|
2018-10-11 09:48:06 +02:00 |
|
Luka Murn
|
a217b11bba
|
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539
Created read endpoint for projects and related models [SCI-2539]
|
2018-10-11 09:03:18 +02:00 |
|
Luka Murn
|
c0f47f03b7
|
Hound is love, Hound is life
|
2018-10-11 08:51:14 +02:00 |
|
Luka Murn
|
dd4f7b5d02
|
Fix project users, activities, comments, reports endpoints
|
2018-10-10 17:35:09 +02:00 |
|
Zanz2
|
4dc1320988
|
Merge pull request #1326 from Zanz2/zz_pio_upload_button_sci2760
Disabled turbolinks in left navigation bar protocols button [SCI-2760]
|
2018-10-10 17:14:15 +02:00 |
|
Oleksii Kriuchykhin
|
bf80aa12a7
|
Fix failing test [SCI-2765]
|
2018-10-10 17:00:53 +02:00 |
|
Oleksii Kriuchykhin
|
af02f29fb5
|
Implement user state saving for projects overview [SCI-2733]
|
2018-10-10 16:15:31 +02:00 |
|
Alex Kriuchykhin
|
16b29b50a5
|
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
Add Projects view - list/table view [SCI-2731]
|
2018-10-08 17:53:35 +02:00 |
|
Oleksii Kriuchykhin
|
7a591273a3
|
Remove unused variables [SCI-2731]
|
2018-10-08 13:45:26 +02:00 |
|
Oleksii Kriuchykhin
|
77e2371091
|
Add tests for inventory cell endpoints [SCI-2765]
|
2018-10-08 13:25:03 +02:00 |
|
Luka Murn
|
a8d56d32e2
|
Hound is love, Hound is life
|
2018-10-07 13:28:29 +02:00 |
|