Miha Mencin
|
16724f622c
|
Merge pull request #2326 from urbanrotnik/ur-sci-4236
Scroll left on new item in repository datatables [SCI-4236]
|
2020-01-16 17:30:01 +01:00 |
|
Alex Kriuchykhin
|
4a96fa2648
|
Merge pull request #2323 from aignatov-bio/ai-sci-4255-disable-column-manage-button-in-edit-mode
Disable column manage button in edit mode [SCI-4255]
|
2020-01-16 16:37:29 +01:00 |
|
Urban Rotnik
|
96457d07bb
|
Scroll left on new item in datatables
|
2020-01-16 16:34:45 +01:00 |
|
aignatov-bio
|
d32201ad58
|
Fix smart annotation position
|
2020-01-16 16:28:51 +01:00 |
|
mlorb
|
8e4d0e9ff6
|
Merge pull request #2320 from mlorb/ml-sci-4069-v2
Add emojionearea for status column type [SCI-4069]
|
2020-01-16 16:00:36 +01:00 |
|
aignatov-bio
|
b7fe8b71c1
|
Disable column manage button in edit mode
|
2020-01-16 15:59:57 +01:00 |
|
Miha Mencin
|
e75d85c198
|
Merge pull request #2318 from biosistemika/SCI-4250-prevent-selecting-inventory-item
SCI-4250 disable row selection when vieweng selected checklist items
|
2020-01-16 15:29:13 +01:00 |
|
Mojca Lorber
|
a342e3d31f
|
Add emojionearea for status column type
|
2020-01-16 14:58:59 +01:00 |
|
Miha Mencin
|
6460d6e879
|
fix typo, fix codestyle
|
2020-01-16 14:50:31 +01:00 |
|
Urban Rotnik
|
3a24d3150d
|
Remove error on new file select, fix for new row file cells
|
2020-01-16 13:49:34 +01:00 |
|
Miha Mencin
|
29458375ab
|
SCI-4250 disable row selection when vieweng selected checklist items
|
2020-01-16 13:39:49 +01:00 |
|
Urban Rotnik
|
218316bea2
|
Update error handling for name and text
|
2020-01-16 13:30:05 +01:00 |
|
Urban Rotnik
|
0522b9b0a3
|
Update too many items error showing
Update too many items error showing
|
2020-01-16 11:40:59 +01:00 |
|
aignatov-bio
|
1ff0351a74
|
Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories
|
2020-01-16 11:36:00 +01:00 |
|
aignatov-bio
|
2cb167ba7a
|
Fix markup
|
2020-01-16 10:54:18 +01:00 |
|
aignatov-bio
|
96e1d4a7d0
|
Add new error handling
|
2020-01-16 10:51:37 +01:00 |
|
Miha Mencin
|
ce3b4450cc
|
Merge pull request #2314 from biosistemika/SCI-4210-fix-styling-of-checklist-in-view-mode
[SCI-4210][SCI-4189] show checklist as link, hide edit, copy, delete buttons when no items selected
|
2020-01-15 18:16:45 +01:00 |
|
Alex Kriuchykhin
|
077ad7cad1
|
Merge pull request #2307 from okriuchykhin/ok_SCI_4233
Unify view and edit modes for number cells [SCI-4233]
|
2020-01-15 18:01:41 +01:00 |
|
Miha Mencin
|
960843c008
|
SCI-4210 move hiding and showing toolbar one level lower
|
2020-01-15 17:49:25 +01:00 |
|
aignatov-bio
|
a10e7de9a6
|
Fix smart annotation window position
|
2020-01-15 17:19:56 +01:00 |
|
aignatov-bio
|
b116c3720c
|
Fix general css issue for repositories
|
2020-01-15 16:46:01 +01:00 |
|
Alex Kriuchykhin
|
967acb0af3
|
Merge pull request #2312 from okriuchykhin/ok_SCI_4237
Improve user experience for repository saving and fix checklist saving [SCI-4237]
|
2020-01-15 16:36:40 +01:00 |
|
Alex Kriuchykhin
|
6e24dd4eb6
|
Merge pull request #2308 from okriuchykhin/ok_SCI_4226
Disable repository filtering in edit mode [SCI-4226]
|
2020-01-15 15:43:17 +01:00 |
|
Miha Mencin
|
b23c874f9e
|
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
Sci 4199 selected checklist is lost
|
2020-01-15 15:28:34 +01:00 |
|
Miha Mencin
|
79ad164166
|
Merge pull request #2311 from biosistemika/SCI-4202-dropdown-not-closing-after-select
SCI-4202 add close param
|
2020-01-15 15:27:11 +01:00 |
|
Oleksii Kriuchykhin
|
bb32117796
|
Improve user experience for repository saving and fix checklist saving [SCI-4237]
|
2020-01-15 15:23:03 +01:00 |
|
Miha Mencin
|
5085e55f22
|
fix status selection as well
|
2020-01-15 15:22:05 +01:00 |
|
Miha Mencin
|
df43c4c15f
|
SCI-4202 add close param
|
2020-01-15 14:52:06 +01:00 |
|
mlorb
|
e44903bae5
|
Merge branch 'develop' into ml-sci-4150-v2
|
2020-01-15 14:47:25 +01:00 |
|
Mojca Lorber
|
c234b014cb
|
fix locales
|
2020-01-15 14:18:08 +01:00 |
|
Miha Mencin
|
5bfa5c7939
|
SCI-4199 disabling delimiter, adding warning
|
2020-01-15 13:59:28 +01:00 |
|
Oleksii Kriuchykhin
|
dd48a2902d
|
Disable repository filtering in edit mode [SCI-4226]
|
2020-01-15 12:44:57 +01:00 |
|
aignatov-bio
|
271d6db792
|
Merge pull request #2303 from aignatov-bio/ai-sci-4175-update-design-date-time-fields
Update css and error handling for date and time fields [SCI-4175]
|
2020-01-15 12:36:12 +01:00 |
|
Oleksii Kriuchykhin
|
470f6ff541
|
Unifify view and edit modes for number cells [SCI-4233]
|
2020-01-15 12:16:17 +01:00 |
|
aignatov-bio
|
2a83c6bae2
|
Update hidden field for time cell
|
2020-01-15 09:48:18 +01:00 |
|
Mojca Lorber
|
16226640d5
|
changes upon Antons review
|
2020-01-14 16:46:48 +01:00 |
|
aignatov-bio
|
7ea6dbc67b
|
Update css and error handling for date and time fields
|
2020-01-14 16:31:55 +01:00 |
|
aignatov-bio
|
79b020b97e
|
Update table header color and update checkboxes
|
2020-01-14 11:39:15 +01:00 |
|
Mojca Lorber
|
9176301b7b
|
Refactor manage repository columns, move it from page into modal
|
2020-01-14 11:13:19 +01:00 |
|
aignatov-bio
|
accd1d9e16
|
Merge pull request #2297 from aignatov-bio/ai-sci-4207-fix-datable-overflow
Update layout for repository [SCI-4207]
|
2020-01-13 15:13:39 +01:00 |
|
aignatov-bio
|
b37d8f1275
|
Update layout for repository
|
2020-01-13 14:46:43 +01:00 |
|
aignatov-bio
|
ac2f431a0b
|
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value
Fix big number in repository number value [SCI-4221]
|
2020-01-13 10:42:13 +01:00 |
|
Alex Kriuchykhin
|
007cae39e8
|
Merge pull request #2291 from okriuchykhin/ok_SCI_4197
Fix sorting for date time columns [SCI-4197]
|
2020-01-10 15:25:53 +01:00 |
|
aignatov-bio
|
9ede0ef716
|
Fix big number in repository number value
|
2020-01-10 13:00:14 +01:00 |
|
aignatov-bio
|
751d34a078
|
Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders
Update placeholders for cells [SCI-4192]
|
2020-01-10 10:50:00 +01:00 |
|
Alex Kriuchykhin
|
f1babb2237
|
Merge pull request #2279 from okriuchykhin/ok_SCI_4000
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-10 10:34:27 +01:00 |
|
Alex Kriuchykhin
|
d2e12e0683
|
Merge pull request #2265 from okriuchykhin/ok_SCI_4146
Restrict files to only images in RTE fields [SCI-4146]
|
2020-01-10 10:34:00 +01:00 |
|
aignatov-bio
|
e371715331
|
Merge pull request #2289 from aignatov-bio/ai-sci-4215-prevent-editing-two-items
Prevent editing 2 items [SCI-4215]
|
2020-01-10 10:13:30 +01:00 |
|
Oleksii Kriuchykhin
|
ad5a5f3ebf
|
Fix sorting for date time columns [SCI-4197]
|
2020-01-09 16:18:28 +01:00 |
|
aignatov-bio
|
38eaf19dde
|
Prevent editing 2 items
|
2020-01-09 15:19:04 +01:00 |
|
Alex Kriuchykhin
|
704c89a7d6
|
Merge pull request #2284 from okriuchykhin/ok_SCI_4196
Fix repository table state updates after column creation/deletion [SCI-4196]
|
2020-01-09 15:05:51 +01:00 |
|
aignatov-bio
|
13675dd2e7
|
Update placeholders for cells
|
2020-01-09 14:57:37 +01:00 |
|
aignatov-bio
|
9fdea4657c
|
Update validation for repository text field
|
2020-01-09 13:32:03 +01:00 |
|
Oleksii Kriuchykhin
|
2faab14444
|
Fix repository table state updates after column creation/deletion [SCI-4196]
|
2020-01-08 16:16:54 +01:00 |
|
aignatov-bio
|
54c78cf4d1
|
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
|
2020-01-08 12:30:51 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
Oleksii Kriuchykhin
|
16b591b110
|
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-06 16:07:23 +01:00 |
|
aignatov-bio
|
f717ce66cb
|
Fix tests
|
2020-01-06 12:31:56 +01:00 |
|
aignatov-bio
|
464d03558a
|
Fix markup, replace buttons and add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
e714787c38
|
Fix markup
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
a281f09e7f
|
Add reports and missed modals
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
Urban Rotnik
|
356ba6572d
|
Fix naming
|
2019-12-24 08:13:30 +01:00 |
|
Urban Rotnik
|
7116034b34
|
Update new renderer for StatusList
|
2019-12-23 14:40:15 +01:00 |
|
Urban Rotnik
|
400c109592
|
Refactor StatusesJS for new dropdown
|
2019-12-23 14:34:11 +01:00 |
|
Urban Rotnik
|
79b7d63116
|
JS fix
|
2019-12-20 16:14:39 +01:00 |
|
Urban Rotnik
|
fa6b1fa0db
|
JS fixes
|
2019-12-20 15:19:30 +01:00 |
|
Urban Rotnik
|
181d637ff3
|
Update/refactor JS for handling Dates and Times
|
2019-12-20 14:59:27 +01:00 |
|
Urban Rotnik
|
1531d44e6b
|
Add DateTime validators
|
2019-12-20 14:59:23 +01:00 |
|
Urban Rotnik
|
2e88f194bc
|
Fix tests
|
2019-12-20 14:58:14 +01:00 |
|
Urban Rotnik
|
dfe3c5292e
|
Add TimeRange and DateRange renderer
|
2019-12-20 14:57:04 +01:00 |
|
Urban Rotnik
|
5d4453470a
|
Add DateTimeRange renderer
|
2019-12-20 14:56:11 +01:00 |
|
Urban Rotnik
|
2a63854123
|
Edit and new renderers for DateTime columns
|
2019-12-20 14:55:11 +01:00 |
|
Alex Kriuchykhin
|
0566b17d50
|
Merge pull request #2272 from okriuchykhin/ok_SCI_4166
Add view/edit renderers for numeric data type [SCI-4166]
|
2019-12-19 11:57:13 +01:00 |
|
Oleksii Kriuchykhin
|
e24bc2775a
|
Add view/edit renderers for numeric data type [SCI-4166]
|
2019-12-18 11:55:12 +01:00 |
|
Urban Rotnik
|
7153711570
|
Move delimiter from column to metadata
|
2019-12-18 10:22:52 +01:00 |
|
Oleksii Kriuchykhin
|
dc8ff18d68
|
Fix issue with clone & move task to another experiment [SCI-4145]
|
2019-12-17 11:54:34 +01:00 |
|
Oleksii Kriuchykhin
|
403a3e0140
|
Restrict files to only images in RTE fields [SCI-4146]
|
2019-12-16 16:05:40 +01:00 |
|
aignatov-bio
|
eed56b59aa
|
Fix markup
|
2019-12-11 15:08:18 +01:00 |
|
aignatov-bio
|
52c0782447
|
Fix checklist update
|
2019-12-11 15:05:02 +01:00 |
|
aignatov-bio
|
7664f4be78
|
Add checklist and list edit mode
|
2019-12-11 14:49:14 +01:00 |
|
aignatov-bio
|
7fc9c0d1e4
|
Adding frontend for checklist edit mode
|
2019-12-10 15:58:59 +01:00 |
|
Urban Rotnik
|
14ec728ae7
|
Update param for file deletion
|
2019-12-10 14:29:37 +01:00 |
|
Urban Rotnik
|
b68aadf506
|
Update params nesting
|
2019-12-10 14:29:35 +01:00 |
|
Mojca Lorber
|
8503dd7007
|
Add numeric repository column type
|
2019-12-09 16:38:21 +01:00 |
|
aignatov-bio
|
2a38928b7a
|
Merge pull request #2251 from aignatov-bio/ai-sci-4068-custom-select-on-manage-columns-forms
Update drop-down for columns type selection [SCI-4068]
|
2019-12-09 14:09:21 +01:00 |
|
aignatov-bio
|
09079fbcda
|
Fix naming and tests
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
d8676596f1
|
Add checklists column type
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
c4a87bed52
|
Fix autosave for marvinJS in tinyMCE
|
2019-12-09 11:23:01 +01:00 |
|
aignatov-bio
|
eb708e4226
|
Update dropdown for column type selection
|
2019-12-06 16:14:16 +01:00 |
|
Urban Rotnik
|
64c6159354
|
Update require JS
|
2019-12-06 10:39:21 +01:00 |
|
Urban Rotnik
|
2ec99fa696
|
Add new renderer for File, Status and List
|
2019-12-05 09:19:19 +01:00 |
|
Urban Rotnik
|
ee5c2ac93d
|
Add edit renderer for Assets
|
2019-12-04 14:52:52 +01:00 |
|
aignatov-bio
|
d643a08a9c
|
Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task
Fix task activity page [SCI-4137]
|
2019-12-03 09:09:36 +01:00 |
|
aignatov-bio
|
010a44650c
|
Fix task activity page
|
2019-12-02 16:04:50 +01:00 |
|
aignatov-bio
|
2d4104b0f2
|
Fix smart annotation for autosave
|
2019-12-02 15:53:42 +01:00 |
|
Urban Rotnik
|
3ab1967703
|
Add Edit renderer for Statuses
|
2019-12-02 11:03:05 +01:00 |
|
Urban Rotnik
|
d797469e38
|
Fix for hidden columns
|
2019-12-02 08:08:49 +01:00 |
|
aignatov-bio
|
84e47f5b4c
|
Fix autosave in steps and result
|
2019-11-29 16:10:14 +01:00 |
|
Urban Rotnik
|
3a76753b72
|
Add Edit renderer for ListColumnType
|
2019-11-29 12:52:27 +01:00 |
|
Urban Rotnik
|
5f2407e3fb
|
Add view renders for DateTime column types
|
2019-11-29 10:50:14 +01:00 |
|
Urban Rotnik
|
65d8d0e35b
|
DateTime HTML and JS simplified
|
2019-11-29 10:19:57 +01:00 |
|
Urban Rotnik
|
d9178f4617
|
Remove .off handlers for columns JS
|
2019-11-29 10:19:56 +01:00 |
|
Urban Rotnik
|
bc1c377f63
|
Fix html
|
2019-11-29 10:19:56 +01:00 |
|
Urban Rotnik
|
9ea61578f1
|
Generic custom trigger event for loading partial
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
5ae29d549e
|
Add manage modal for DateTime values
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
1c9d7ef6e7
|
Add File type renderer
|
2019-11-29 10:19:54 +01:00 |
|
aignatov-bio
|
3474f72c41
|
Change JS load order
|
2019-11-29 10:19:49 +01:00 |
|
Urban Rotnik
|
64d797678a
|
Small syntax improvement
|
2019-11-29 10:19:13 +01:00 |
|
Urban Rotnik
|
0eb5c5671f
|
LoadParams refactor
|
2019-11-29 10:19:13 +01:00 |
|
Urban Rotnik
|
253205dcd1
|
Syntax improvements
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
dc6cc3bc62
|
Show after create flash messages
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
85153a5785
|
Split css file
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
9bf948c3a8
|
Add statuses validation on FE
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
b9d50263c4
|
Add simple emoji picker
|
2019-11-29 10:19:11 +01:00 |
|
Urban Rotnik
|
621f7da37b
|
Add fields for StatusItem
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2ce600820
|
Add delimiter column for repository_column
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2b6296cb5
|
Improve update items action, JS and views
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
db2943a1b7
|
Strip length of dropdown items, unique items, add specific params to request
|
2019-11-29 10:19:09 +01:00 |
|
Urban Rotnik
|
6fbb99c8d2
|
Add List items partial and JS
|
2019-11-29 10:19:09 +01:00 |
|
Urban Rotnik
|
24acf1f84b
|
Fix edit mode for File and Text
|
2019-11-29 10:19:08 +01:00 |
|
Oleksii Kriuchykhin
|
7efcf5abcf
|
Cleanup updateButtons method [SCI-4070]
|
2019-11-29 10:19:07 +01:00 |
|
Oleksii Kriuchykhin
|
3481b50796
|
Fix column reordering for repositories [SCI-4070]
|
2019-11-29 10:19:06 +01:00 |
|
Oleksii Kriuchykhin
|
338b710d81
|
Refactor inventory edit mode [SCI-4070]
|
2019-11-29 10:19:05 +01:00 |
|
Oleksii Kriuchykhin
|
e8fdfe7111
|
Implement datatables renderer for status data type [SCI-4032]
|
2019-11-29 10:19:04 +01:00 |
|
aignatov-bio
|
2024afce4b
|
Fix markup
|
2019-11-29 10:19:04 +01:00 |
|
aignatov-bio
|
c6a075664c
|
Add default renders for new columns type
|
2019-11-29 10:19:04 +01:00 |
|
aignatov-bio
|
232e4d78be
|
Add serializers to datatable values
|
2019-11-29 10:19:03 +01:00 |
|
aignatov-bio
|
a0f11116d2
|
Add render views for datatables
|
2019-11-29 10:18:59 +01:00 |
|
aignatov-bio
|
6d0f0dd3e2
|
Fix messages for manage columns modal
|
2019-11-29 10:18:11 +01:00 |
|
aignatov-bio
|
28de55acce
|
Fix url variables for manage columns
|
2019-11-29 10:18:06 +01:00 |
|
aignatov-bio
|
308c1c93d0
|
Fix merge
|
2019-11-29 10:18:02 +01:00 |
|
aignatov-bio
|
9eec36cb01
|
Refactor column type edit modal
|
2019-11-29 10:17:58 +01:00 |
|
Mojca Lorber
|
305104f639
|
Refactor text inventory type
|
2019-11-29 10:17:53 +01:00 |
|
Mojca Lorber
|
a269c8462d
|
Fix hound
|
2019-11-29 10:17:50 +01:00 |
|
Mojca Lorber
|
006a422e25
|
Refactor again
|
2019-11-29 10:17:49 +01:00 |
|
Mojca Lorber
|
fe8829b592
|
Fix multiple load of modal
|
2019-11-29 10:17:49 +01:00 |
|
Mojca Lorber
|
f1487561be
|
Reafactor javascript repository column
|
2019-11-29 10:17:48 +01:00 |
|
Mojca Lorber
|
c47d0017a0
|
fix failed tests
|
2019-11-29 10:17:48 +01:00 |
|
Mojca Lorber
|
9d4796cf90
|
refactor repository column javascript
|
2019-11-29 10:17:44 +01:00 |
|
Mojca Lorber
|
467c80da52
|
Update basic modal layout for creating new column types
|
2019-11-29 10:16:47 +01:00 |
|
aignatov-bio
|
bcd9c6aee3
|
Merge pull request #2238 from aignatov-bio/ai-sci-4101-improve-time-zone-date-format-interaction
Improve time zone and date format interaction at preference page [SCI-4101]
|
2019-11-28 14:54:30 +01:00 |
|
aignatov-bio
|
06a11a4a49
|
Improve time zone and date format interaction at preference page
|
2019-11-27 15:14:40 +01:00 |
|
aignatov-bio
|
a87fc24251
|
UI activtiies fixes
|
2019-11-27 14:04:59 +01:00 |
|
aignatov-bio
|
ad137b47df
|
Merge pull request #2230 from aignatov-bio/ai-sci-4097-fix-dropdown-event-after-back-action
Fix dropdown event after click browser back action [SCI-4097]
|
2019-11-25 13:58:04 +01:00 |
|
aignatov-bio
|
4a641ac03a
|
Merge pull request #2227 from aignatov-bio/ai-sci-4110-update-due-date-autosave-for-tags
Fix permission check and due date clear [SCI-4110]
|
2019-11-25 13:55:20 +01:00 |
|
aignatov-bio
|
993424d08e
|
Merge pull request #2226 from aignatov-bio/ai-sci-4086-fix-team-name-after-update
Fix name update and path to team [SCI-4086]
|
2019-11-25 13:55:09 +01:00 |
|
aignatov-bio
|
179dea085f
|
Fix dropdown event after click browser back action
|
2019-11-25 11:28:11 +01:00 |
|
aignatov-bio
|
e76b4ca26f
|
Fix permission check and due date clear
|
2019-11-24 21:06:34 +01:00 |
|
aignatov-bio
|
7fa753ca81
|
Fix name update and path to team
|
2019-11-23 23:20:38 +01:00 |
|
aignatov-bio
|
84a9d764e0
|
Add arrows controll for dropdown
|
2019-11-23 21:09:34 +01:00 |
|
aignatov-bio
|
96523ae131
|
Update CSS for team preferences and enable autosave
|
2019-11-22 10:46:44 +01:00 |
|
aignatov-bio
|
c712e4e48c
|
Fix due date moda
|
2019-11-21 13:05:36 +01:00 |
|
aignatov-bio
|
0b04ca4012
|
Fix markup
|
2019-11-21 12:19:47 +01:00 |
|
aignatov-bio
|
f2ed3198d5
|
Add due date autosave field
|
2019-11-21 12:14:43 +01:00 |
|
aignatov-bio
|
56ae32323c
|
Add autosave for protocol keywords and user preferences
|
2019-11-20 14:57:53 +01:00 |
|
aignatov-bio
|
32d99f676c
|
Fix markup
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
264493a322
|
Finish removing Select2 library
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
e7ad7ae969
|
New tags drop down
|
2019-11-18 13:59:55 +01:00 |
|
Anton Ignatov
|
0ed3d84407
|
Fix styling
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
b1c32d9a30
|
Improve dropdown and side panel
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
5b8e1fedf1
|
Fix markup
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7117b767f4
|
Fix commnets to PR
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
17e457c686
|
Finished global activities refactoring
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
fc70ce24f8
|
Refactor side filters for global activities
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
4e517ca6c4
|
Fix eslint for main file
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7b855f54ac
|
Finish main part of selectors
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
f832cfbbd4
|
Added tags
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
04bd5269ec
|
Created new dropdown selector
|
2019-11-18 13:59:54 +01:00 |
|
aignatov-bio
|
3eb6f5695b
|
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
|
2019-11-18 09:11:10 +01:00 |
|
aignatov-bio
|
d88d479854
|
Merge pull request #2175 from aignatov-bio/ai-sci-4007-error-at-click-to-share-button
Add check for existing elements for shared repository modal [SCI-4007]
|
2019-11-15 14:32:46 +01:00 |
|
aignatov-bio
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +01:00 |
|
Urban Rotnik
|
1d180f3688
|
Fix for step description overwriting
[SCI-4067]
|
2019-11-11 10:31:55 +01:00 |
|
aignatov-bio
|
cf2687f7e5
|
Merge branch 'ml-sci-4004' of https://github.com/mlorb/scinote-web into mlorb-ml-sci-4004
|
2019-11-07 13:03:02 +01:00 |
|
Alex Kriuchykhin
|
95686a9275
|
Merge pull request #2197 from okriuchykhin/ok_SCI_4053
Fix TinyMCE image URLs in the editor [SCI-4053]
|
2019-11-05 13:46:48 +01:00 |
|
Oleksii Kriuchykhin
|
67fdda1eeb
|
Fix TinyMCE image URLs in the editor [SCI-4053]
|
2019-11-05 13:38:47 +01:00 |
|
aignatov-bio
|
ae0db3a7bc
|
Update avatars and small CSS fixes
|
2019-11-05 10:43:02 +01:00 |
|
Mojca Lorber
|
16eddc0ad0
|
Save on click away, inline editing
|
2019-11-03 14:59:30 +01:00 |
|
Alex Kriuchykhin
|
ba3a5e5460
|
Merge pull request #2159 from mlorb/ml-sci-3816-v2
Fix reloading of datatables header again [SCI-3816]
|
2019-10-29 10:33:04 +01:00 |
|
Urban Rotnik
|
169a381629
|
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download
Fix for downloading image [SCI-4008]
|
2019-10-22 15:12:11 +02:00 |
|
Alex Kriuchykhin
|
5524598d53
|
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
|
2019-10-22 12:45:02 +02:00 |
|
aignatov-bio
|
4d3e318174
|
Add check for existing elements
|
2019-10-22 10:46:16 +02:00 |
|
Urban Rotnik
|
ce9f1b1309
|
Add mceToken check
|
2019-10-22 08:28:35 +02:00 |
|
Oleksii Kriuchykhin
|
4cba412e31
|
Fix protocols table select all checkbox [SCI-3999]
|
2019-10-17 17:05:01 +02:00 |
|
Mojca Lorber
|
b78211e3ca
|
Fix reloading of datatables header again
|
2019-10-16 13:02:41 +02:00 |
|
aignatov-bio
|
198697ff23
|
Fix avatar localization
|
2019-10-11 12:22:09 +02:00 |
|
aignatov-bio
|
54627faeb3
|
Fix tests
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
521a367960
|
Add predefined avatars
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
1f43f35073
|
First modal
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
a930f7affd
|
Fix async assets results
|
2019-10-08 19:51:03 +02:00 |
|
Urban Rotnik
|
bd1c5e4454
|
Fix focus for RTE
|
2019-10-04 14:55:14 +02:00 |
|
aignatov-bio
|
8176ce3a9d
|
Merge pull request #2123 from aignatov-bio/ai-sci-fix-merge-for-repository-datatable
Fix merge for repository datatable [SCI-3957]
|
2019-10-04 12:59:22 +02:00 |
|
aignatov-bio
|
fcc1829660
|
Fix merge for repository datatable
|
2019-10-04 10:51:13 +02:00 |
|
aignatov-bio
|
a39a95d2a7
|
Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature
Disable autosave notification feature
|
2019-10-04 09:17:16 +02:00 |
|
aignatov-bio
|
af69e12d1e
|
Disable autosave notification feature
|
2019-10-04 09:13:42 +02:00 |
|
aignatov-bio
|
0cbc699c62
|
Remove image icon from preview
|
2019-10-03 15:44:03 +02:00 |
|
aignatov-bio
|
e35617208d
|
Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools
Enable additional tools [SCI-3841]
|
2019-10-03 11:24:31 +02:00 |
|
aignatov-bio
|
65b1e0c041
|
Fix reload page
|
2019-10-03 11:19:12 +02:00 |
|
aignatov-bio
|
9000438025
|
Enable additional tools
|
2019-10-03 11:07:19 +02:00 |
|
aignatov-bio
|
301b37cccd
|
Fix duplicate code in file preview
|
2019-10-03 10:55:54 +02:00 |
|
Oleksii Kriuchykhin
|
dd7f2fe095
|
Fix large preview for documents [SCI-3938]
|
2019-10-01 16:14:28 +02:00 |
|
Oleksii Kriuchykhin
|
6a6a43f5ff
|
Improve file processing indicator [SCI-3938]
|
2019-10-01 15:20:46 +02:00 |
|
aignatov-bio
|
b8e917455a
|
Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel
Update MarvinJS asset on result text cancel [SCI-3907]
|
2019-10-01 13:39:01 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Anton Ignatov
|
859c5931a4
|
Update MArvinJS asset on result text cancel
|
2019-09-30 16:09:43 +02:00 |
|
Jure Grabnar
|
070c307721
|
Implement style changes suggested by Anton
|
2019-09-30 14:27:00 +02:00 |
|
Jure Grabnar
|
8441c5b6ed
|
Add anchor to result text editing
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
477e41a96d
|
Refactor I18n strings for tiny_mce
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
289853e2e8
|
Do not remove draft on step cancel (temporary)
Close SCI-3751
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
b3cafcec7c
|
Add restore draft notification to all models
Close SCI-3751
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
0a36372321
|
Fix placeholder positioning
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
b286e4adfd
|
Fix styles for notification bar
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
4f2182e2f5
|
Remove restoredraft icon
|
2019-09-30 11:34:39 +02:00 |
|
Jure Grabnar
|
6e33baa995
|
Add skeleton restore-draft notification for module description
|
2019-09-30 11:32:38 +02:00 |
|
mlorb
|
594124dad6
|
Merge pull request #2053 from mlorb/ml-sci-3637
Redesign of sorting button for projects/experiments cards [SCI-3637]
|
2019-09-27 12:44:44 +02:00 |
|
Alex Kriuchykhin
|
53caaf647b
|
Merge pull request #2080 from okriuchykhin/ok_SCI_3891
Move file preview generation to delayed job [SCI-3891]
|
2019-09-27 10:50:21 +02:00 |
|
mlorb
|
2fd9345616
|
Merge pull request #2068 from mlorb/ml-sci-3816
Fix reloading of datatables header [SCI-3816]
|
2019-09-27 10:29:32 +02:00 |
|
mlorb
|
246634dbc4
|
Merge pull request #2069 from mlorb/ml-sci-3796
Fix inventory item selection when previewing file [SCI-3796]
|
2019-09-27 10:13:35 +02:00 |
|
Anton Ignatov
|
d048b7fb56
|
Fix cancel button for marvinJS images
|
2019-09-26 11:25:34 +02:00 |
|
aignatov-bio
|
ba50b19986
|
Merge pull request #2082 from aignatov-bio/ai-sci-3907-fix-dirty-event-after-update-marvinjs-image
Fix dirty event after update marvinjs image [SCI-3907]
|
2019-09-25 13:51:36 +02:00 |
|
aignatov-bio
|
8a3b6b5cda
|
Merge pull request #2076 from aignatov-bio/ai-sci3769-fix-repository-row-import-export
Fix repository row import/export [SCI-3769]
|
2019-09-24 12:44:18 +02:00 |
|
Jure Grabnar
|
ae83ef749f
|
Add tables functionality in tinymce
Close SCI-3821
|
2019-09-24 12:44:00 +02:00 |
|
Anton Ignatov
|
6d81727bf1
|
Fix dirty event after update marvinjs image
|
2019-09-24 10:37:51 +02:00 |
|
Anton Ignatov
|
c389972e2a
|
Fix JS error in recent protocol drop down
|
2019-09-24 09:47:04 +02:00 |
|
Oleksii Kriuchykhin
|
aabeeec95a
|
Move file preview generation to delayed job [SCI-3891]
|
2019-09-23 21:07:03 +02:00 |
|
Anton Ignatov
|
09e3b7c80b
|
Fix repository row import/export
|
2019-09-23 13:33:02 +02:00 |
|
Mojca Lorber
|
4263edf0cc
|
Fix inventory item selection when previewing file
|
2019-09-18 15:08:40 +02:00 |
|
aignatov-bio
|
c652bb0d44
|
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button
Fix missing expand all button [SCI-3878]
|
2019-09-18 14:59:29 +02:00 |
|
aignatov-bio
|
ce91759ee2
|
Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error
Fix step table error [SCI-3879]
|
2019-09-18 14:59:16 +02:00 |
|
Mojca Lorber
|
4d4a275c0d
|
Fix reloading of datatables header
|
2019-09-18 14:28:29 +02:00 |
|
Anton Ignatov
|
0adb016293
|
Fix missing expand all button
|
2019-09-18 12:33:48 +02:00 |
|
Anton Ignatov
|
146c725e89
|
Fix step table error
|
2019-09-18 11:47:33 +02:00 |
|
aignatov-bio
|
d028856fe0
|
Fix hidden buttons in inventory (#2063)
|
2019-09-18 11:36:30 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Alex Kriuchykhin
|
b8a5b1b542
|
Merge pull request #2036 from okriuchykhin/ok_SCI_3815
Improve behavior of inventory items export modal [SCI-3815]
|
2019-09-09 11:08:02 +02:00 |
|
aignatov-bio
|
16ae00782a
|
Fix new step button on empty task [SCI-3826] (#2026)
* Fix new step button on empty task
* Fix markup
|
2019-09-09 10:43:38 +02:00 |
|
Oleksii Kriuchykhin
|
265047caf3
|
Improve behaviour of inventory items export modal [SCI-3815]
|
2019-09-09 10:38:47 +02:00 |
|
aignatov-bio
|
15dc25cee9
|
Fix handson table initialization [SCI-3749] (#2021)
* Fix handson table initialization
* Fix markup
|
2019-09-05 08:35:28 +02:00 |
|
aignatov-bio
|
b8e68e02a1
|
Fix error, when cancel tag editing (#2025)
|
2019-09-05 08:34:33 +02:00 |
|
mlorb
|
ba5bebedb2
|
change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)
|
2019-09-02 10:30:29 +02:00 |
|
aignatov-bio
|
d209b3abcd
|
Update share modal window [SCI-3812] (#2018)
* Update share modal window
* Fix markup
|
2019-08-29 13:45:27 +02:00 |
|
aignatov-bio
|
66326d90e5
|
Fix shared icon show/hidden (#2014)
|
2019-08-26 11:24:22 +02:00 |
|
aignatov-bio
|
d70b7e2272
|
Make share status icon dynamic (#2007)
|
2019-08-21 15:32:57 +02:00 |
|
aignatov-bio
|
e682a3e5d9
|
Fix steps description and table saving (#1984)
|
2019-08-21 11:05:49 +02:00 |
|
aignatov-bio
|
a505ef2462
|
Fix error in inventories for new teams [SCI-3788] (#1992)
* Fix error in inventories for new teams
* Replace with current team
|
2019-08-19 14:01:48 +02:00 |
|
aignatov-bio
|
d4aedbb35f
|
Small ux changes for inventories (#1989)
|
2019-08-19 09:24:10 +02:00 |
|
Miha Mencin
|
5adb745743
|
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons
Fix assign/unassign buttons [SCI-3785]
|
2019-08-19 08:51:14 +02:00 |
|
Anton Ignatov
|
ec57e0aa91
|
Fix assign/unassign buttons
|
2019-08-16 10:05:01 +02:00 |
|
Urban Rotnik
|
89f289660b
|
Add share_with_all feature to service, add new activities
|
2019-08-14 11:03:15 +02:00 |
|
aignatov-bio
|
737f9e572c
|
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976)
* Replace marvinJS logo and fix some merge issues
* Fix tests
|
2019-08-13 11:04:19 +02:00 |
|
aignatov-bio
|
aad726ac40
|
Update CSS for share modal (#1978)
|
2019-08-12 15:02:16 +02:00 |
|
Urban Rotnik
|
61af9e21ad
|
Fix datatable filter position
|
2019-08-09 14:22:24 +02:00 |
|
Urban Rotnik
|
32783576c1
|
Add controller action 'multiple_update'
Add controller action, add update permission activity, add JS for handling ajax req
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
2648521924
|
Invite modal with form
|
2019-08-09 14:15:49 +02:00 |
|
Urban Rotnik
|
466b05a5bc
|
Update repository index page
|
2019-08-09 14:15:48 +02:00 |
|
aignatov-bio
|
6e5f078dea
|
Add activities for marvinJS [SCI-3630] (#1950)
* Add marvinJs activities to step and results
* Add activities for TinyMCE marvinJS assets
* Fix markup
|
2019-08-09 09:47:07 +02:00 |
|
aignatov-bio
|
b57e79a557
|
Fix tables (#1963)
|
2019-08-09 09:41:32 +02:00 |
|
Oleksii Kriuchykhin
|
a5d47e75c5
|
Remove duplicated protocols.js.erb file [SCI-3678]
|
2019-08-08 14:33:07 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
d942788581
|
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
aignatov-bio
|
aa5061a1af
|
Add custom context menu to TinyMCE images [SCI-3582] (#1944)
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
|
2019-08-07 10:28:42 +02:00 |
|
Oleksii Kriuchykhin
|
f3849e2ece
|
Fix TinyMCE plugings config [SCI-3679]
|
2019-08-06 15:46:55 +02:00 |
|
Oleksii Kriuchykhin
|
eaf9d59819
|
Merge branch 'activestorage_migration' into ok_SCI_3679
|
2019-08-06 15:27:31 +02:00 |
|
Oleksii Kriuchykhin
|
423528933e
|
Switch to global JS constants [SCI-3679]
|
2019-08-06 15:06:19 +02:00 |
|
Jure Grabnar
|
dbebde3370
|
Merge pull request #1953 from jbargu/jg_sci_3673
Revalidate internal dimension when dragging
|
2019-07-30 07:44:36 +02:00 |
|
Oleksii Kriuchykhin
|
ccf76b8531
|
Move repository_datatable to JS file [SCI-3679]
|
2019-07-26 13:00:25 +02:00 |
|
Urban Rotnik
|
4699ba718a
|
Fix showing errors
|
2019-07-26 11:32:51 +02:00 |
|
Oleksii Kriuchykhin
|
5e65b07bdc
|
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
|
2019-07-25 18:00:24 +02:00 |
|
Jure Grabnar
|
a579328614
|
Revalidate internal dimension when dragging
Close SCI-3673
|
2019-07-25 16:37:15 +02:00 |
|
Jure Grabnar
|
f44404a1f8
|
Merge pull request #1946 from jbargu/jg_sci_3704
Fix Handsontable error when generation report
|
2019-07-25 11:28:46 +02:00 |
|
Jure Grabnar
|
06657dbdf6
|
Add spinner when editing image annotation (#1948)
Add spinner when editing image annotation
|
2019-07-25 11:28:13 +02:00 |
|
Urban Rotnik
|
1b9db2f61e
|
Fix for file annotating on Safari
|
2019-07-24 14:16:29 +02:00 |
|
Jure Grabnar
|
cdad167be2
|
Add spinner when editing image annotation
Close SCI-3710
|
2019-07-23 15:02:33 +02:00 |
|
Jure Grabnar
|
5847a8b05c
|
Convert HOT table after it was initialized
Closes SCI-3704
|
2019-07-23 14:17:22 +02:00 |
|
Anton Ignatov
|
3b7f715e0b
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-22 13:09:17 +02:00 |
|
aignatov-bio
|
4fe0227d8c
|
Add metadata for .eln assets (#1942)
|
2019-07-19 10:53:33 +02:00 |
|
Anton Ignatov
|
ad7130d3b2
|
Simplify TinyMCE assets for MarvinJS
|
2019-07-19 09:27:03 +02:00 |
|
Anton Ignatov
|
d79fec3345
|
Move TinyMCE logic to correspond controller
|
2019-07-16 15:51:44 +02:00 |
|
Anton Ignatov
|
1e8663548e
|
Add MarvinJS assets to TinyMCE
|
2019-07-16 13:40:54 +02:00 |
|
Anton Ignatov
|
3339c1fbbf
|
Add MarvinJS to Result and TinyMce MarvinJS refactor
|
2019-07-15 17:17:14 +02:00 |
|
aignatov-bio
|
3c32fe0895
|
Fix formulas in table report (#1934)
|
2019-07-15 13:27:27 +02:00 |
|
Jure Grabnar
|
eb615ea8dd
|
[SCI-3670] Show protocols at external protocols tab (#1933)
[SCI-3670] Show protocols at external protocols tab
|
2019-07-15 11:24:01 +02:00 |
|
aignatov-bio
|
894e201e1b
|
Fix big file issue in step attachments [SCI-3682] (#1919)
* Fix big file issue in step atachments
* Fix markup
|
2019-07-15 11:00:01 +02:00 |
|
Jure Grabnar
|
d210b0b152
|
Trigger loading of latest publications when page is loaded
Closes SCI-3670
|
2019-07-15 08:52:17 +02:00 |
|
mlorb
|
5bc8eb7392
|
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
|
2019-07-12 15:52:40 +02:00 |
|
Anton Ignatov
|
ba1d6d45ca
|
Fix merging issues
|
2019-07-12 15:47:15 +02:00 |
|
Anton Ignatov
|
ffd415d409
|
Inital refactor for Assets model
|
2019-07-12 15:02:06 +02:00 |
|
Anton Ignatov
|
7831b0a089
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 15:00:07 +02:00 |
|
Anton Ignatov
|
57a273d5d0
|
Merge branch 'activestorage_migration' into features/marvinjs-integration
|
2019-07-12 11:34:41 +02:00 |
|
aignatov-bio
|
c6152ccddb
|
Fix big table issue in ProtocolIo preview (#1927)
|
2019-07-12 11:17:51 +02:00 |
|
aignatov-bio
|
d8d04b89cd
|
Fix autosave issue in mozzila (#1925)
|
2019-07-12 11:15:45 +02:00 |
|
aignatov-bio
|
70589126c3
|
Fix autosave for steps (#1926)
|
2019-07-12 10:16:49 +02:00 |
|
Mojca Lorber
|
f8afc92606
|
Fix page redirect and add success flash msg after protocols.io import action
|
2019-07-11 09:50:39 +02:00 |
|
Jure Grabnar
|
5eb197127f
|
Fix relative links in protocolsio iframe
Closes SCI-3660
|
2019-07-10 19:20:40 +02:00 |
|
Oleksii Kriuchykhin
|
64b7a5646a
|
Implement custom document file previewer [SCI-3677]
|
2019-07-10 14:37:23 +02:00 |
|
aignatov-bio
|
7ac410e573
|
Fix visual bugs across ProtocolIo [SCI-3671] (#1914)
* Fix visual bugs across ProtocolIo
|
2019-07-10 13:00:32 +02:00 |
|
mlorb
|
23270393b0
|
Merge branch 'master' into ml-sci-3634
|
2019-07-09 14:38:00 +02:00 |
|
Mojca Lorber
|
7bb82e2fc2
|
Fix eternal protocols tab visuals
|
2019-07-09 14:35:40 +02:00 |
|
Oleksii Kriuchykhin
|
a1941a21dc
|
Futher refactoring of old Paperclip methods [SCI-3539]
|
2019-07-09 10:28:15 +02:00 |
|
Jure Grabnar
|
bdd1ca2a65
|
Merge pull request #1908 from jbargu/jg_sci_3587
[SCI-3587] Endless spinner at file preview
|
2019-07-08 13:06:39 +02:00 |
|
Jure Grabnar
|
ae7da78bff
|
Merge pull request #1897 from jbargu/jg_sci_3646
[SCI-3646] Add paging functionality to external protocols
|
2019-07-08 13:06:19 +02:00 |
|
aignatov-bio
|
81aef81634
|
Fix scrol jump when select activtiies in global activities (#1907)
|
2019-07-08 12:55:35 +02:00 |
|
aignatov-bio
|
99b1075c28
|
Fix protcol naming when load multiple protocols (#1904)
|
2019-07-08 12:51:47 +02:00 |
|
Jure Grabnar
|
0ee0b1c834
|
Fix file preview not showing in modal when processing is done
Close SCI-3587
|
2019-07-08 12:45:22 +02:00 |
|
Oleksii Kriuchykhin
|
9d926dc956
|
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
|
2019-07-05 16:56:05 +02:00 |
|
Jure Grabnar
|
0eb09407bc
|
Always scroll to top when searching for new string
|
2019-07-04 15:38:15 +02:00 |
|
Jure Grabnar
|
dc7fee51fa
|
Add Show more protocols functionality to external protocols
Closes SCI-3646
|
2019-07-04 15:35:18 +02:00 |
|
Jure Grabnar
|
20134c9f8a
|
Features/protocolsio integration (#1893)
Features/protocolsio integration
|
2019-07-03 17:32:20 +02:00 |
|
aignatov-bio
|
d2849c88fd
|
Remove draft after save step (#1878)
|
2019-07-03 09:18:52 +02:00 |
|
aignatov-bio
|
378e91b426
|
Fix links on search page (#1867)
|
2019-07-02 11:21:00 +02:00 |
|
aignatov-bio
|
68ebf13bca
|
Fix tags modal issue (#1856)
|
2019-07-02 11:20:49 +02:00 |
|
Oleksii Kriuchykhin
|
4ea6b56582
|
Fix Step and Result file previews [SCI-3539]
|
2019-07-01 23:30:20 +02:00 |
|
Alex Kriuchykhin
|
7e4852d5aa
|
Merge pull request #1871 from okriuchykhin/ok_SCI_3511_v2
Fix TinyMCE editor initialization for step editing [SCI-3511]
|
2019-07-01 16:08:36 +02:00 |
|
aignatov-bio
|
a08d93376c
|
Add promo modal when MarvinJS disabled (#1872)
|
2019-07-01 11:51:13 +02:00 |
|
aignatov-bio
|
2793777463
|
Features/docx report (#1873)
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
|
2019-07-01 10:14:16 +02:00 |
|
Oleksii Kriuchykhin
|
2f39b7f22b
|
Fix TinyMCE editor initialization for step editing [SCI-3511]
|
2019-06-28 12:06:04 +02:00 |
|
Anton Ignatov
|
6be227b2d3
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
|
2019-06-28 10:47:38 +02:00 |
|
Jure Grabnar
|
5430fb311d
|
Hound fixes
|
2019-06-28 10:41:20 +02:00 |
|
Jure Grabnar
|
1a9fca87d2
|
Fix non-existent protocol-card in preview banner
|
2019-06-28 08:49:12 +02:00 |
|
Jure Grabnar
|
149f45f4fc
|
Hound fixes
|
2019-06-28 02:31:25 +02:00 |
|
Jure Grabnar
|
7fb696cf48
|
Fix unclickable import modal
|
2019-06-28 02:00:05 +02:00 |
|
Jure Grabnar
|
03b81400a9
|
Add timeout to search
|
2019-06-28 01:50:52 +02:00 |
|
Jure Grabnar
|
1ccabf62b3
|
Add preview banner in external protocols
|
2019-06-28 01:38:33 +02:00 |
|
Jure Grabnar
|
d3afcbed50
|
Style card view on external protocols
Closes SCI-3535
|
2019-06-28 00:43:05 +02:00 |
|
Jure Grabnar
|
7fb650a125
|
Change click -> onchange event for sort_by buttons
|
2019-06-27 22:56:38 +02:00 |
|
Jure Grabnar
|
0a77cedaf8
|
Fix sorting of external protocols and start showing results
|
2019-06-27 22:48:56 +02:00 |
|
Urban Rotnik
|
9cb4454537
|
New implementation for attachments creation
|
2019-06-27 17:02:06 +02:00 |
|
Urban Rotnik
|
1fd0ca6795
|
Add steps preview
|
2019-06-27 16:46:02 +02:00 |
|
Urban Rotnik
|
2761079479
|
Add modal for import
|
2019-06-27 16:46:02 +02:00 |
|
Jure Grabnar
|
7d71608166
|
Add spinner to external preview
|
2019-06-26 19:43:35 +02:00 |
|
aignatov-bio
|
83bc9eb22f
|
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
Adding new activities for image editing [SCI-3369]
|
2019-06-24 10:31:39 +02:00 |
|
aignatov-bio
|
81c76fb112
|
Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated
Fix comments counter for zero comments [SCI-3586]
|
2019-06-24 09:39:22 +02:00 |
|
Anton Ignatov
|
ab73987245
|
improve connector perfomance
|
2019-06-23 00:48:50 +02:00 |
|
Anton Ignatov
|
31c6802a06
|
Add support for marvinjs on service
|
2019-06-23 00:09:49 +02:00 |
|
Anton Ignatov
|
8240c8baad
|
Initial refactoring for remote api support
|
2019-06-22 01:51:59 +02:00 |
|
Anton Ignatov
|
7e5c39d3e4
|
Merge branch 'master' into features/marvinjs-integration
|
2019-06-21 14:51:45 +02:00 |
|
Anton Ignatov
|
76e09a2a3d
|
Clear TinyMce autosave after manual save
|
2019-06-21 14:21:03 +02:00 |
|
Anton Ignatov
|
57ef9573f2
|
Fix comments counter for zero comments
|
2019-06-21 10:43:41 +02:00 |
|
Alex Kriuchykhin
|
db7c6435b3
|
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-20 11:31:15 +02:00 |
|
Anton Ignatov
|
df344f4d03
|
Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation
|
2019-06-20 09:43:53 +02:00 |
|
Jure Grabnar
|
b2b752fcf8
|
Fix hound complaints
|
2019-06-19 23:37:04 +02:00 |
|
Jure Grabnar
|
b3c3b68dc2
|
Add external preview to External Protocols tab
Closes SCI-3563
|
2019-06-19 22:54:20 +02:00 |
|
Anton Ignatov
|
a843a016a0
|
Fix markup and naming
|
2019-06-19 15:19:47 +02:00 |
|
aignatov-bio
|
609c408c77
|
Fix error on new step saving command (#1845)
|
2019-06-19 14:06:25 +02:00 |
|
aignatov-bio
|
5734d0cdd7
|
Fix TinyMCE field selector for steps (#1844)
|
2019-06-19 14:06:16 +02:00 |
|
aignatov-bio
|
81d10c8ce4
|
Remove recent protocol button on new step (#1841)
|
2019-06-19 12:49:22 +02:00 |
|
aignatov-bio
|
fb3b7918af
|
Fix handson table issue (#1827)
|
2019-06-14 16:21:27 +02:00 |
|
aignatov-bio
|
da8d748c49
|
Fix small comments bugs (#1832)
|
2019-06-14 16:20:47 +02:00 |
|
Anton Ignatov
|
f480c0eb8d
|
Adding new activtiies for image editing
|
2019-06-14 16:15:30 +02:00 |
|
aignatov-bio
|
52a2f5cd0e
|
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
|
2019-06-13 15:47:29 +02:00 |
|
Alex Kriuchykhin
|
bc94771828
|
Merge pull request #1791 from okriuchykhin/ok_SCI_3461
Refactor the async thumbnail reloading (spinner) [SCI-3461]
|
2019-06-12 15:35:15 +02:00 |
|
Alex Kriuchykhin
|
4f851b0995
|
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller
Fix nil issue in tags_my_module controller [SCI-3525]
|
2019-06-12 13:11:40 +02:00 |
|
Oleksii Kriuchykhin
|
a855eade4c
|
Merge branch 'master' into ok_SCI_3461
|
2019-06-11 17:48:02 +02:00 |
|
Oleksii Kriuchykhin
|
4d579db2e2
|
Refactor assets polling to use setTimeout [SCI-3461]
|
2019-06-11 13:14:07 +02:00 |
|
Oleksii Kriuchykhin
|
6e1a7a3392
|
Implement saving of attachments ordering on steps [SCI-3436]
|
2019-06-11 10:08:33 +02:00 |
|
aignatov-bio
|
d553fee2b3
|
Prevent negative scroll for sidebar (#1819)
|
2019-06-05 12:41:27 +02:00 |
|
Urban Rotnik
|
3d3c6d5350
|
Toolbar position fix for Safari
|
2019-06-04 15:55:44 +02:00 |
|
aignatov-bio
|
d207cf5dce
|
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
|
2019-06-04 14:40:21 +02:00 |
|
Anton Ignatov
|
d0439f478d
|
Fix markup
|
2019-06-03 09:52:04 +02:00 |
|
Anton Ignatov
|
559bb2d793
|
Prevent selecting empty tag
|
2019-06-03 09:50:55 +02:00 |
|
aignatov-bio
|
cd7460a4bd
|
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
|
2019-05-31 15:44:27 +02:00 |
|
Anton Ignatov
|
16d00340cd
|
Fix merge errors
|
2019-05-31 10:35:04 +02:00 |
|
Anton Ignatov
|
c9a29b12ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-31 10:27:14 +02:00 |
|
aignatov-bio
|
3681df7b9f
|
Fix scroll issue in repository column editor (#1813)
|
2019-05-31 09:48:45 +02:00 |
|
Alex Kriuchykhin
|
c49dbe5c44
|
Merge pull request #1810 from okriuchykhin/ok_SCI_3511
Fix RTE editor initialization for new step in protocol [SCI-3511]
|
2019-05-30 12:54:36 +02:00 |
|
Oleksii Kriuchykhin
|
d061aec5cd
|
Fix RTE editor initialization for new step in protocol [SCI-3511]
|
2019-05-29 18:33:20 +02:00 |
|
Oleksii Kriuchykhin
|
2c9ced0c75
|
Fix step numbering update on reposition [SCI-3507]
|
2019-05-29 12:20:35 +02:00 |
|
aignatov-bio
|
fb30e6b6e5
|
Add check for refreshProtocolStatusBar function exist (#1794)
|
2019-05-22 10:31:29 +02:00 |
|
Oleksii Kriuchykhin
|
84a2ad4487
|
Refactor the async thumbnail reloading (spinner) [SCI-3461]
|
2019-05-21 17:29:33 +02:00 |
|
aignatov-bio
|
d97e803d01
|
Adding placeholder to TinyMCE editor (#1788)
|
2019-05-21 15:53:47 +02:00 |
|
aignatov-bio
|
59e824ef9e
|
Fix nil handling in different places [SCI-2840] (#1777)
* Fix nil handling in different places
|
2019-05-21 15:53:34 +02:00 |
|
mlorb
|
be0393e642
|
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
Update protocol status bar upon protocol changing [SCI-3193]
|
2019-05-21 15:28:58 +02:00 |
|
aignatov-bio
|
2de2ead723
|
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
|
2019-05-21 15:19:44 +02:00 |
|
Mojca Lorber
|
b479a6a145
|
Cover all use cases for updating protocol status bar
|
2019-05-20 16:09:43 +02:00 |
|
aignatov-bio
|
20b626d791
|
Fix warning message issue in step description [SCI-3479] (#1778)
* Fix warning message issue
|
2019-05-20 11:19:53 +02:00 |
|
Luka Murn
|
c26489acdc
|
Update protocol status bar upon changing of protocol description
|
2019-05-17 10:22:16 +02:00 |
|
Anton Ignatov
|
259b75a6ba
|
Merge branch 'master' into features/marvinjs-integration
|
2019-05-16 09:28:48 +02:00 |
|
aignatov-bio
|
24e30867da
|
Add smart annotation to comments [SCI-3458] (#1768)
* Add smart annotation to comments
|
2019-05-15 14:59:15 +02:00 |
|
aignatov-bio
|
825e34e661
|
Fix inside click action in inline editing [SCI-3440] (#1765)
* Fix inside click action
|
2019-05-14 16:25:46 +02:00 |
|
aignatov-bio
|
d28d466dc9
|
Fix multiple confirm windows [SCI-3452] (#1763)
* Fix multiple confirm windows
|
2019-05-14 16:25:34 +02:00 |
|
aignatov-bio
|
4a753f8519
|
Fix user smart annotation fpr tinyMCE (#1759)
|
2019-05-14 15:02:12 +02:00 |
|
aignatov-bio
|
fe2a3c4ee6
|
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754)
* Add message when turbolinks change page with dirty tinuMCE
|
2019-05-14 09:49:00 +02:00 |
|
Oleksii Kriuchykhin
|
4b1c4bd140
|
Fix handling of proccessing step attachments [SCI-3381]
|
2019-05-13 17:12:06 +02:00 |
|
aignatov-bio
|
039b2f3754
|
Fix zoom on Y axis [SCI-3374] (#1750)
* Add zoom to image annotation
|
2019-05-13 11:01:39 +02:00 |
|
Miha Mencin
|
5ff344c208
|
Merge pull request #1746 from biosistemika/lm-sci-3426
Changes to create new office file button [SCI-3426]
|
2019-05-13 10:55:58 +02:00 |
|
aignatov-bio
|
d3aa6371cd
|
Fix report saving [SCI-3443] (#1753)
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
|
2019-05-13 10:55:08 +02:00 |
|
Oleksii Kriuchykhin
|
b60bd79e2b
|
Change implementation of TinyMCE floating toolbar [SCI-3439]
|
2019-05-13 10:26:15 +02:00 |
|
aignatov-bio
|
3633274c8f
|
Fix import for eln (#1741)
|
2019-05-13 10:22:30 +02:00 |
|
aignatov-bio
|
364f903b3c
|
Fix protocol preview name (#1749)
|
2019-05-13 10:17:47 +02:00 |
|
aignatov-bio
|
2010b3ad8f
|
Fix step comments bugs (#1751)
|
2019-05-13 09:49:53 +02:00 |
|
Anton Ignatov
|
65eff67926
|
Fix merge
|
2019-05-11 20:54:52 +02:00 |
|
Anton Ignatov
|
e5b4adcc25
|
Merge branch 'master-with-note-section' into features/marvinjs-integration
|
2019-05-11 20:51:01 +02:00 |
|
Luka Murn
|
bbfad0efe5
|
Refresh current page after new OfficeOnline file is created
|
2019-05-10 18:30:48 +02:00 |
|
Mojca Lorber
|
86255b9037
|
Remove automatic saving on task and protocol description
|
2019-05-10 15:30:29 +02:00 |
|
Mojca Lorber
|
d761a5cecb
|
Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description
|
2019-05-10 11:27:47 +02:00 |
|
Mojca Lorber
|
8e6413b031
|
Fix tiny mce visuals, saving and cursor position
|
2019-05-10 10:52:14 +02:00 |
|
Anton Ignatov
|
b5271bdd2c
|
Add remote api support
|
2019-05-08 15:00:36 +02:00 |
|
Anton Ignatov
|
dcf94e78e1
|
Merge branch 'master-with-note-section' into feature/marvinjs-integration
|
2019-05-08 14:03:41 +02:00 |
|
aignatov-bio
|
d08bdd771e
|
Fix task tag cut off (#1734)
|
2019-05-08 10:21:59 +02:00 |
|
Miha Mencin
|
0a7696200a
|
Merge pull request #1732 from aignatov-bio/ai-sci-3413-tinymce-step-not-loading
Clear step edit textarea status before going to edit mode [SCI-3413]
|
2019-05-07 16:36:04 +02:00 |
|
Miha Mencin
|
b31645adbe
|
Merge pull request #1731 from aignatov-bio/ai-sci-3418-fix-window-scroll-after-exit-from-tinymce
Fix floating tool bar and scroll issue after leaving editor [SCI-3418]
|
2019-05-07 16:35:49 +02:00 |
|
Miha Mencin
|
60fd1a02c6
|
Merge pull request #1730 from aignatov-bio/ai-sci-3410-add-task-tag-on-enter
Add task tag on enter button [SCI-3410]
|
2019-05-07 16:35:34 +02:00 |
|
Miha Mencin
|
4b76151e40
|
Merge pull request #1727 from mlorb/ml-sci-3384
Fix bug when saving empty step description [SCI-3384]
|
2019-05-07 16:35:12 +02:00 |
|
Anton Ignatov
|
ea545801aa
|
Clear edit textarea status before going to editmode
|
2019-05-07 15:54:32 +02:00 |
|
Anton Ignatov
|
826ed63f17
|
Fix floating tool bar and scroll issue after leaving editor
|
2019-05-07 15:21:15 +02:00 |
|
Anton Ignatov
|
168424a035
|
Add tag on enter button
|
2019-05-07 14:47:44 +02:00 |
|
aignatov-bio
|
7d54f2ab01
|
Fix issue with TInyMCE upload plugin (#1723)
|
2019-05-07 10:24:02 +02:00 |
|
Mojca Lorber
|
46e8f80965
|
Fix bug when saving empty step description
|
2019-05-06 17:14:19 +02:00 |
|
Alex Kriuchykhin
|
3f0401bf9a
|
Merge pull request #1709 from okriuchykhin/ok_SCI_3398
Fix TinyMCE for results [SCI-3398]
|
2019-05-06 10:47:11 +02:00 |
|
aignatov-bio
|
cc8a152278
|
Fix step attachments sorting (#1718)
|
2019-05-06 09:56:26 +02:00 |
|
Anton Ignatov
|
565a4959b4
|
small fixes and improvments
|
2019-05-03 15:24:28 +02:00 |
|
Anton Ignatov
|
fef691d30f
|
Add error handling and secutiry checks
|
2019-05-02 16:12:25 +02:00 |
|
Anton Ignatov
|
f73dd38780
|
Add image editor to tinymce drawings
|
2019-04-30 18:32:59 +02:00 |
|
Anton Ignatov
|
4d0d5aa014
|
Adding team sketches selector
|
2019-04-30 17:32:55 +02:00 |
|
Anton Ignatov
|
f80d881847
|
Fix markup
|
2019-04-28 19:11:41 +02:00 |
|
Anton Ignatov
|
2847ec7609
|
Add env variable and check for MarvinJS available
|
2019-04-28 17:08:18 +02:00 |
|
Anton Ignatov
|
260810fff8
|
Add editing mode for tinymce images
|
2019-04-28 16:16:31 +02:00 |
|
Anton Ignatov
|
193edfbc35
|
Add marvin js support to TinyMCE
|
2019-04-27 22:54:59 +02:00 |
|
Anton Ignatov
|
54731856f0
|
Finish step chemical attachments
|
2019-04-27 19:08:40 +02:00 |
|
Anton Ignatov
|
cf4ff41ec6
|
Add delete feature
|
2019-04-27 13:51:35 +02:00 |
|
Anton Ignatov
|
46f0e0c0c2
|
Add marvin js assets to assets sort and name field
|
2019-04-27 12:46:45 +02:00 |
|
Anton Ignatov
|
fe620c4a63
|
Add marvin model and controller
|
2019-04-26 22:59:38 +02:00 |
|
Anton Ignatov
|
baa9b94a63
|
Add new graph button to step
|
2019-04-26 20:33:20 +02:00 |
|
Anton Ignatov
|
40c1c9aef7
|
Add marvin js modal
|
2019-04-26 18:24:21 +02:00 |
|
Oleksii Kriuchykhin
|
077ad52d4b
|
Fix TinyMCE for results [SCI-3398]
|
2019-04-26 17:37:01 +02:00 |
|
aignatov-bio
|
dc7fddc60a
|
Improve task tags (#1708)
|
2019-04-26 15:38:33 +02:00 |
|
aignatov-bio
|
9fbfa9215e
|
Add zoom to image annotation [SCI-3374] (#1694)
* Add zoom to image annotation
|
2019-04-26 15:21:01 +02:00 |
|
aignatov-bio
|
1a860037f7
|
Update reports for new RTE [SCI-3263] (#1691)
* Update reports for new RTE
|
2019-04-25 16:16:43 +02:00 |
|
Urban Rotnik
|
0cf688be39
|
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes
Comments section changes [SCI-3135]
|
2019-04-25 14:18:05 +02:00 |
|
Anton Ignatov
|
0779ed598b
|
Reuse inline editing logic
|
2019-04-25 11:14:55 +02:00 |
|
aignatov-bio
|
84993ea3ef
|
Update protocol repository for new description format [SCI-3371] (#1689)
* Update protocol repository for new description format
* move image clone method to concerns
|
2019-04-24 13:34:56 +02:00 |
|
Urban Rotnik
|
f894bca694
|
Add saving event when user clicks out of textarea
|
2019-04-23 15:02:59 +02:00 |
|
Urban Rotnik
|
774521df7a
|
Changes to comments section in Task Steps
|
2019-04-23 15:02:58 +02:00 |
|
Urban Rotnik
|
11a7a975af
|
Merge branch 'features/scinote-improvements' into master-with-note-section
|
2019-04-23 14:50:03 +02:00 |
|
Urban Rotnik
|
ea0368aa11
|
Attachments update for edit page
|
2019-04-23 13:50:47 +02:00 |
|
Anton Ignatov
|
7d60eb5572
|
Fix migration issues
|
2019-04-23 11:11:22 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
92d8e42a92
|
Add floating toolbar for tinymce (#1688)
|
2019-04-19 15:12:06 +02:00 |
|
aignatov-bio
|
ba1e3dc3c6
|
Add smooth loading for inline task and protoocl description editing (#1682)
|
2019-04-19 14:47:05 +02:00 |
|
aignatov-bio
|
6b45dcd475
|
Update eln export for new tinyMCE image format (#1680)
|
2019-04-19 14:44:40 +02:00 |
|
Anton Ignatov
|
f1d801117d
|
disable zoom
|
2019-04-18 09:11:27 +02:00 |
|
Anton Ignatov
|
f6ecea42cf
|
Remove minimum zoom size
|
2019-04-17 18:51:52 +02:00 |
|
Urban Rotnik
|
3f037ef517
|
Fix navigationJS team switch when have only 1 team
|
2019-04-17 09:58:18 +02:00 |
|
Anton Ignatov
|
dd8b3caf65
|
Fix duplicate activtiy issue and fix link to inventory
|
2019-04-15 11:35:30 +02:00 |
|
aignatov-bio
|
063f02dc56
|
Add ability to select filters with keyboard [SCI-3200] (#1649)
* Add ability to select fitlers with keyboard
|
2019-04-15 10:30:08 +02:00 |
|
aignatov-bio
|
8d7cc57da1
|
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654)
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
|
2019-04-15 09:49:44 +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
|
bf2e9e8194
|
Rename button load more system notification to fix the bug
|
2019-04-12 11:58:47 +02:00 |
|
aignatov-bio
|
ffb0db06b9
|
Add scroll to team selector (#1659)
|
2019-04-12 09:17:14 +02:00 |
|
aignatov-bio
|
2b92a987e6
|
Fix user counter bug on project card (#1662)
|
2019-04-12 09:17:03 +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 |
|
Jure Grabnar
|
8420974779
|
Move scrollTop to reloadActivities
Closes SCI-3302
|
2019-04-10 18:45:12 +02:00 |
|
Jure Grabnar
|
3c47521f0e
|
Reset scrollbar after selecting date filter
Closes SCI-3302
|
2019-04-10 15:46:30 +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 |
|
Urban Rotnik
|
ee3dc571e1
|
Update attachments view, add ordering on FE
|
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 |
|
aignatov-bio
|
a086f88541
|
Disable save button while image loading (#1646)
|
2019-04-09 09:07:58 +02:00 |
|
Jure Grabnar
|
d9a9045658
|
Hound formatting
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
d60cc2cd1c
|
Refactor create_wopi_file
|
2019-04-04 17:05:25 +02:00 |
|
Jure Grabnar
|
56bb62c5b0
|
Addtional formatting fixes
|
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
|
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 |
|
Oleksii Kriuchykhin
|
9e91e9e59d
|
Improve large image saving after editing [SCI-3289]
|
2019-04-03 16:31:56 +02:00 |
|
Alex Kriuchykhin
|
bfd275c313
|
Merge pull request #1632 from okriuchykhin/ok_SCI_3281
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
|
2019-04-03 11:39:59 +02:00 |
|
aignatov-bio
|
e034a0c055
|
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631)
* Fix bug with update protocol from repository and modal disable button
|
2019-04-03 09:18:18 +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 |
|
aignatov-bio
|
3a2f78d7a8
|
Fix freeze top pane tags bug (#1627)
|
2019-04-02 16:05:48 +02:00 |
|
Alex Kriuchykhin
|
93350d1ac8
|
Merge pull request #1626 from okriuchykhin/ok_SCI_3174
Fix comment menu position on canvas [SCI-3174]
|
2019-04-02 15:10:14 +02:00 |
|
Anton Ignatov
|
c9f9523210
|
Remove src when save description and rename token tag
|
2019-04-02 13:41:32 +02:00 |
|
Oleksii Kriuchykhin
|
91a87cbf3a
|
Fix comment menu position on canvas [SCI-3174]
|
2019-04-02 12:54:21 +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 |
|
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 |
|
Jure Grabnar
|
d9c10c6c7b
|
Remove reapplying callback actions on project index page
Closes SCI-3242.
|
2019-04-01 15:02:47 +02: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 |
|
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
|
e8a4fd5360
|
Fix date label
Closes SCI-3226
|
2019-03-29 08:18:15 +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 |
|
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 |
|
Jure Grabnar
|
9881ff38ee
|
Add color to HOT buttons
|
2019-03-27 15:34:01 +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 |
|
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 |
|
aignatov-bio
|
a3c1796497
|
Adding arrow to drop down [SCI-3212] (#1594)
* Adding arrow to dropdown
|
2019-03-26 16:49:12 +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 |
|
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 |
|