mlorb
|
1e3d0e901a
|
Merge pull request #1667 from mlorb/ml-sci-3304
Fix links in activity message for protocols in repository [SCI-3304]
|
2019-04-15 11:55:08 +02:00 |
|
Anton Ignatov
|
dd8b3caf65
|
Fix duplicate activtiy issue and fix link to inventory
|
2019-04-15 11:35:30 +02:00 |
|
Alex Kriuchykhin
|
3250ab70f4
|
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 16:04:48 +02:00 |
|
Oleksii Kriuchykhin
|
231106e131
|
Switch to kaminari pagination in global activities [SCI-3292]
|
2019-04-12 15:37:45 +02:00 |
|
Mojca Lorber
|
252fdaf9a8
|
Fix links in activity message for protocols in repository
|
2019-04-12 15:14:41 +02:00 |
|
Mojca Lorber
|
bf2e9e8194
|
Rename button load more system notification to fix the bug
|
2019-04-12 11:58:47 +02:00 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
aignatov-bio
|
ffb0db06b9
|
Add scroll to team selector (#1659)
|
2019-04-12 09:17:14 +02:00 |
|
Alex Kriuchykhin
|
7f20b7fa20
|
Merge pull request #1661 from okriuchykhin/ok_SCI_3292
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-11 16:23:37 +02:00 |
|
Oleksii Kriuchykhin
|
d378e33038
|
Improve global activities pagination and fetching [SCI-3292]
|
2019-04-10 15:45:17 +02:00 |
|
aignatov-bio
|
f47d0e2932
|
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload
Improve the image file upload into RTE input fields [SCI-3131]
|
2019-04-10 14:04:06 +02:00 |
|
aignatov-bio
|
7ef7e2397f
|
Change activity filter order and reduce custom date label size [SCI-3301] (#1651)
* Change activity filter order and reduce custom date label size
* Fix hound
|
2019-04-09 14:18:22 +02:00 |
|
Urban Rotnik
|
ee3dc571e1
|
Update attachments view, add ordering on FE
|
2019-04-09 14:17:40 +02:00 |
|
Urban Rotnik
|
a3932cc67f
|
New asset box style update
|
2019-04-09 14:17:40 +02:00 |
|
aignatov-bio
|
e2e299b424
|
Add dynamic generating filters for global activities [SCI-3228] (#1644)
* Add dynamic generating filters
* Add url methods
|
2019-04-09 09:08:27 +02:00 |
|
Urban Rotnik
|
26cf8271a1
|
Change step header, remove vertical line
|
2019-04-05 10:57:38 +02:00 |
|
Jure Grabnar
|
7ac88ee84b
|
Change icons to be relative
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
cbf109f884
|
Fix create WOPI file button
Closes SCI-3137
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
fddff9c627
|
Perform styling on the WOPI modal
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
38e47b93ab
|
Update labels
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
b12916b828
|
Add main functionality
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
613843d095
|
Temp commit
|
2019-04-04 16:58:55 +02:00 |
|
Jure Grabnar
|
9a4cd4fda2
|
Add file_present true
|
2019-04-04 16:57:36 +02:00 |
|
Jure Grabnar
|
3b8e6fa47c
|
Test office online
|
2019-04-04 16:57:36 +02:00 |
|
Oleksii Kriuchykhin
|
d6bd703ec8
|
Fix activity genereation with discarded inventories [SCI-3290]
|
2019-04-03 21:18:48 +02:00 |
|
Jure Grabnar
|
26848ecaef
|
Refactor step position + 1 into a method
|
2019-04-03 13:07:30 +02:00 |
|
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 |
|
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 |
|
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
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +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 |
|
Oleksii Kriuchykhin
|
98e58ff7eb
|
Add global activities to reports [SCI-3255]
|
2019-04-01 11:26:51 +02:00 |
|
Mojca Lorber
|
3c69225d6b
|
Change activities for task protocols
|
2019-03-29 15:09:20 +01:00 |
|
aignatov-bio
|
ce7bbd6b07
|
Adding deselect button to objects filter and some localizations fix (#1608)
|
2019-03-29 09:04:58 +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
|
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 |
|
aignatov-bio
|
08263ab64e
|
adding filters for task activities [SCI-3076] (#1553)
* update task activity screen
|
2019-03-28 10:55:48 +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 |
|
Anton Ignatov
|
03123c34f8
|
adding date placeholder
|
2019-03-27 14:39:29 +01:00 |
|
Anton Ignatov
|
1d244508f5
|
Adding placeholders to filters
|
2019-03-27 11:19:58 +01:00 |
|
Miha Mencin
|
1b19e67c07
|
Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d.
|
2019-03-27 10:21:40 +01:00 |
|
Urban Rotnik
|
2487089dd3
|
Rename dropdown labels for Activities, Users and Teams
|
2019-03-27 05:47:54 +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
|
6012513c13
|
Reduce font size of filters title [SCI-3208] (#1592)
* reduce font size of filters titles;
* fix new title
|
2019-03-26 16:47:36 +01:00 |
|
Alex Kriuchykhin
|
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
|
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 |
|
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
|
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 |
|
Anton Ignatov
|
4ec0a3c871
|
Update TinyMCE image loader for new fields
|
2019-03-22 10:52:26 +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 |
|
Anton Ignatov
|
07c2819163
|
refactoring tinymce image uploading
|
2019-03-20 14:46:54 +01:00 |
|
Oleksii Kriuchykhin
|
0c2b7959b6
|
Fix smart annotations in RTE [SCI-3111]
|
2019-03-20 11:41:36 +01:00 |
|
Anton Ignatov
|
29b67be127
|
Fix team selection in global activities and add link from navbar
|
2019-03-20 10:33:22 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
9bbdc8fc89
|
Include tui image editor with webpack [SCI-2856]
|
2019-03-11 15:12: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 |
|
Oleksii Kriuchykhin
|
e3bacd6b9a
|
Fix global activities page after refactoring [SCI-2994][SCI-3024]
|
2019-03-08 13:09:27 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
c3705ccb25
|
Improve group collapse JS code [SCI-2994][SCI-3024]
|
2019-03-04 13:44:43 +01:00 |
|
Anton Ignatov
|
f636b5adff
|
Remove script from modal
|
2019-03-01 14:56:06 +01:00 |
|
Miha Mencin
|
a372ebf07d
|
Revert "Task info section improvements [SCI - 3058]"
|
2019-02-27 21:00:11 +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 |
|
Urban Rotnik
|
3121bf1d39
|
Update tooltip for system notifications dropdown
|
2019-02-27 14:49:18 +01:00 |
|
Anton Ignatov
|
a4cabb203b
|
Task info section improvements
|
2019-02-25 16:55:09 +01:00 |
|
Miha Mencin
|
76c3db0b11
|
added layout, added css, added select2 lib, WIP
|
2019-02-25 16:50:38 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
aignatov-bio
|
fcdb4e7a92
|
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-19 13:51:18 +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 |
|
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 |
|
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 |
|
Anton Ignatov
|
c6ab6da381
|
Fixed counter bug SCI-3005
|
2019-02-07 14:23:37 +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 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +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 |
|
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 |
|
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
|
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
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
3a4b992f4e
|
Code style fixies []SCI-2875]
|
2019-01-14 16:31:23 +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
|
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 |
|
Matej Zrimšek
|
b64df7d8cc
|
Fix additional Date and Time display formats
|
2019-01-08 06:29:37 +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 |
|
Luka Murn
|
ac5c809d20
|
Add force_encoding to export all report view template
|
2018-12-18 21:03:10 +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 |
|
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 |
|
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
|
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 |
|
Oleksii Kriuchykhin
|
23f8602872
|
Use fixed date example in date format dropdown [SCI-2907]
|
2018-12-13 17:53:04 +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 |
|
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
|
4040b31143
|
Fix behavior when user has no teams
|
2018-12-10 15:42:05 +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
|
d761a81b26
|
fix download link in email again
|
2018-12-07 15:02:45 +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 |
|
Oleksii Kriuchykhin
|
d2b1fd8ef2
|
Remove unneeded check [SCI-2757]
|
2018-12-03 13:03:22 +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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
mlorb
|
8bf1056bf5
|
fix teams switch not working at navigating from task
|
2018-11-21 10:12:21 +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 |
|
Oleksii Kriuchykhin
|
d98f11abdc
|
Refactor & restyle the API authorization screen [SCI-2859]
|
2018-11-20 17:02:45 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
98d1ea8542
|
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 15:51:03 +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
|
4d156080ac
|
fix empty projects page bug and projects tree bug
|
2018-11-07 13:45:46 +01:00 |
|
mlorb
|
63e039e235
|
fix bug with new project button not working
|
2018-11-06 11:38:31 +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
|
641d74829a
|
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-24 17:52:40 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
02f536cd08
|
Merge latest features/export-all [SCI-2733]
|
2018-10-16 17:20:19 +02:00 |
|
Jure Grabnar
|
ed16e8d479
|
Fix reviewers errors
|
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 |
|
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 |
|
Matej Zrimšek
|
69f3a919db
|
Some specification and syntax fixes [SCI-2641]
|
2018-10-12 07:42:17 +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
|
c0dc4f6951
|
Add hyperlinks to inventories' *.csv files in export all PDF [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
|
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 |
|
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
|
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 |
|
Zanz2
|
cfe5801856
|
Disabled turbolinks in left navigation bar protocols button, i think it fixes the issue
|
2018-10-06 12:56:13 +02:00 |
|
Jure Grabnar
|
d7c875135e
|
Merge pull request #1304 from jbargu/jg_zipfile_structure
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
|
2018-10-05 15:36:56 +02:00 |
|
Oleksii Kriuchykhin
|
ba58eec2e2
|
Merge latest features/export-all [SCI-2731]
|
2018-10-03 11:04:44 +02:00 |
|
Luka Murn
|
21a24dc98b
|
Fix invite users modal to display tooltips in all variants
Closes SCI-2759.
|
2018-10-02 17:55:39 +02:00 |
|
Oleksii Kriuchykhin
|
7d995189bd
|
Fixies after code review [SCI-2730]
|
2018-10-02 14:24:44 +02:00 |
|
Luka Murn
|
d71be76657
|
Fix minor styling & text on settings - preferences page
|
2018-10-02 13:59:19 +02:00 |
|
Luka Murn
|
c079f16d58
|
Fix the tooltips positioning on canvas
|
2018-10-02 13:50:26 +02:00 |
|