aignatov-bio
|
eb4a783337
|
Fix task visibility for current task widget
|
2020-03-03 13:13:46 +01:00 |
|
mlorb
|
4d52fc9b45
|
Merge branch 'features/dashboard' into ml-sci-4354
|
2020-03-03 13:00:05 +01:00 |
|
Mojca Lorber
|
52493fd834
|
Add pagination for current tasks on dashboard
|
2020-03-03 12:07:21 +01:00 |
|
aignatov-bio
|
e46e496702
|
Add user check to invite user modal
|
2020-03-03 10:30:04 +01:00 |
|
aignatov-bio
|
51c7aa2c7a
|
Remove keydown event
|
2020-03-03 09:58:53 +01:00 |
|
aignatov-bio
|
50810dc55e
|
Fix markup
|
2020-03-03 09:53:44 +01:00 |
|
aignatov-bio
|
d9bfd8c28e
|
Add search to current task widget
|
2020-03-03 09:50:44 +01:00 |
|
aignatov-bio
|
1eed4c500d
|
Remove validation for items list
|
2020-03-02 14:35:47 +01:00 |
|
Oleksii Kriuchykhin
|
a819e1b8f4
|
Merge branch 'hotfix/1.17.11' into develop
|
2020-03-02 11:58:25 +01:00 |
|
Oleksii Kriuchykhin
|
03f08c4c06
|
Merge branch 'hotfix/1.18.4' into develop
|
2020-03-02 11:56:45 +01:00 |
|
Oleksii Kriuchykhin
|
73623da02c
|
Merge branch 'develop' into features/dashboard
|
2020-02-28 16:46:56 +01:00 |
|
Alex Kriuchykhin
|
f9ad438fb5
|
Merge pull request #2431 from okriuchykhin/ok_SCI_4381
Add invite users to the team permission check [SCI-4381]
|
2020-02-28 16:40:57 +01:00 |
|
Alex Kriuchykhin
|
b83cbf33a7
|
Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug
Fix files handling in results [SCI-4345]
|
2020-02-28 16:40:05 +01:00 |
|
Alex Kriuchykhin
|
409c4b7f65
|
Merge pull request #2438 from okriuchykhin/ok_SCI_4356
Improve loading of tasks statistics for dashboard [SCI-4356]
|
2020-02-28 16:38:39 +01:00 |
|
Oleksii Kriuchykhin
|
78ceb41a9e
|
Improve loading of tasks statistics for dashboard [SCI-4356]
|
2020-02-28 16:17:32 +01:00 |
|
aignatov-bio
|
c4be9bca2f
|
Fix files handling in results
|
2020-02-28 14:55:13 +01:00 |
|
aignatov-bio
|
6900d8384b
|
Merge pull request #2428 from aignatov-bio/ai-sci-4375-end-point-to-task-create
Service for task creating and quick start end point [SCI-4375]
|
2020-02-28 14:38:07 +01:00 |
|
aignatov-bio
|
0ae5e51cb3
|
Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create
|
2020-02-28 14:37:27 +01:00 |
|
aignatov-bio
|
95fca105eb
|
Add quickstart layout and create task modal
|
2020-02-28 14:34:34 +01:00 |
|
aignatov-bio
|
6dcb8be849
|
Merge branch 'develop' into ai-sci-4380-saving-navigation-state
|
2020-02-28 14:14:08 +01:00 |
|
aignatov-bio
|
8b273acaca
|
Update all sidebars
|
2020-02-28 14:03:08 +01:00 |
|
aignatov-bio
|
a0015fe184
|
Merge pull request #2432 from aignatov-bio/ai-sci-4304-fix-assigned-task-position
Fix assigned tasks position [SCI-4304]
|
2020-02-28 13:54:19 +01:00 |
|
aignatov-bio
|
4aaeb2043f
|
Merge pull request #2433 from aignatov-bio/ai-sci-4390-change-new-inventory-button-design
Change button style for new inventory [SCI-4390]
|
2020-02-28 13:54:07 +01:00 |
|
Miha Mencin
|
1fd876bb40
|
Merge pull request #2425 from mlorb/ml-sci-4348
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
|
2020-02-28 12:11:31 +01:00 |
|
Mojca Lorber
|
3c09923d96
|
Refactoring current tasks backend
|
2020-02-28 11:51:08 +01:00 |
|
Mojca Lorber
|
415721112a
|
Optimize completed_steps_percentage
|
2020-02-27 17:12:31 +01:00 |
|
Oleksii Kriuchykhin
|
b4a8a7ba72
|
Switch to serial multiple file uploads for better compatibility [SCI-4404]
|
2020-02-27 16:58:00 +01:00 |
|
aignatov-bio
|
9e15d1ea42
|
Refactor experiment sidebar
|
2020-02-27 16:04:44 +01:00 |
|
aignatov-bio
|
ace8613457
|
Fix z-index for dropdown
|
2020-02-27 13:16:11 +01:00 |
|
aignatov-bio
|
b2580c1704
|
Prevent create empty dropdown in inventories
|
2020-02-27 13:10:00 +01:00 |
|
aignatov-bio
|
630412c18a
|
Change button style for new inventory
|
2020-02-27 12:11:38 +01:00 |
|
aignatov-bio
|
d31fc33873
|
Fic assigned tasks position
|
2020-02-27 11:47:47 +01:00 |
|
Alex Kriuchykhin
|
bf1fac0b10
|
Merge pull request #2421 from aignatov-bio/ai-sci-4256-transparent-image-for-image-preview
Add checkboard background for transparent images [SCI-4256]
|
2020-02-26 17:46:48 +01:00 |
|
Alex Kriuchykhin
|
a41c1c606b
|
Merge pull request #2419 from aignatov-bio/ai-sci-4328-hide-tooltip-if-object-hide
Hide tooltip if parent object disabled or hidden [SCI-4328]
|
2020-02-26 17:35:34 +01:00 |
|
Alex Kriuchykhin
|
6841cdd6a6
|
Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items
New description to import items modal window [SCI-4365]
|
2020-02-26 17:34:57 +01:00 |
|
Alex Kriuchykhin
|
9917a547ce
|
Merge pull request #2417 from aignatov-bio/ai-sci-4364-add-border-to-add-column-button
Add border to add column button [SCI-4363]
|
2020-02-26 17:33:47 +01:00 |
|
Oleksii Kriuchykhin
|
62c19f7c02
|
Add invite users to the team permission check [SCI-4381]
|
2020-02-26 17:25:38 +01:00 |
|
Mojca Lorber
|
f29ce66bea
|
Refactor backend, add empty state and fix some small scc changes
|
2020-02-26 11:07:17 +01:00 |
|
aignatov-bio
|
8e05908753
|
Small fixes
|
2020-02-25 17:19:11 +01:00 |
|
aignatov-bio
|
294328887a
|
Fix typo
|
2020-02-25 13:51:54 +01:00 |
|
aignatov-bio
|
3588fb3445
|
Fix markup
|
2020-02-25 13:49:35 +01:00 |
|
aignatov-bio
|
32d6f9a43a
|
Split my_module create service to seperate services
|
2020-02-25 13:46:44 +01:00 |
|
aignatov-bio
|
a28d729aeb
|
Add end point
|
2020-02-24 17:09:10 +01:00 |
|
Oleksii Kriuchykhin
|
0cb9584a2b
|
Fix empty mime type for ActiveStorage local file service [SCI-4360]
|
2020-02-24 16:04:35 +01:00 |
|
aignatov-bio
|
a92bac19e1
|
Add service for task creating
|
2020-02-24 15:57:22 +01:00 |
|
aignatov-bio
|
5385a25665
|
Merge branch 'features/dashboard' into ai-sci-add-calendar-widget
|
2020-02-24 13:04:49 +01:00 |
|
aignatov-bio
|
0675b137ad
|
Add team and task status for calendars scope
|
2020-02-22 18:15:18 +01:00 |
|
aignatov-bio
|
b664c88819
|
Remove clndr from package.json
|
2020-02-22 13:03:51 +01:00 |
|
Oleksii Kriuchykhin
|
63e557ea9e
|
Add global repositories limit [SCI-4383]
|
2020-02-21 14:40:17 +01:00 |
|
Mojca Lorber
|
9bd2e8bec4
|
Dashboard current tasks visual layout and backend
|
2020-02-21 10:41:42 +01:00 |
|
aignatov-bio
|
3b679bc53d
|
Merge pull request #2416 from aignatov-bio/ai-sci-4349-progress-bar-research
Add progress bar for current tasks [SCI-4349]
|
2020-02-21 10:01:57 +01:00 |
|
aignatov-bio
|
2cbac634bf
|
Add localization
|
2020-02-21 10:00:32 +01:00 |
|
aignatov-bio
|
cf4dbd5ff4
|
Add calendar widget
|
2020-02-20 17:02:38 +01:00 |
|
aignatov-bio
|
01868fff23
|
Add calendar front-end
|
2020-02-19 15:57:06 +01:00 |
|
aignatov-bio
|
b87d6a22a7
|
Add checkboard background for transparent images
|
2020-02-19 10:48:31 +01:00 |
|
aignatov-bio
|
f11b051715
|
Merge branch 'develop' into features/dashboard
|
2020-02-19 10:29:50 +01:00 |
|
Alex Kriuchykhin
|
d73ea73b04
|
Merge pull request #2411 from okriuchykhin/ok_SCI_4319_v2
Fix unfolding of the active element in sidebar [SCI-4319]
|
2020-02-19 10:24:13 +01:00 |
|
aignatov-bio
|
47a86f2cf9
|
Hide tooltip if parent object disabled or hidden
|
2020-02-18 15:40:05 +01:00 |
|
Oleksii Kriuchykhin
|
9d0d75acc5
|
Add API endpoints for new column types [SCI-4276]
|
2020-02-18 15:13:46 +01:00 |
|
aignatov-bio
|
bbd48c9e08
|
Add border to add column button
|
2020-02-18 14:40:16 +01:00 |
|
aignatov-bio
|
5545d7da1a
|
Add progress bar for current tasks
|
2020-02-18 14:28:06 +01:00 |
|
aignatov-bio
|
5886f2cf90
|
New description to import items modal window
|
2020-02-18 12:13:52 +01:00 |
|
aignatov-bio
|
0117b577f4
|
Fix typo
|
2020-02-18 09:27:07 +01:00 |
|
aignatov-bio
|
ff45b17b53
|
Fix localization and small markup fixes
|
2020-02-17 15:32:43 +01:00 |
|
aignatov-bio
|
a438f6b4f0
|
Finished filters
|
2020-02-17 10:47:10 +01:00 |
|
aignatov-bio
|
485597a9ef
|
Add front-end part
|
2020-02-14 12:07:40 +01:00 |
|
mlorb
|
618aa698d5
|
Merge pull request #2407 from mlorb/ml-sci-4329
Fix adding too small/big number to input... [SCI-4329]
|
2020-02-14 10:40:20 +01:00 |
|
mlorb
|
9f23f11dca
|
Merge pull request #2410 from mlorb/ml-sci-4309
Hide pencil for shared inventory [SCI-4309]
|
2020-02-13 15:12:17 +01:00 |
|
aignatov-bio
|
95c9479f54
|
Add page title
|
2020-02-13 14:54:58 +01:00 |
|
aignatov-bio
|
a6186fba67
|
Change break limit
|
2020-02-13 14:44:59 +01:00 |
|
aignatov-bio
|
8e8f21969a
|
Fix markup
|
2020-02-13 13:55:25 +01:00 |
|
aignatov-bio
|
5c0a769f87
|
General dashboard layout
|
2020-02-13 13:50:29 +01:00 |
|
Oleksii Kriuchykhin
|
3959f880eb
|
Fix unfolding of the active element in sidebar [SCI-4319]
|
2020-02-13 12:16:35 +01:00 |
|
aignatov-bio
|
bdf4394d5f
|
Clean notifications partial from layouts
|
2020-02-13 09:52:45 +01:00 |
|
Mojca Lorber
|
6fbecf3e88
|
Hide pencil for shared inventory
|
2020-02-12 20:28:15 +01:00 |
|
aignatov-bio
|
0381fef05b
|
Move notifications to top navbar
|
2020-02-12 14:58:48 +01:00 |
|
aignatov-bio
|
d0fd956600
|
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number
Fix error in number column in repository [SCI-4347]
|
2020-02-12 14:16:46 +01:00 |
|
aignatov-bio
|
59f52c6cc5
|
Merge pull request #2405 from aignatov-bio/ai-sci-4002-remove-shared-inventories-with-view-permissions
Remove shared inventories with view permission from dropdown list [SCI-4002]
|
2020-02-12 14:16:33 +01:00 |
|
aignatov-bio
|
ddadc073d4
|
Merge pull request #2404 from aignatov-bio/ai-sci-4307-add-indetermined-state-for-share-inventory
Add "indetermined" state for the "select all" checkbox in the Share Inventories [SCI-4307]
|
2020-02-12 14:16:19 +01:00 |
|
aignatov-bio
|
5200096f69
|
Merge pull request #2400 from aignatov-bio/ai-sci-4312-improve-search-for-dropdown
Improve search input field in the flyouts [SCI-4312]
|
2020-02-12 14:16:06 +01:00 |
|
Mojca Lorber
|
0f67ce78c0
|
Fix adding too small/big number to input for decimals for number repo column type
|
2020-02-12 12:14:58 +01:00 |
|
aignatov-bio
|
00531066f8
|
Fix error in number column in repository
|
2020-02-12 11:55:10 +01:00 |
|
aignatov-bio
|
463b99195c
|
Remove shared inventories with view permission from dropdown list
|
2020-02-12 11:16:55 +01:00 |
|
aignatov-bio
|
4e4a2cf5ad
|
Add "indetermined" state for the "select all" checkbox in the Share Inventory modal
|
2020-02-12 10:37:29 +01:00 |
|
mlorb
|
a472eda699
|
Merge pull request #2403 from okriuchykhin/ok_SCI_4346
Fix multiple file result creation [SCI-4346]
|
2020-02-12 09:27:47 +01:00 |
|
mlorb
|
399f5411fc
|
Merge pull request #2401 from mlorb/ml-sci-4342
Fix console error at deleting inventory column [SCI-4342]
|
2020-02-12 09:26:15 +01:00 |
|
Miha Mencin
|
efe89a3e46
|
Merge pull request #2399 from okriuchykhin/ok_SCI_4336
Improve speed of inventory import [SCI-4336]
|
2020-02-12 09:23:22 +01:00 |
|
Oleksii Kriuchykhin
|
5be4ffb139
|
Fix multiple file result creation [SCI-4346]
|
2020-02-11 20:08:36 +01:00 |
|
mlorb
|
8a9d495b77
|
Merge pull request #2398 from mlorb/ml-sci-4147
Change repository name and team name to h2 [SCI-4147]
|
2020-02-11 16:27:03 +01:00 |
|
aignatov-bio
|
05f2fa8199
|
Merge pull request #2402 from aignatov-bio/ai-sci-4343-misaligned-filter
Fix protocols table CSS [SCI-4343]
|
2020-02-11 16:26:41 +01:00 |
|
Alex Kriuchykhin
|
de219688cc
|
Merge pull request #2397 from okriuchykhin/ok_SCI_4331
Fix edit button behavior in repository table [SCI-4331]
|
2020-02-11 16:13:39 +01:00 |
|
Oleksii Kriuchykhin
|
3310d79c4c
|
Fix failing tests [SCI-4336]
|
2020-02-11 16:12:53 +01:00 |
|
aignatov-bio
|
26783e64da
|
Fix protocols table CSS
|
2020-02-11 15:58:17 +01:00 |
|
Mojca Lorber
|
4c81e4b087
|
Fix console error at deleting inventory column
|
2020-02-11 15:27:11 +01:00 |
|
aignatov-bio
|
eaf751bad6
|
Improve search input field in the flyouts
|
2020-02-11 15:01:52 +01:00 |
|
Oleksii Kriuchykhin
|
0fec8f4d95
|
Improve speed of inventory import [SCI-4336]
|
2020-02-11 13:51:34 +01:00 |
|
Mojca Lorber
|
509e197f64
|
Change repository name and team name to h2
|
2020-02-11 13:18:33 +01:00 |
|
Oleksii Kriuchykhin
|
fe0ebae383
|
Fix edit button behaviour in repository table [SCI-4331]
|
2020-02-11 11:07:03 +01:00 |
|
Mojca Lorber
|
232209e64a
|
Set timeout for loading manage column index modal to load after datatable redraw
|
2020-02-10 15:29:34 +01:00 |
|
Mojca Lorber
|
7bcdc52de2
|
Fix share inventory button position
|
2020-02-10 13:13:18 +01:00 |
|
Alex Kriuchykhin
|
9c763f2111
|
Merge pull request #2383 from okriuchykhin/ok_SCI_4220
Extend inventory import to support new data types [SCI-4220]
|
2020-02-10 11:04:34 +01:00 |
|
Alex Kriuchykhin
|
446280a2e4
|
Merge pull request #2391 from okriuchykhin/ok_SCI_4330
Improve speed of global activities fetching query [SCI-4330]
|
2020-02-10 10:44:52 +01:00 |
|
Oleksii Kriuchykhin
|
f97577ec12
|
Remove byebug entry [SCI-4220]
|
2020-02-10 10:40:38 +01:00 |
|
mlorb
|
c1aa269afc
|
Merge pull request #2392 from mlorb/ml-sci-4313
Add empty option in dropdown selector [SCI-4313]
|
2020-02-10 10:32:03 +01:00 |
|
Alex Kriuchykhin
|
08140f23e5
|
Merge pull request #2393 from okriuchykhin/ok_SCI_4321
Fix file result only name update [SCI-4321]
|
2020-02-10 10:30:54 +01:00 |
|
Oleksii Kriuchykhin
|
4547e4d61a
|
Fix DateTime picker for repositories edit mode [SCI-4331]
|
2020-02-07 16:42:04 +01:00 |
|
Oleksii Kriuchykhin
|
49e1e67231
|
Fix JS condition [SCI-4321]
|
2020-02-07 15:54:57 +01:00 |
|
Oleksii Kriuchykhin
|
5470bb9b9b
|
Fix file result only name update [SCI-4321]
|
2020-02-07 15:21:50 +01:00 |
|
Mojca Lorber
|
e9e7b85e0b
|
Add empty option in dropdown selector
|
2020-02-07 14:57:07 +01:00 |
|
Alex Kriuchykhin
|
913f599b9f
|
Merge pull request #2389 from okriuchykhin/ok_SCI_4301
Add unsaved data notification when navigating away from the inventory [SCI-4301]
|
2020-02-07 13:58:20 +01:00 |
|
Alex Kriuchykhin
|
edaf7adbbb
|
Merge pull request #2387 from okriuchykhin/ok_SCI_4319
Fix sidebar current project expanding [SCI-4319]
|
2020-02-07 13:55:15 +01:00 |
|
Oleksii Kriuchykhin
|
6f8f89fbf0
|
Improve speed of global activities fetching query [SCI-4330]
|
2020-02-07 13:53:25 +01:00 |
|
mlorb
|
f26ea42cc5
|
Merge pull request #2390 from mlorb/ml-sci-4265-v2
Redesign clear buttons on global activities page [SCI-4265]
|
2020-02-07 13:49:00 +01:00 |
|
mlorb
|
e05b2c9ce2
|
Merge pull request #2368 from mlorb/ml-sci-4217
Fix css for icons for repository file type [SCI-4217]
|
2020-02-07 13:25:22 +01:00 |
|
Mojca Lorber
|
e41df37a2e
|
Small css fix after merging
|
2020-02-07 12:20:09 +01:00 |
|
Mojca Lorber
|
9068c20588
|
Redesign clear buttons on global activities page
|
2020-02-07 11:33:25 +01:00 |
|
mlorb
|
ba597acf8d
|
Merge branch 'develop' into ml-sci-4217
|
2020-02-07 09:43:53 +01:00 |
|
Oleksii Kriuchykhin
|
21bf59b943
|
Add unsaved data notification when navigating away from the inventory [SCI-4301]
|
2020-02-06 16:46:16 +01:00 |
|
Mojca Lorber
|
769089b555
|
Fix hound
|
2020-02-06 14:44:58 +01:00 |
|
Mojca Lorber
|
a22fe28d24
|
Refactor new and edit renderer for file cell
|
2020-02-06 14:43:17 +01:00 |
|
Mojca Lorber
|
ef241150f6
|
Fix edit tag on task page
|
2020-02-06 12:57:03 +01:00 |
|
Oleksii Kriuchykhin
|
b7455f6b85
|
Fix sidebar current project expanding [SCI-4319]
|
2020-02-05 21:29:12 +01:00 |
|
aignatov-bio
|
665c178d79
|
Merge pull request #2386 from biosistemika/ai-sci-4325-add-css-for-connected-accounts
Add connected account styling [SCI-4325]
|
2020-02-05 14:07:06 +01:00 |
|
aignatov-bio
|
f2539b052f
|
Add connected account styling
|
2020-02-05 13:25:45 +01:00 |
|
Oleksii Kriuchykhin
|
7d107bf45b
|
Fix tests [SCI-4317]
|
2020-02-05 11:58:27 +01:00 |
|
Oleksii Kriuchykhin
|
8c5637a19c
|
Add explicit ordering of items for repository columns [SCI-4317]
|
2020-02-05 11:11:06 +01:00 |
|
Mojca Lorber
|
2727614603
|
Clean up controllers for manage repository columns
|
2020-02-04 16:05:16 +01:00 |
|
mlorb
|
49bfb603c8
|
Merge pull request #2357 from mlorb/ml-sci-4130
Sidebar redesign [SCI-4130]
|
2020-02-04 09:55:00 +01:00 |
|
mlorb
|
415abf8968
|
Merge pull request #2382 from mlorb/ml-sci-4283
Implement missing style guide changes [SCI-4283]
|
2020-02-04 09:37:48 +01:00 |
|
Oleksii Kriuchykhin
|
632b54cb98
|
Merge branch 'develop' into ok_SCI_4220
|
2020-02-03 15:50:06 +01:00 |
|
Oleksii Kriuchykhin
|
d9cf2b57fd
|
Fix failing tests [SCI-4220]
|
2020-02-03 15:48:49 +01:00 |
|
Oleksii Kriuchykhin
|
b0c785f4fb
|
Extend inventory import to support new data types [SCI-4220]
|
2020-02-03 15:20:01 +01:00 |
|
mlorb
|
7ad3527338
|
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes
Visual fixes [SCI-4274]
|
2020-02-03 09:44:48 +01:00 |
|
Urban Rotnik
|
eea80f4a09
|
Remove JS call
|
2020-02-02 18:56:52 +01:00 |
|
Urban Rotnik
|
cd14fe01f7
|
Rename div
|
2020-02-02 18:52:40 +01:00 |
|
Mojca Lorber
|
e70bc67146
|
Implement missing style guide changes
|
2020-01-31 14:11:37 +01:00 |
|
aignatov-bio
|
c8cf47823b
|
Merge pull request #2381 from biosistemika/ai-sci-fix-repository-column-selector
FIx repository column selector
|
2020-01-30 15:15:27 +01:00 |
|
aignatov-bio
|
0ece6c60f0
|
FIx repository column selector
|
2020-01-30 15:09:47 +01:00 |
|
Urban Rotnik
|
a91ab508e3
|
Merge pull request #2367 from urbanrotnik/ur-sci-4167
Teams ordering fixed [SCI-4167]
|
2020-01-30 14:26:42 +01:00 |
|
Urban Rotnik
|
3db48c44f7
|
Add ordered scope
|
2020-01-30 13:47:14 +01:00 |
|
Urban Rotnik
|
1bb54d20cf
|
Teams ordering fixed
|
2020-01-30 13:46:04 +01:00 |
|
mlorb
|
0ef066f921
|
Merge pull request #2365 from mlorb/ml-sci-4252
Fix checklist list in inventory table [SCI-4252]
|
2020-01-30 13:44:02 +01:00 |
|
aignatov-bio
|
9a9088a0da
|
Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task
Fix duplicate tags and small css issues [SCI-4279]
|
2020-01-30 13:42:22 +01:00 |
|
aignatov-bio
|
44eccaaa12
|
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
|
2020-01-30 13:42:07 +01:00 |
|
mlorb
|
bfd928b8fc
|
Merge pull request #2373 from mlorb/ml-sci-4293
Fix buttons style [SCI-4293]
|
2020-01-30 13:40:37 +01:00 |
|
mlorb
|
a2afa11fef
|
Merge pull request #2378 from mlorb/ml-sci-4311
Fix scroll position on protocol and result page [SCI-4311]
|
2020-01-30 13:39:16 +01:00 |
|
Urban Rotnik
|
7813d3ab75
|
Merge pull request #2363 from urbanrotnik/ur-sci-4190
Make less opacity when editing or adding row [SCI-4190]
|
2020-01-30 13:24:20 +01:00 |
|
Urban Rotnik
|
0991a26ee8
|
Merge pull request #2351 from urbanrotnik/ur-sci-4211-fix-team-import
Fix import for old activities [SCI-4211]
|
2020-01-30 13:08:33 +01:00 |
|
Urban Rotnik
|
64a7657f19
|
Merge pull request #2364 from urbanrotnik/ur-sci-4219
Fix too long line problem[SCI-4219]
|
2020-01-30 13:07:01 +01:00 |
|
Urban Rotnik
|
2007524365
|
Merge pull request #2352 from urbanrotnik/ur-sci-4272-multiple-checklist-items-fix
Fix for items with newline [SCI-4272]
|
2020-01-30 13:05:41 +01:00 |
|
Urban Rotnik
|
d069173ad7
|
Merge pull request #2371 from urbanrotnik/ur-sci-4178
Fix attachments sorting [SCI-4178]
|
2020-01-30 11:29:45 +01:00 |
|
Urban Rotnik
|
15f0d41b14
|
Fix delimiter dropdown selection
|
2020-01-30 09:26:00 +01:00 |
|
aignatov-bio
|
2c595d01fc
|
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters
Small fixes
|
2020-01-29 15:48:19 +01:00 |
|
Urban Rotnik
|
db6f1ecebb
|
Set fixed width for preview dropdown
|
2020-01-29 15:11:42 +01:00 |
|
Urban Rotnik
|
67cbd47353
|
Fix icon after file editing
|
2020-01-29 14:56:03 +01:00 |
|
Mojca Lorber
|
9388883479
|
Fix scroll position on protocol and result page
|
2020-01-29 14:28:52 +01:00 |
|
Urban Rotnik
|
fc14bf05be
|
Merge pull request #2377 from biosistemika/master
Master >> Develop
|
2020-01-29 14:25:11 +01:00 |
|
Urban Rotnik
|
875515121b
|
Fix Share button in repositories
|
2020-01-29 14:15:47 +01:00 |
|
Urban Rotnik
|
765a577669
|
Ellipsis with css for Sidebar
|
2020-01-29 13:22:35 +01:00 |
|
aignatov-bio
|
970463f34d
|
Fix input fields
|
2020-01-29 11:41:47 +01:00 |
|
aignatov-bio
|
470f39ce04
|
Fix scrollbar
|
2020-01-29 11:14:25 +01:00 |
|
aignatov-bio
|
3c9bed4b56
|
Fix markup
|
2020-01-29 11:03:25 +01:00 |
|
aignatov-bio
|
4aa0a79c02
|
Fix resize repository
|
2020-01-29 11:00:48 +01:00 |
|
Urban Rotnik
|
6c7a88475e
|
Fix icon selection
|
2020-01-29 09:36:21 +01:00 |
|
Miha Mencin
|
94cce6d57e
|
Revert "Fix repository data time range column width [SCI-4306]"
|
2020-01-28 16:25:21 +01:00 |
|
Mojca Lorber
|
f502408e07
|
Fix buttons style
|
2020-01-28 15:30:57 +01:00 |
|
Mojca Lorber
|
1a834c206b
|
Fix repository data time range column width
|
2020-01-28 15:12:09 +01:00 |
|
Urban Rotnik
|
d974ff57e1
|
Fix attachments sorting
|
2020-01-28 15:01:20 +01:00 |
|
aignatov-bio
|
0ce52aae94
|
Add container for repository filters
|
2020-01-28 14:11:11 +01:00 |
|
aignatov-bio
|
cd9a89a586
|
Merge pull request #2356 from aignatov-bio/ai-sci-demodulize-column-name-in-datatable-helper
Demodulize column name in datatable helper
|
2020-01-28 13:42:04 +01:00 |
|
Urban Rotnik
|
13c9dd8cf6
|
Safe navigation for serializer value of RepositoryListItem
|
2020-01-28 13:38:37 +01:00 |
|
Mojca Lorber
|
b938c6ce35
|
Fix css for icons for repository file type
|
2020-01-28 11:32:48 +01:00 |
|
Urban Rotnik
|
6c50b514f3
|
Put Academy icon back, resize team switch
|
2020-01-27 17:15:22 +01:00 |
|
Urban Rotnik
|
83f4344bb7
|
Merge pull request #2366 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-27 16:35:07 +01:00 |
|
Mojca Lorber
|
e6043ee0e5
|
Fix checklist list in inventory table
|
2020-01-27 15:52:52 +01:00 |
|
Miha Mencin
|
7ec874596d
|
Merge pull request #2362 from biosistemika/SCI-4300-dropdowns-in-shared-inventories
SCI-4300 skip permission checks for list
|
2020-01-27 15:25:32 +01:00 |
|
Urban Rotnik
|
71a8a8655f
|
Remove Academy icon
|
2020-01-27 14:52:19 +01:00 |
|
Urban Rotnik
|
dc79174160
|
Make less opacity when editing or adding row
|
2020-01-27 14:39:45 +01:00 |
|
Miha Mencin
|
81023f8c69
|
SCI-4300 sckip permission checking for list
|
2020-01-27 14:27:46 +01:00 |
|
mlorb
|
f605c0def3
|
Merge pull request #2358 from mlorb/ml-sci-4275
Change to new style checkboxes on share inventory modal [SCI-4275]
|
2020-01-27 13:38:30 +01:00 |
|
Mojca Lorber
|
276df8c151
|
Fix Safari inventories bug
|
2020-01-27 10:20:49 +01:00 |
|
Urban Rotnik
|
d7761622ba
|
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-25 12:36:36 +01:00 |
|
Urban Rotnik
|
503c05805d
|
Move editable? method from helper to model
|
2020-01-25 09:43:05 +01:00 |
|
Urban Rotnik
|
0effb3ee69
|
Add translation for read-only items
|
2020-01-25 08:52:33 +01:00 |
|
Urban Rotnik
|
ec8af5f943
|
Add readonly repository rows records
|
2020-01-24 16:33:44 +01:00 |
|
Mojca Lorber
|
3af2f4af19
|
Change to new style checkboxes on share inventory modal
|
2020-01-24 15:43:13 +01:00 |
|
Mojca Lorber
|
9cf77e0551
|
Fix hound
|
2020-01-24 13:35:29 +01:00 |
|
Mojca Lorber
|
f5d245e7cc
|
Sidebar redesign
|
2020-01-24 13:22:04 +01:00 |
|
aignatov-bio
|
9524659e1d
|
Demodulize column name in datatable helper
|
2020-01-24 11:33:30 +01:00 |
|
aignatov-bio
|
24b296fd86
|
Fix duplicate tags and small css issues
|
2020-01-23 13:38:02 +01:00 |
|
aignatov-bio
|
4395a7cc6b
|
Fix small visual bugs
|
2020-01-23 13:12:58 +01:00 |
|
Urban Rotnik
|
8d7f51edde
|
Fix for items with newline
|
2020-01-22 13:15:29 +01:00 |
|
Urban Rotnik
|
0a2970c18d
|
Fix import for old activities
|
2020-01-22 12:24:56 +01:00 |
|
Mojca Lorber
|
658b64b617
|
Change button
|
2020-01-21 17:21:49 +01:00 |
|
aignatov-bio
|
79d71f1e9b
|
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
|
2020-01-21 16:33:05 +01:00 |
|
aignatov-bio
|
5a4d74d487
|
Update emoji picker image loading
|
2020-01-21 15:49:13 +01:00 |
|
Mojca Lorber
|
981f8678df
|
Fix alerts style
|
2020-01-21 15:21:40 +01:00 |
|
mlorb
|
ee609890ef
|
Merge pull request #2344 from mlorb/ml-sci-4138
Fix constants for email redesign [SCI-4138]
|
2020-01-21 15:02:26 +01:00 |
|
aignatov-bio
|
bf9c7a70d4
|
Improve event handling
|
2020-01-21 14:01:44 +01:00 |
|
Urban Rotnik
|
1ecea5216e
|
Add webpack libs for emojis and assets
|
2020-01-21 11:43:04 +01:00 |
|
aignatov-bio
|
6a67280f6a
|
Add new emoji picker
|
2020-01-21 10:50:55 +01:00 |
|
Alex Kriuchykhin
|
b0432fd10b
|
Merge pull request #2345 from urbanrotnik/ur-sci-4266-duplicate-spinner
Set spinner to the table [SCI-4266]
|
2020-01-21 10:43:45 +01:00 |
|
Urban Rotnik
|
74f38af54f
|
Set spinner to the table
|
2020-01-21 10:26:24 +01:00 |
|
Miha Mencin
|
0157794274
|
Merge pull request #2341 from biosistemika/SCI-4270-select-all-doesnt-work
SCI-4270 update selector
|
2020-01-21 09:43:40 +01:00 |
|
Mojca Lorber
|
404805bef5
|
Fix constants for email redesign
|
2020-01-21 09:38:08 +01:00 |
|
Urban Rotnik
|
ed77d95abd
|
Merge pull request #2343 from urbanrotnik/ur-sci-4262-disable-columns-editing-on-task-page
Hide new column button in modal [SCI-4262]
|
2020-01-21 09:25:21 +01:00 |
|
Miha Mencin
|
5b099cb147
|
Merge pull request #2334 from okriuchykhin/ok_SCI_4258
Switch input type to text for Numbers in repositories [SCI-4258]
|
2020-01-21 09:23:47 +01:00 |
|
Miha Mencin
|
96ed19ab22
|
Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding
Fix small css issues [SCI-4269]
|
2020-01-21 09:22:56 +01:00 |
|
Miha Mencin
|
ba4e06f7e6
|
make selector a bit more specific
make selector more specific
|
2020-01-21 09:19:21 +01:00 |
|
Urban Rotnik
|
42df748f87
|
Hide new column button in modal
|
2020-01-21 08:37:02 +01:00 |
|
aignatov-bio
|
e022f7a096
|
Fix small css issues
|
2020-01-20 15:48:51 +01:00 |
|
Miha Mencin
|
652b9014e1
|
SCI-4270 update selector
|
2020-01-20 15:37:04 +01:00 |
|
Miha Mencin
|
239abfee33
|
Merge pull request #2340 from biosistemika/SCI-4218-remove-tooltips
SCI-4218 prevent displaying tooltip on column type selection
|
2020-01-20 15:25:28 +01:00 |
|
aignatov-bio
|
01cce84314
|
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown
Update delimiter dropdown for manage column modal [SCI-4195]
|
2020-01-20 15:22:40 +01:00 |
|
Miha Mencin
|
ed7d275d9a
|
SCI-4218 prevent displaying tooltip on column type selection
|
2020-01-20 14:42:16 +01:00 |
|
mlorb
|
9747a72567
|
Merge pull request #2338 from mlorb/ml-sci-4132-v2
Change html structure for flash msg, change columns buttons [SCI-4132]
|
2020-01-20 14:36:33 +01:00 |
|
aignatov-bio
|
cd471bfb25
|
Update delimiter dropdown for manage column modal
|
2020-01-20 14:26:17 +01:00 |
|
Mojca Lorber
|
772118d246
|
change html structure for flash msg, change columns buttons
|
2020-01-20 14:02:42 +01:00 |
|
Urban Rotnik
|
c29aee081b
|
Merge pull request #2335 from urbanrotnik/ur-sci-4236
Use Jquery scroll [SCI-4236]
|
2020-01-20 10:59:04 +01:00 |
|
Urban Rotnik
|
fc29641c2b
|
Hide manage column action buttons on Task page
|
2020-01-17 17:29:26 +01:00 |
|
Urban Rotnik
|
f52a2ef5b8
|
Use Jquery scroll
|
2020-01-17 16:23:24 +01:00 |
|
Oleksii Kriuchykhin
|
fa0bff93ff
|
Switch input type to text for Numbers in repositories [SCI-4258]
|
2020-01-17 16:04:19 +01:00 |
|
aignatov-bio
|
e4e2e08456
|
Merge pull request #2325 from aignatov-bio/ai-sci-4239-2-fix-smartannotation-position
Fix smart annotation position [SCI-4239]
|
2020-01-17 14:39:54 +01:00 |
|
Miha Mencin
|
a9add011d9
|
Merge pull request #2333 from biosistemika/SCI-4260-fix-the-visibility-of-the-buttons-2
[SCI-4260] Fix the manage buttons visibility after columns reordering
|
2020-01-17 14:34:32 +01:00 |
|
Miha Mencin
|
58db10ce7f
|
Merge pull request #2331 from urbanrotnik/ur-sci-4240-status-items-error-message
Add error message for status item [SCI-4240]
|
2020-01-17 14:07:42 +01:00 |
|
Miha Mencin
|
61ead41271
|
Merge pull request #2332 from urbanrotnik/ur-sci-4193-item-error-handling
item error handling [SCI-4193] FIX
|
2020-01-17 14:07:19 +01:00 |
|
Miha Mencin
|
88210bd812
|
applying the patch
|
2020-01-17 14:04:25 +01:00 |
|
mlorb
|
f91db8eb41
|
Merge pull request #2329 from mlorb/ml-sci-4132
Redesign flash alerts [SCI-4132]
|
2020-01-17 13:58:20 +01:00 |
|
aignatov-bio
|
597c88cacc
|
Fix smart annotation position
|
2020-01-17 13:55:43 +01:00 |
|
Urban Rotnik
|
58ed1d3f8a
|
Update default delimiter for new records
|
2020-01-17 12:14:50 +01:00 |
|
Urban Rotnik
|
6bf08a9f3d
|
Update counter visability
|
2020-01-17 11:59:46 +01:00 |
|
Urban Rotnik
|
7b50dd7b53
|
Merge pull request #2330 from urbanrotnik/ur-sci-4236
Add timeout to scroll efect fix
|
2020-01-17 11:26:39 +01:00 |
|
Urban Rotnik
|
2e8db12ca5
|
Add error message for status item
|
2020-01-17 11:25:01 +01:00 |
|
Mojca Lorber
|
8b635ac38a
|
Refactor flash alerts
|
2020-01-17 10:49:41 +01:00 |
|
Urban Rotnik
|
0437383132
|
Add timeout to scroll efect
|
2020-01-17 10:40:18 +01:00 |
|
Mojca Lorber
|
36ecfbf7bf
|
Redesign flash alerts
|
2020-01-16 19:08:14 +01:00 |
|
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 |
|
Alex Kriuchykhin
|
e3e36d40a7
|
Merge pull request #2322 from okriuchykhin/ok_SCI_4251
Fix global search for repositories and checklists update [SCI-4251]
|
2020-01-16 16:37:12 +01:00 |
|
Alex Kriuchykhin
|
b482783f64
|
Merge pull request #2324 from okriuchykhin/ok_SCI_4204_v2
Fix cloning of date time values [SCI-4204]
|
2020-01-16 16:35:10 +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 |
|
Oleksii Kriuchykhin
|
7d8ba7cb32
|
Fix clonning of date time values [SCI-4204]
|
2020-01-16 16:03:13 +01:00 |
|
Urban Rotnik
|
7655dd0bea
|
Merge pull request #2321 from urbanrotnik/ur-sci-4257
Remove Checklist item min length validation and modal fixes [SCI-4257]
|
2020-01-16 16:02:30 +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 |
|
Oleksii Kriuchykhin
|
8c2b1e5037
|
Fix global search for repositories and checklists update [SCI-4251]
|
2020-01-16 15:30:19 +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 |
|
Urban Rotnik
|
af082f530a
|
Merge pull request #2319 from urbanrotnik/ur-sci-4253-report-docx-fix
Add custom method for repository report JSON data [SCI-4253]
|
2020-01-16 15:22:58 +01:00 |
|
Urban Rotnik
|
469714c40d
|
Remove Checklist item min length validation and modal fixes
|
2020-01-16 15:21:01 +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
|
507443ba38
|
Add custom method for repository report JSON data
|
2020-01-16 14:42:26 +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
|
509451daae
|
Fix table header size
|
2020-01-16 11:26:23 +01:00 |
|
aignatov-bio
|
cafc10f569
|
Fix datetime picker
|
2020-01-16 11:10:51 +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 |
|
Alex Kriuchykhin
|
c5ccfc1bb7
|
Merge pull request #2316 from okriuchykhin/ok_SCI_4243
Fix logo and flash messages in sign_in_halt layout [SCI-4243]
|
2020-01-16 10:20:46 +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 |
|
Oleksii Kriuchykhin
|
168ba9d1c6
|
Fix logo and flash messages in sign_in_halt layout [SCI-4243]
|
2020-01-15 18:04:07 +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 |
|
Miha Mencin
|
ac4154bd85
|
SCI-4210 fix css
|
2020-01-15 17:09:13 +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
|
7134eb2bc4
|
fixing spacing
|
2020-01-15 14:03:42 +01:00 |
|
Miha Mencin
|
8c77058179
|
fixing indentation
|
2020-01-15 14:02:33 +01:00 |
|
Miha Mencin
|
5bfa5c7939
|
SCI-4199 disabling delimiter, adding warning
|
2020-01-15 13:59:28 +01:00 |
|
aignatov-bio
|
778264713f
|
Fix pagination and update css
|
2020-01-15 13:55:11 +01:00 |
|
Alex Kriuchykhin
|
da26d8a018
|
Merge pull request #2304 from okriuchykhin/ok_SCI_4204
Refactor repository cell cloning to support all data types [SCI-4204]
|
2020-01-15 13:04:50 +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 |
|
Alex Kriuchykhin
|
9412cccc9c
|
Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update
Fix for list items update
|
2020-01-15 12:34:33 +01:00 |
|
Oleksii Kriuchykhin
|
470f6ff541
|
Unifify view and edit modes for number cells [SCI-4233]
|
2020-01-15 12:16:17 +01:00 |
|
Urban Rotnik
|
97954b3930
|
fixup! Fix list item update
|
2020-01-15 11:28:31 +01:00 |
|
Urban Rotnik
|
a23b2eab78
|
Fix list item update
|
2020-01-15 11:24:50 +01:00 |
|
Oleksii Kriuchykhin
|
9e8bd23616
|
Merge latest branch 'develop' into ok_SCI_3988
|
2020-01-15 10:52:20 +01:00 |
|
aignatov-bio
|
2a83c6bae2
|
Update hidden field for time cell
|
2020-01-15 09:48:18 +01:00 |
|
Urban Rotnik
|
6d55b07fdc
|
Merge branch 'develop' into ai-sci-4128-change-datatable-headers-colors
|
2020-01-15 09:10:43 +01:00 |
|
Urban Rotnik
|
2c86c2263d
|
Merge pull request #2298 from urbanrotnik/ur-sci-4230-cannot-create-checklist
Fix empty checklist and dropdown column creation [SCI-4230]
|
2020-01-15 09:09:17 +01:00 |
|
Urban Rotnik
|
2fd76d7f47
|
Merge pull request #2305 from urbanrotnik/ur-sci-4234-old-column-drop
Add rescue block for setting default repository state [SCI-4234]
|
2020-01-15 08:43:15 +01:00 |
|
Urban Rotnik
|
bcce8235cc
|
Add rescue block for setting default repository state
|
2020-01-14 23:49:02 +01:00 |
|
Oleksii Kriuchykhin
|
eed68a2590
|
Refactor repository cell clonning to support all data types [SCI-4204]
|
2020-01-14 16:55:10 +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 |
|
Urban Rotnik
|
75c7cb7aa8
|
Keep circles for task page
|
2020-01-14 13:31:44 +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 |
|
Urban Rotnik
|
1cf793127a
|
Update cell color
|
2020-01-14 09:24:42 +01:00 |
|
Urban Rotnik
|
2468b67de0
|
Assign column update
|
2020-01-14 09:02:30 +01:00 |
|
Alex Kriuchykhin
|
4ca2981177
|
Merge pull request #2299 from okriuchykhin/ok_SCI_4224
Fix repository filtering and improve speed [SCI-4224]
|
2020-01-13 17:57:11 +01:00 |
|
Oleksii Kriuchykhin
|
01b8d2226d
|
Optimize repository table counters [SCI-4224]
|
2020-01-13 16:31:42 +01:00 |
|
Oleksii Kriuchykhin
|
7b82e33eb6
|
Fix repository filtering and improve speed [SCI-4224]
|
2020-01-13 16:09:07 +01:00 |
|
Urban Rotnik
|
0a3359e815
|
Fix empty checklist and dropdown column creation
|
2020-01-13 15:48:55 +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 |
|
aignatov-bio
|
7ac1b45aaa
|
Merge pull request #2295 from aignatov-bio/ai-sci-fix-const-in-repository-show
Fix const in repository show view
|
2020-01-13 10:39:54 +01:00 |
|
aignatov-bio
|
6f78901d4e
|
Merge pull request #2294 from aignatov-bio/ai-sci-4124-fix-flash-message
Fix flash message for datetime column [SCI-4124]
|
2020-01-13 10:24:35 +01:00 |
|
aignatov-bio
|
bdbb3712e6
|
Merge pull request #2293 from aignatov-bio/ai-sci-4223-add-smart-annotations-to-text-fields
Add smart annotations to repository text value [SCI-4223]
|
2020-01-13 10:24:22 +01:00 |
|
Alex Kriuchykhin
|
67b1bf4611
|
Merge pull request #2286 from urbanrotnik/ur-sci-4161-v2
Fix for numeric item in SQL array [SCI-4161]
|
2020-01-13 10:15:48 +01:00 |
|
aignatov-bio
|
189bf5762e
|
Fix const in repository show view
|
2020-01-13 10:13:33 +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
|
bdb970b8d4
|
Fix flash message for datetime column
|
2020-01-10 13:22:29 +01:00 |
|
aignatov-bio
|
9ede0ef716
|
Fix big number in repository number value
|
2020-01-10 13:00:14 +01:00 |
|
aignatov-bio
|
d5675c0c33
|
Add smart annotations to repository text value
|
2020-01-10 12:56:57 +01:00 |
|
Urban Rotnik
|
92f432b86a
|
Merge pull request #2285 from urbanrotnik/ur-sci-4154-export-and-import
Export/Import for new column types [SCI-4153]
|
2020-01-10 11:31:23 +01:00 |
|
Oleksii Kriuchykhin
|
4799e6a1eb
|
Fix failing tests [ok_SCI_4197]
|
2020-01-10 11:09:47 +01:00 |
|
Urban Rotnik
|
9296f0eb4f
|
Add extra format for exports
|
2020-01-10 11:09:30 +01:00 |
|
Urban Rotnik
|
824e116cfa
|
Add presence validation for STI type on DateTime column types
|
2020-01-10 11:09:30 +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 |
|
Urban Rotnik
|
728823ed65
|
fixup! Fix for numeric item in SQL array
|
2020-01-10 09:46:25 +01:00 |
|
Oleksii Kriuchykhin
|
ad5a5f3ebf
|
Fix sorting for date time columns [SCI-4197]
|
2020-01-09 16:18:28 +01:00 |
|
aignatov-bio
|
f494a97f99
|
Merge pull request #2290 from aignatov-bio/ai-sci-4200-fix-error-on-opening-inventory
Fix error on opening inventory [SCI-4200]
|
2020-01-09 16:00:12 +01:00 |
|
aignatov-bio
|
8a647ee003
|
Fix error on opening inventory
|
2020-01-09 15:32:28 +01:00 |
|
aignatov-bio
|
38eaf19dde
|
Prevent editing 2 items
|
2020-01-09 15:19:04 +01:00 |
|
Alex Kriuchykhin
|
9e58b2a759
|
Merge pull request #2283 from okriuchykhin/ok_SCI_4212
Fix repository status item deletion issue [SCI-4212]
|
2020-01-09 15:06:17 +01:00 |
|
Alex Kriuchykhin
|
9ab07af87b
|
Merge pull request #2282 from okriuchykhin/ok_SCI_4149
Disable comment edit mode if comment is not editable [SCI-4149]
|
2020-01-09 15:06: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 |
|
Urban Rotnik
|
39593b6342
|
Fix for numeric item in SQL array
|
2020-01-09 11:24:38 +01:00 |
|
Oleksii Kriuchykhin
|
2ec27e54f3
|
Fix repository status item deletion issue [SCI-4212]
|
2020-01-08 17:32:07 +01:00 |
|
Oleksii Kriuchykhin
|
2faab14444
|
Fix repository table state updates after column creation/deletion [SCI-4196]
|
2020-01-08 16:16:54 +01:00 |
|
Oleksii Kriuchykhin
|
1624f9d5ab
|
Disable comment edit mode if comment is not editable [SCI-4149]
|
2020-01-08 12:32:59 +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
|
5953c2543d
|
Fix typo and boostrap load order
|
2020-01-08 12:07:33 +01:00 |
|
Oleksii Kriuchykhin
|
522ae12f08
|
Merge branch 'develop' into ok_SCI_3988
|
2020-01-07 17:07:22 +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 |
|
Alex Kriuchykhin
|
1e665804ab
|
Merge pull request #2280 from aignatov-bio/ai-sci-4155-add-new-invetories-to-team-export
Add new column types to team export/import [SCI-4155]
|
2020-01-07 15:47:09 +01:00 |
|
Alex Kriuchykhin
|
1de5e0a47b
|
Merge pull request #2264 from aignatov-bio/ai-sci-4157-add-new-columns-support-for-report
Add helper for repository tables in docx report [SCI-4157]
|
2020-01-07 15:33:12 +01:00 |
|
Oleksii Kriuchykhin
|
1b902ff4b3
|
Merge branch 'develop' into ok_SCI_3988
|
2020-01-07 15:26:30 +01:00 |
|
Oleksii Kriuchykhin
|
4df8779b19
|
Fix experiment template exporter [SCI-3988]
|
2020-01-07 15:26:21 +01:00 |
|
aignatov-bio
|
a69e587706
|
Change cells loading in report repository helper
|
2020-01-07 14:21:55 +01:00 |
|
aignatov-bio
|
10b7aad732
|
Add ned column types to team export/import
|
2020-01-07 14:12:48 +01:00 |
|
Alex Kriuchykhin
|
71cb4bf6f6
|
Merge pull request #2266 from okriuchykhin/ok_SCI_4145
Fix issue with clone & move task to another experiment [SCI-4145]
|
2020-01-06 17:02:27 +01:00 |
|
Oleksii Kriuchykhin
|
16b591b110
|
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-06 16:07:23 +01:00 |
|
aignatov-bio
|
c3c070c11a
|
Update checklist formatted value
|
2020-01-06 13:03:05 +01:00 |
|
aignatov-bio
|
83f8df2012
|
Rebase branch and fix checklist formatted
|
2020-01-06 12:40:09 +01:00 |
|
aignatov-bio
|
4895f41238
|
Add helper for repository tables in docx report
|
2020-01-06 12:40:09 +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
|
18a8be43f5
|
Add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
d93095b489
|
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 |
|
aignatov-bio
|
aba3baf685
|
Fix colors
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
3f38b1e6a1
|
Add text input fields
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
443ab8645f
|
Add toggles
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
7bfefd8659
|
Add checkboxes and radio buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
9694117635
|
Add new colors and buttons
|
2020-01-06 10:40:20 +01:00 |
|
Urban Rotnik
|
c15bcf0769
|
Add search support for numeric
|
2020-01-06 10:12:11 +01:00 |
|
Urban Rotnik
|
87288d0771
|
Add search for statuses
|
2020-01-06 10:12:08 +01:00 |
|
aignatov-bio
|
3bd44dc5ab
|
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model
Refactor checklist column data structure [SCI-4168]
|
2019-12-24 11:12:36 +01:00 |
|
Urban Rotnik
|
356ba6572d
|
Fix naming
|
2019-12-24 08:13:30 +01:00 |
|
aignatov-bio
|
210292de07
|
Leave string_agg only for checklists
|
2019-12-23 21:36:56 +01:00 |
|
Urban Rotnik
|
c286334c1d
|
UpdateRepositoryRowService fix
|
2019-12-23 14:53:51 +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 |
|
aignatov-bio
|
725bb449d5
|
Fix naming
|
2019-12-23 09:20:36 +01:00 |
|
Miha Mencin
|
882ec711fe
|
Merge pull request #2276 from biosistemika/master
Master
|
2019-12-20 17:39:46 +01:00 |
|
Urban Rotnik
|
79b7d63116
|
JS fix
|
2019-12-20 16:14:39 +01:00 |
|
aignatov-bio
|
54800cb69b
|
Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model
|
2019-12-20 15:46:39 +01:00 |
|
aignatov-bio
|
16c4879e56
|
Merge migrations and update sorting
|
2019-12-20 15:42:54 +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
|
f3bc6386c3
|
Fix partials renderer
|
2019-12-20 14:59:26 +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 |
|
Urban Rotnik
|
7c71159303
|
Add Inputmask to webpack
|
2019-12-20 14:50:44 +01:00 |
|
Oleksii Kriuchykhin
|
b945171f2f
|
Fix creation of new tasks on canvas [SCI-4171]
|
2019-12-19 15:48:25 +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
|
ac8aa88b88
|
Fix RepositoryTextValueSerializer [SCI-4166]
|
2019-12-18 16:37:21 +01:00 |
|
aignatov-bio
|
dc91893d7e
|
Refactor checklist column data structure
|
2019-12-18 14:10:41 +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 |
|
Mojca Lorber
|
46e7de0c25
|
Add new button style
|
2019-12-18 09:57:39 +01:00 |
|
Miha Mencin
|
b67911c81a
|
Merge branch 'SCI-4058-disable-inventory-delition-for-normal-user' into release/1.17.9
|
2019-12-17 14:48:50 +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 |
|
Alex Kriuchykhin
|
792e6f2eb9
|
Merge pull request #2263 from okriuchykhin/ok_SCI_4142
Implement SSO with Azure AD [SCI-4142]
|
2019-12-12 16:12:40 +01:00 |
|
Oleksii Kriuchykhin
|
0094528a02
|
Improve connected accounts unlinking [SCI-4142]
|
2019-12-12 14:57:27 +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 |
|
Oleksii Kriuchykhin
|
1aa334fdaa
|
Merge branch 'develop' into release-1-17-8
|
2019-12-11 10:55:00 +01:00 |
|
Oleksii Kriuchykhin
|
ff4ef818fb
|
Implement SSO with Azure AD [SCI-4142]
|
2019-12-10 17:24:53 +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
|
d35f7119b7
|
Moved delete action to service
|
2019-12-10 14:29:37 +01:00 |
|
Urban Rotnik
|
5345cf0342
|
Updated date and time comparison
|
2019-12-10 14:29:36 +01:00 |
|
Urban Rotnik
|
5055490a23
|
Refactor asset value methods
|
2019-12-10 14:29:36 +01:00 |
|
Urban Rotnik
|
82b93bf9a4
|
Fix failing tests
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
508a9b4e3e
|
RepositoryRows controller refactor
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
b68aadf506
|
Update params nesting
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
dd9880f030
|
Add CreateRepositoryRowService
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
98b89e9e80
|
Add UpdateRepositoryRowService
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
0c990ef8cf
|
Add functions for creating new cells with values
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
5b710241e1
|
Add delete condition to update_data method on CellValues
|
2019-12-10 14:29:33 +01:00 |
|
Urban Rotnik
|
79a50860b6
|
Add methods update_data, data_changed, formatted for all types off ColumnValues
|
2019-12-10 14:29:29 +01:00 |
|
Mojca Lorber
|
a3a5b21951
|
small fixes
|
2019-12-10 12:02:08 +01:00 |
|
mlorb
|
1122fe2d2f
|
Merge branch 'features/new-column-types' into ml-sci-4029
|
2019-12-10 10:54:41 +01:00 |
|
aignatov-bio
|
5ba8e6507e
|
Merge branch 'release-1-17-8' into ai-sci-fix-comment-error
|
2019-12-10 10:36:30 +01:00 |
|
Alex Kriuchykhin
|
2e15548680
|
Merge pull request #2245 from okriuchykhin/ok_SCI_4107
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-10 10:35:09 +01:00 |
|
Urban Rotnik
|
c6a3c41019
|
Fix routes in dropdown
|
2019-12-10 10:13:41 +01:00 |
|
Urban Rotnik
|
e764e856d8
|
Fix syntax error
|
2019-12-10 09:40:40 +01:00 |
|
Mojca Lorber
|
8503dd7007
|
Add numeric repository column type
|
2019-12-09 16:38:21 +01:00 |
|
Alex Kriuchykhin
|
7a97f813b2
|
Merge pull request #2252 from biosistemika/SCI-4109-export-with-assigned-item-bugfix
SCI-4109 fix the file copying
|
2019-12-09 16:04:43 +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
|
643abc3fd7
|
Fixes 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
|
eca0c84bbd
|
Fix tests
|
2019-12-06 14:20:37 +01:00 |
|
aignatov-bio
|
63edd3e877
|
Remove edit initialization from view mode
|
2019-12-06 13:26:47 +01:00 |
|
Urban Rotnik
|
e934e08c17
|
Implement STI for DateTimeValue types
|
2019-12-06 12:50:19 +01:00 |
|
Urban Rotnik
|
06d87cb4b6
|
Add I18n to serializers
|
2019-12-06 11:39:10 +01:00 |
|
Urban Rotnik
|
7661a24a44
|
Remove scope for before_action
|
2019-12-06 11:15:17 +01:00 |
|
Urban Rotnik
|
2c0a6ed085
|
Remove current_user vars
|
2019-12-06 11:12:07 +01:00 |
|
Urban Rotnik
|
64c6159354
|
Update require JS
|
2019-12-06 10:39:21 +01:00 |
|
Oleksii Kriuchykhin
|
7a89cae56f
|
Fix TinyMCE images and avatars for export all [SCI-4107]
|
2019-12-05 13:27:17 +01:00 |
|
Oleksii Kriuchykhin
|
03667f619f
|
Merge branch 'release-1-17-7' into develop
|
2019-12-05 13:03:39 +01:00 |
|
aignatov-bio
|
29f4b6fe79
|
Merge pull request #2248 from aignatov-bio/ai-sci-4125-search-doesnt-find-file-content
Fix file post process method [SCI-4125]
|
2019-12-05 12:48:03 +01:00 |
|
aignatov-bio
|
9fe6e7b538
|
Fix markup
|
2019-12-05 11:27:52 +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
|
6c057a86c9
|
Update git version
|
2019-12-03 13:31:13 +01:00 |
|
aignatov-bio
|
42dac51241
|
Fix markup
|
2019-12-03 10:38:21 +01:00 |
|
aignatov-bio
|
be87d50bfa
|
Remove YOMU serrver
|
2019-12-03 10:35:54 +01:00 |
|
aignatov-bio
|
d5f9604e1c
|
Fix file post process method
|
2019-12-03 10:17:47 +01:00 |
|
Miha Mencin
|
8caa88fc7e
|
Merge branch 'release-1-17-7' of github.com:biosistemika/scinote-web into release-1-17-7
|
2019-12-03 09:10:55 +01:00 |
|
Miha Mencin
|
80579043b2
|
Merge branch 'SCI-4108-bug-at-report-generation' into release-1-17-7
|
2019-12-03 09:10:09 +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
|
f148ae8b24
|
Merge pull request #2242 from aignatov-bio/ai-sci-4136-fix-smart-annotation-on-autosave
Fix smart annotation for autosave [SCI-4136]
|
2019-12-03 09:09:16 +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 |
|
aignatov-bio
|
43ff9f6f26
|
Fix experiment copy
|
2019-12-02 15:34: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 |
|
Alex Kriuchykhin
|
fbf1a5b6e2
|
Merge pull request #2239 from okriuchykhin/ok_SCI_4098
Refactor Azure configuration and connected accounts [SCI-4098]
|
2019-11-29 11:30:33 +01:00 |
|
Urban Rotnik
|
5f2407e3fb
|
Add view renders for DateTime column types
|
2019-11-29 10:50:14 +01:00 |
|
Urban Rotnik
|
cac4c11071
|
Typo fix
|
2019-11-29 10:19:57 +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
|
cb0fe049f0
|
Remove range method from model
|
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
|
f39af1916f
|
Split DateTime and DateTimeRange column types, rename DateType table
|
2019-11-29 10:19:16 +01:00 |
|
Urban Rotnik
|
f30664a7b3
|
Add inverse_of option
|
2019-11-29 10:19:15 +01:00 |
|
Urban Rotnik
|
aee806edaa
|
Add methods for repository_date_time_value
|
2019-11-29 10:19:14 +01:00 |
|
Urban Rotnik
|
2a20ad68a3
|
Add range column to RepositoryColumn
|
2019-11-29 10:19:14 +01:00 |
|
Urban Rotnik
|
fe4aa12ced
|
Add DateTime columns CRUD endpoints
|
2019-11-29 10:19:14 +01:00 |
|
Urban Rotnik
|
b591346a3f
|
Add DateTime type column
|
2019-11-29 10:19:13 +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
|
804e36650e
|
Add service for updating ListColumnItems
|
2019-11-29 10:19:09 +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 |
|
Urban Rotnik
|
1e8261ac2a
|
Update InventoryColumns API for new Status Type
|
2019-11-29 10:19:07 +01:00 |
|
Urban Rotnik
|
7ab12baef9
|
Add API endpoint for StatusItems
|
2019-11-29 10:19:07 +01:00 |
|
Oleksii Kriuchykhin
|
7efcf5abcf
|
Cleanup updateButtons method [SCI-4070]
|
2019-11-29 10:19:07 +01:00 |
|
Oleksii Kriuchykhin
|
371f699a11
|
Fix AR preloading for repository table [SCI-4070]
|
2019-11-29 10:19:06 +01:00 |
|
Oleksii Kriuchykhin
|
3481b50796
|
Fix column reordering for repositories [SCI-4070]
|
2019-11-29 10:19:06 +01:00 |
|
Oleksii Kriuchykhin
|
220c3f8eeb
|
Fix repository columns default state [SCI-4070]
|
2019-11-29 10:19:05 +01:00 |
|
Oleksii Kriuchykhin
|
73be1181ac
|
Fix failing tests for repository states [SCI-4070]
|
2019-11-29 10:19:05 +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
|
0f3c138a7e
|
Fix markup
|
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
|
bcb8cc1840
|
Remove byebug
|
2019-11-29 10:17:54 +01:00 |
|
Mojca Lorber
|
305104f639
|
Refactor text inventory type
|
2019-11-29 10:17:53 +01:00 |
|
Urban Rotnik
|
37b7d5aa64
|
Use values from extends
|
2019-11-29 10:17:52 +01:00 |
|
Urban Rotnik
|
f645ff52ab
|
Refactor ColumnServices
|
2019-11-29 10:17:52 +01:00 |
|
Urban Rotnik
|
28d7a4f284
|
Refactor FileColumnController
|
2019-11-29 10:17:51 +01:00 |
|
Urban Rotnik
|
1720623665
|
Refactor RepositoryListColumn controller
|
2019-11-29 10:17:50 +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
|
482deafdd3
|
Rename partial
|
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 |
|
Urban Rotnik
|
43e81c46b7
|
Rename CreateColumnService to ColumnService
|
2019-11-29 10:16:46 +01:00 |
|
Urban Rotnik
|
5923e8897a
|
Remove commented code
|
2019-11-29 10:16:46 +01:00 |
|
Urban Rotnik
|
b55966487e
|
Remove permission helper
|
2019-11-29 10:16:46 +01:00 |
|
Urban Rotnik
|
4cb3d1b6f0
|
Add BaseColumnsController for column_types controllers
|
2019-11-29 10:16:45 +01:00 |
|
Urban Rotnik
|
14b43d516e
|
Add UpdateStatusColumnService service
|
2019-11-29 10:16:45 +01:00 |
|
Urban Rotnik
|
de2ee66dd4
|
Add DeleteStatusColumnService service
|
2019-11-29 10:16:44 +01:00 |
|
Urban Rotnik
|
5930bdd794
|
Add StatusColumnsController
|
2019-11-29 10:16:44 +01:00 |
|
Urban Rotnik
|
bbb8c46fe2
|
Add CreateStatusColumnService service
|
2019-11-29 10:16:44 +01:00 |
|
Urban Rotnik
|
c00a837105
|
Add models for RepositoryStatus column type
|
2019-11-29 10:16:43 +01:00 |
|
Mojca Lorber
|
dda5ffe4f9
|
Add create repository column service
|
2019-11-29 10:16:43 +01:00 |
|
aignatov-bio
|
70d721bb99
|
Add text method for assets
|
2019-11-29 10:16:42 +01:00 |
|
aignatov-bio
|
2ed3054c89
|
Make repository value render more flexible
|
2019-11-29 10:16:42 +01:00 |
|
Oleksii Kriuchykhin
|
6c7f45fc20
|
Add simplified view for sign-in form [SCI-4098]
|
2019-11-28 17:00:43 +01:00 |
|
aignatov-bio
|
e07fad72b6
|
Merge pull request #2235 from aignatov-bio/ai-sci-4116-update-filter-logic-for-activities
Update filter logic for activities [SCI-4116]
|
2019-11-28 14:58:53 +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
|
a87cc3ae98
|
Merge pull request #2237 from aignatov-bio/ai-sci-4114-fix-task-and-protocol-description-activities
Add task description and task protocol description activities [SCI-4114]
|
2019-11-28 14:54:20 +01:00 |
|
aignatov-bio
|
4f5fada41f
|
Merge pull request #2236 from aignatov-bio/ai-sci-4117-ui-activities-fixes
UI activtiies fixes [SCI-4117]
|
2019-11-28 14:54:07 +01:00 |
|
aignatov-bio
|
990d8e1c3a
|
Merge pull request #2218 from aignatov-bio/ai-sci-4088-remove-rte-from-team-description
Replace RTE with simple textarea [SCI-4088]
|
2019-11-28 14:45:06 +01:00 |
|
Miha Mencin
|
13191f1a72
|
Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user
Sci 4058 disable inventory delition for normal user
|
2019-11-28 14:31:32 +01:00 |
|
Oleksii Kriuchykhin
|
f5abb7c767
|
Add connected accounts section to settings [SCI-4106]
|
2019-11-27 23:16:25 +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
|
68284c10da
|
Add task description and task protocol description activities
|
2019-11-27 14:37:53 +01:00 |
|
aignatov-bio
|
a87fc24251
|
UI activtiies fixes
|
2019-11-27 14:04:59 +01:00 |
|
aignatov-bio
|
3d9351c537
|
Update filter logic for activities
|
2019-11-27 13:13:19 +01:00 |
|
aignatov-bio
|
3322676373
|
Replace RTE with simple textarea
|
2019-11-27 12:37:33 +01:00 |
|
aignatov-bio
|
75f29d7b04
|
Fix tag edit mode
|
2019-11-27 12:34:54 +01:00 |
|
Oleksii Kriuchykhin
|
6b20a10473
|
Refactor Azure configuration [SCI-4098]
|
2019-11-26 15:09:40 +01:00 |
|
Alex Kriuchykhin
|
111056a032
|
Merge pull request #2224 from okriuchykhin/ok_SCI_4112
Fix adding experiment contents to report [SCI-4112]
|
2019-11-26 09:50:28 +01:00 |
|
Miha Mencin
|
a328c4ad56
|
fix CR comments
|
2019-11-25 17:40:29 +01:00 |
|
Miha Mencin
|
d74cad3b8c
|
Merge pull request #2231 from biosistemika/SCI-4108-bug-at-report-generation
SCI-4108 Docx report error because of checklist does not have any item
|
2019-11-25 17:33:20 +01:00 |
|
Miha Mencin
|
b968de96c7
|
Merge pull request #2232 from biosistemika/SCI-4109-export-with-assigned-item-bugfix
SCI-4109 fix the file copying
|
2019-11-25 17:32:34 +01:00 |
|
aignatov-bio
|
8f2eaaacf9
|
Merge pull request #2229 from aignatov-bio/ai-sci-4111-fix-css-on-activity-page
Update css for global activities page [SCI-4111]
|
2019-11-25 14:08:33 +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
|
d732b2f1a6
|
Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags
Add strict order to module tags in modal [SCI-4090]
|
2019-11-25 13:55:33 +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 |
|
Miha Mencin
|
48fc7708f8
|
SCI-4109 fix the file copying
|
2019-11-25 13:38:16 +01:00 |
|
Miha Mencin
|
72c158d3e2
|
SCI-4108 check if there are any checklist items before rendering the checklist
|
2019-11-25 11:55:02 +01:00 |
|
aignatov-bio
|
179dea085f
|
Fix dropdown event after click browser back action
|
2019-11-25 11:28:11 +01:00 |
|
aignatov-bio
|
e99fe2dbda
|
Update css for global activties page
|
2019-11-25 11:09:37 +01:00 |
|
Miha Mencin
|
e65e344c39
|
fix styling
|
2019-11-25 10:45:21 +01:00 |
|
aignatov-bio
|
5100ab4d08
|
Add strict order to module tags in modal
|
2019-11-25 10:15:06 +01:00 |
|
Miha Mencin
|
bd34435b39
|
fixing style issues
|
2019-11-25 08:44:33 +01:00 |
|
aignatov-bio
|
fae8b252a6
|
Fix markup
|
2019-11-24 21:11:32 +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 |
|
Oleksii Kriuchykhin
|
8f94c85b7a
|
Fix adding experimaent contents to report [SCI-4112]
|
2019-11-22 14:57:59 +01:00 |
|
Miha Mencin
|
1bf6663196
|
check the permissions in before action
|
2019-11-22 13:23:02 +01:00 |
|
aignatov-bio
|
96523ae131
|
Update CSS for team preferences and enable autosave
|
2019-11-22 10:46:44 +01:00 |
|
aignatov-bio
|
2e30f50ae8
|
Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields
Add autosave for protocol keywords, user preferences and due date [SCI-3976]
|
2019-11-21 13:13:10 +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 |
|
Miha Mencin
|
04a6645cfc
|
Separate view/edit/modify permissions SCI-4058
|
2019-11-20 17:12:47 +01:00 |
|
aignatov-bio
|
56ae32323c
|
Add autosave for protocol keywords and user preferences
|
2019-11-20 14:57:53 +01:00 |
|
Oleksii Kriuchykhin
|
46ee43ea8b
|
Improve handling of file links for local storage [SCI-4071]
|
2019-11-19 15:35:31 +01:00 |
|
Oleksii Kriuchykhin
|
5e8afae1f0
|
Fix failing tests [SCI-3988]
|
2019-11-18 15:15:44 +01:00 |
|
Urban Rotnik
|
0dc1daa7c6
|
Add gem Down, File size validation before and during download
|
2019-11-18 14:28:19 +01:00 |
|
Oleksii Kriuchykhin
|
244c003137
|
Prettify template JSON files [SCI-3988]
|
2019-11-18 14:26:38 +01:00 |
|
Oleksii Kriuchykhin
|
b2862b6c9e
|
Remove Paperclip DB columns and fix experiment templates [SCI-3988]
|
2019-11-18 14:16:28 +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 |
|
aignatov-bio
|
5964a1b1f4
|
Fix shadows
|
2019-11-18 13:59:54 +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
|
163a17d6d9
|
Fix tablet view
|
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
|
b1f9e7f1ca
|
Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field
* Fix tests
|
2019-11-18 13:59:54 +01:00 |
|
Urban Rotnik
|
dcfca76602
|
Update method 'update_canvas' to work with new DB constraint
|
2019-11-18 11:11:41 +01:00 |
|
Urban Rotnik
|
b8bf7bbd9b
|
Rename validation
|
2019-11-18 11:11:40 +01:00 |
|
Urban Rotnik
|
43e3763ec8
|
Update x, y, experiment unqiue validation
[SCI-3887]
|
2019-11-18 11:11:40 +01:00 |
|
Urban Rotnik
|
5e97116c5a
|
Update results params
|
2019-11-18 11:11:39 +01:00 |
|
Urban Rotnik
|
8b5e346770
|
Remove file deletion manually
|
2019-11-18 11:11:39 +01:00 |
|
Urban Rotnik
|
cc9d987321
|
Add update result(file) and create result(file) API endpoint
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
060125a1c4
|
Add file size validation
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
1be88baab1
|
Add API endpoint for Attachments resource
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
e7083e188c
|
Add API endpoint for Step resource
[SCI-3835]
|
2019-11-18 11:11:37 +01:00 |
|
Urban Rotnik
|
24033bec7a
|
Add API endpoint for Task creation
|
2019-11-18 11:11:37 +01:00 |
|
Urban Rotnik
|
7802d5ee8b
|
Add uniq validation for x and y position scoped to experiment
|
2019-11-18 11:11:36 +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
|
a5666cacc5
|
Fix markup
|
2019-11-15 16:28:08 +01:00 |
|
aignatov-bio
|
b9a34fa809
|
Fix placeholder for authors
|
2019-11-15 16:23:48 +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
|
b979435b35
|
Merge pull request #2199 from aignatov-bio/ai-sci-4055-fix-eln-export-for-files-without-extension
Fix eln export for file without extension [SCI-4055]
|
2019-11-15 14:16:07 +01:00 |
|
Alex Kriuchykhin
|
d1a324401e
|
Merge pull request #2210 from biosistemika/release_1_17_6
Master << Release 1.17.6
|
2019-11-14 11:46:51 +01:00 |
|
aignatov-bio
|
1488f75e26
|
Add activities
|
2019-11-13 13:57:04 +01:00 |
|
Alex Kriuchykhin
|
8b665d4f1c
|
Merge pull request #2193 from okriuchykhin/ok_SCI_4028
Fix reports in team importer [SCI-4028]
|
2019-11-13 13:10:15 +01:00 |
|
aignatov-bio
|
19f5f9de67
|
Disable autocomplete for textarea field
|
2019-11-12 14:44:33 +01:00 |
|
aignatov-bio
|
a356c290ea
|
Fix markup
|
2019-11-12 11:32:43 +01:00 |
|
aignatov-bio
|
4a8eb041cb
|
Fix markup
|
2019-11-12 11:31:26 +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 |
|
aignatov-bio
|
938ea259cc
|
Merge pull request #2195 from aignatov-bio/ai-sci-4051-fix-team-import-for-avatars
Fix team import for user with avatars [SCI-4051]
|
2019-11-07 13:02:30 +01:00 |
|
Oleksii Kriuchykhin
|
b646295698
|
Fix service_url for local storage [SCI-4057]
|
2019-11-06 15:21:56 +01:00 |
|
aignatov-bio
|
e4a39bbbe4
|
Add check for files
|
2019-11-06 14:41:51 +01:00 |
|
aignatov-bio
|
0c5ce90895
|
Fix eln export for file without extension
|
2019-11-06 09:53:44 +01:00 |
|
Alex Kriuchykhin
|
522d236e10
|
Merge pull request #2198 from okriuchykhin/ok_SCI_4053
Fix TinyMCE images in protocol cloning [SCI-4053]
|
2019-11-05 18:15:22 +01:00 |
|
Oleksii Kriuchykhin
|
b2eda231a0
|
Fix TinyMCE images in protocol clonning [SCI-4053]
|
2019-11-05 18:13:44 +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 |
|
aignatov-bio
|
b56a997aef
|
Fix team import for user with avatars
|
2019-11-04 14:53:59 +01:00 |
|
Mojca Lorber
|
16eddc0ad0
|
Save on click away, inline editing
|
2019-11-03 14:59:30 +01:00 |
|
Alex Kriuchykhin
|
ec66ab8654
|
Merge pull request #2190 from mlorb/ml-sci-4023
Small improvements in the avatar settings [SCI-4023]
|
2019-10-30 16:02:24 +01:00 |
|
Oleksii Kriuchykhin
|
1e748f2d7e
|
Fix reports in team importer [SCI-4028]
|
2019-10-30 15:47:11 +01:00 |
|
Mojca Lorber
|
a3ded83292
|
Small css change
|
2019-10-30 15:42:11 +01:00 |
|
Mojca Lorber
|
7b86a3932a
|
Additional avatar small fixes
|
2019-10-30 15:23:14 +01:00 |
|
Alex Kriuchykhin
|
2e4f444f63
|
Merge pull request #2191 from okriuchykhin/ok_SCI_4047
Fix LinkedIn sign-up [SCI-4047]
|
2019-10-29 16:29:13 +01:00 |
|
Oleksii Kriuchykhin
|
ab691efdb2
|
Fix LinkedIn sign-up [SCI-4047]
|
2019-10-29 16:20:19 +01:00 |
|
aignatov-bio
|
717b70f75b
|
Merge pull request #2171 from aignatov-bio/ai-sci-3995-fix-avatar-comments-and-activties
Fix avatars in comments and activities [SCI-3995]
|
2019-10-29 14:11:39 +01:00 |
|
Mojca Lorber
|
a0873cb16d
|
Small improvements in the avatar settings
|
2019-10-29 13:21:22 +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 |
|
Urban Rotnik
|
a7d351dc38
|
Add file size check
|
2019-10-22 14:13:22 +02:00 |
|
Alex Kriuchykhin
|
e333e7c44a
|
Merge pull request #2173 from biosistemika/release_1_17_4
Merge release 1.17.4 to master
|
2019-10-22 13:21:02 +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
|
9950a23188
|
Replace base64 avatars with url
|
2019-10-22 12:27:13 +02:00 |
|
Urban Rotnik
|
0119533e75
|
Fix for file generation
|
2019-10-22 11:02:59 +02:00 |
|
aignatov-bio
|
4d3e318174
|
Add check for existing elements
|
2019-10-22 10:46:16 +02:00 |
|
aignatov-bio
|
aaf76c0526
|
Fix avatars in comments and activities
|
2019-10-22 09:54:36 +02:00 |
|
Urban Rotnik
|
ce9f1b1309
|
Add mceToken check
|
2019-10-22 08:28:35 +02:00 |
|
Oleksii Kriuchykhin
|
6c57f56bf4
|
Fix issue with empty cells for xlsx inventory imports [SCI-4003]
|
2019-10-21 12:06:45 +02:00 |
|
Oleksii Kriuchykhin
|
4cba412e31
|
Fix protocols table select all checkbox [SCI-3999]
|
2019-10-17 17:05:01 +02:00 |
|
Alex Kriuchykhin
|
34f9e6265c
|
Merge pull request #2162 from okriuchykhin/ok_SCI_3990
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 17:03:11 +02:00 |
|
Miha Mencin
|
0af8629f98
|
SCI-3994 fix for excel import
|
2019-10-17 14:37:11 +02:00 |
|
Oleksii Kriuchykhin
|
53402c9ce1
|
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 13:30:14 +02:00 |
|
Mojca Lorber
|
b78211e3ca
|
Fix reloading of datatables header again
|
2019-10-16 13:02:41 +02:00 |
|
Oleksii Kriuchykhin
|
f3a6c18a84
|
Improve permission checking for reports [SCI-3991]
|
2019-10-14 14:50:05 +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 |
|
Oleksii Kriuchykhin
|
8f52b362d6
|
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
|
2019-10-11 11:46:51 +02:00 |
|
Alex Kriuchykhin
|
f6da6814b8
|
Merge pull request #2154 from okriuchykhin/ok_SCI_3977
Generate previews for newly created office files once asset is saved [SCI-3977]
|
2019-10-10 15:43:02 +02:00 |
|
Oleksii Kriuchykhin
|
07b037f05b
|
Generate previews for newly created office files once asset is saved [SCI-3977]
|
2019-10-10 15:40:50 +02:00 |
|
Alex Kriuchykhin
|
48171f7e02
|
Merge pull request #2153 from okriuchykhin/ok_SCI_3977
Fix previews for newly created office files [SCI-3977]
|
2019-10-10 15:11:24 +02:00 |
|
Oleksii Kriuchykhin
|
0b4f72e517
|
Fix previews for newly created office files [SCI-3977]
|
2019-10-10 14:25:19 +02:00 |
|
aignatov-bio
|
9d59d56818
|
Generate all preview for assets at same time
|
2019-10-10 14:17:02 +02:00 |
|
Miha Mencin
|
e2b5989c14
|
Revert "Handle missing experiment previews [SCI-3949]"
|
2019-10-09 16:42:15 +02:00 |
|
Alex Kriuchykhin
|
71aa8e646e
|
Merge pull request #2147 from okriuchykhin/ok_SCI_3949
Handle missing experiment previews [SCI-3949]
|
2019-10-09 16:27:16 +02:00 |
|
Oleksii Kriuchykhin
|
00921a5f6a
|
Hadle missing experiment previews [SCI-3949]
|
2019-10-09 16:24:21 +02:00 |
|
Miha Mencin
|
8e98c82bbf
|
SCI-3979 removing accessors
|
2019-10-09 15:49:49 +02:00 |
|
Miha Mencin
|
6d71036d07
|
Remove paperclip attribute accessors
|
2019-10-09 10:20:00 +02:00 |
|
Miha Mencin
|
78fd5df0f6
|
Revert "Fix report in academia"
|
2019-10-09 10:16:39 +02:00 |
|
Miha Mencin
|
37e6604f8b
|
Merge pull request #2136 from biosistemika/SCI-3975-team-export
Sci 3975 team export
|
2019-10-08 21:47:08 +02:00 |
|
Miha Mencin
|
fa871bf56e
|
Merge branch 'SCI-3975-team-export' of github.com:biosistemika/scinote-web into SCI-3975-team-export
|
2019-10-08 21:42:13 +02:00 |
|
Miha Mencin
|
f12c29bd2a
|
fixing import
|
2019-10-08 21:40:44 +02:00 |
|
aignatov-bio
|
5eed152403
|
Revert "Force save office file"
|
2019-10-08 21:34:16 +02:00 |
|
aignatov-bio
|
0d88466894
|
Merge pull request #2139 from aignatov-bio/ai-sci-fix-office-save
Force save office file
|
2019-10-08 21:11:33 +02:00 |
|
aignatov-bio
|
236ce30254
|
Force save office file
|
2019-10-08 21:10:18 +02:00 |
|
aignatov-bio
|
4a5db36c07
|
Merge pull request #2138 from aignatov-bio/ai-sci-fix-report-in-academia
Fix report in academia
|
2019-10-08 20:19:48 +02:00 |
|
aignatov-bio
|
5d80c51996
|
Fix report in academia
|
2019-10-08 20:18:51 +02:00 |
|
aignatov-bio
|
65ab3c421a
|
Merge pull request #2137 from aignatov-bio/ai-sci-fix-async-request-for-multiple-result
Fix async assets results
|
2019-10-08 19:52:04 +02:00 |
|
aignatov-bio
|
a930f7affd
|
Fix async assets results
|
2019-10-08 19:51:03 +02:00 |
|
Miha Mencin
|
c673c3960f
|
removin uneeded stuff left there by supidity
|
2019-10-08 17:23:46 +02:00 |
|
Miha Mencin
|
4f290cacfc
|
remove the unneeded require
|
2019-10-08 16:22:48 +02:00 |
|
Miha Mencin
|
de89a97e0a
|
Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-3975-team-export
|
2019-10-08 16:20:40 +02:00 |
|
Miha Mencin
|
5f16926280
|
SCI-3976 different approach to file download
|
2019-10-08 16:20:16 +02:00 |
|
Alex Kriuchykhin
|
f82d02b5d0
|
Merge pull request #2134 from okriuchykhin/ok_SCI_3960
Fix team deletion script [SCI-3960]
|
2019-10-08 13:35:07 +02:00 |
|
Alex Kriuchykhin
|
6306691cfe
|
Merge pull request #2133 from okriuchykhin/ok_SCI_3959
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
|
2019-10-08 13:34:57 +02:00 |
|
Oleksii Kriuchykhin
|
6908a5c3a3
|
Fix team deletion script [SCI-3960]
|
2019-10-08 12:04:47 +02:00 |
|
Oleksii Kriuchykhin
|
3d9c2282f3
|
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
|
2019-10-08 10:42:55 +02:00 |
|
aignatov-bio
|
f9497e2e3e
|
Fix TinyMCE import from ELN
|
2019-10-07 16:21:11 +02:00 |
|
Alex Kriuchykhin
|
39a2669eef
|
Merge pull request #2129 from okriuchykhin/ok_SCI_3950
Improve missing files handling when clonning TinyMceAsset [SCI-3950]
|
2019-10-07 09:18:45 +02:00 |
|
Oleksii Kriuchykhin
|
a2d70afeca
|
Improve missing files handling when clonning TinyMceAsset [SCI-3950]
|
2019-10-04 15:59:22 +02:00 |
|
mlorb
|
ba8ee86c9f
|
Merge pull request #2128 from mlorb/ml-sci-3966
Fix position of shared inventory icon [SCI-3966]
|
2019-10-04 15:21:48 +02:00 |
|
aignatov-bio
|
002686ba23
|
Merge pull request #2127 from aignatov-bio/ai-sci-3965-fix-complete-button-position
Fix complete button position [SCI-3965]
|
2019-10-04 15:19:27 +02:00 |
|
Mojca Lorber
|
564321d327
|
Fix position of shared inventory icon
|
2019-10-04 15:18:17 +02:00 |
|
aignatov-bio
|
b460cd4384
|
Fix complete button position
|
2019-10-04 15:17:28 +02:00 |
|
Urban Rotnik
|
037bba9a16
|
Merge pull request #2126 from urbanrotnik/ur-sci-3738-new-ste-default-field-selection
Fix focus for RTE [SCI-3738]
|
2019-10-04 15:02:55 +02:00 |
|
Urban Rotnik
|
bd1c5e4454
|
Fix focus for RTE
|
2019-10-04 14:55:14 +02:00 |
|
mlorb
|
9e1339fb18
|
Merge pull request #2124 from aignatov-bio/ai-sci-3961-fix-image-in-archive-experiments
Fix image in archived experiments [SCI-3961]
|
2019-10-04 14:52:55 +02:00 |
|
aignatov-bio
|
23581059e7
|
Remove image
|
2019-10-04 14:50:27 +02:00 |
|
Urban Rotnik
|
c296760be8
|
Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file
Add team_id when asset is creating [SCI-3962]
|
2019-10-04 14:46:18 +02:00 |
|
Alex Kriuchykhin
|
076d61d4d0
|
Merge pull request #2116 from okriuchykhin/ok_SCI_3908
Remove Paperclip from the codebase [SCI-3908]
|
2019-10-04 14:45:42 +02:00 |
|
Urban Rotnik
|
8f0c3bd2ce
|
Add team_id when asset is creating
|
2019-10-04 14:24:19 +02:00 |
|
aignatov-bio
|
a7b13a4a70
|
Fix image in archived experiments
|
2019-10-04 13:29:42 +02:00 |
|
Oleksii Kriuchykhin
|
9d2ac4179e
|
Fix failing tests [SCI-3908]
|
2019-10-04 13:02:18 +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 |
|
Urban Rotnik
|
c69e47de40
|
Merge pull request #2121 from okriuchykhin/ok_SCI_3950
Skip missing files when cloning TinyMceAsset [SCI-3950]
|
2019-10-04 09:17:02 +02:00 |
|
aignatov-bio
|
9e7eff9615
|
Merge pull request #2120 from aignatov-bio/ai-sci-3946-remove-image-icon-from-preview
Remove image icon from preview [SCI-3946]
|
2019-10-04 09:16:47 +02:00 |
|
aignatov-bio
|
c2c8343c57
|
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search
Fix MarvinJS representation in global search [SCI-3943]
|
2019-10-04 09:16:34 +02:00 |
|
aignatov-bio
|
af69e12d1e
|
Disable autosave notification feature
|
2019-10-04 09:13:42 +02:00 |
|
Urban Rotnik
|
09e6545f30
|
Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage
Fix for disk storage [SCI-3947]
|
2019-10-03 16:28:09 +02:00 |
|
aignatov-bio
|
0cbc699c62
|
Remove image icon from preview
|
2019-10-03 15:44:03 +02:00 |
|
Oleksii Kriuchykhin
|
bab228e1df
|
Skip missing files when clonning TinyMceAsset [SCI-3950]
|
2019-10-03 15:43:39 +02:00 |
|
Urban Rotnik
|
81d66ceedd
|
Add CustomDisk Service for ActiveStorage
|
2019-10-03 13:16:15 +02:00 |
|
aignatov-bio
|
afecc3fd0e
|
Merge pull request #2119 from aignatov-bio/ai-sci-fix-marvin-js-preview
Fix marvin JS preview
|
2019-10-03 11:59:19 +02:00 |
|
aignatov-bio
|
a31c5ea1f5
|
Fix marvin JS preview
|
2019-10-03 11:54:26 +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 |
|
Urban Rotnik
|
9c88327a16
|
Rename ActiveStorage base controller
|
2019-10-03 11:00:59 +02:00 |
|
aignatov-bio
|
301b37cccd
|
Fix duplicate code in file preview
|
2019-10-03 10:55:54 +02:00 |
|
Oleksii Kriuchykhin
|
260fcd6e89
|
Remove Paperclip from codebase [SCI-3908]
|
2019-10-02 19:45:14 +02:00 |
|
Urban Rotnik
|
e2a779ccfe
|
Activestorage fix for disk storage
[SCI-3947]
|
2019-10-02 14:01:38 +02:00 |
|
Alex Kriuchykhin
|
ed6e5e244e
|
Merge pull request #2112 from okriuchykhin/ok_SCI_3938
Improve file processing indicator [SCI-3938]
|
2019-10-02 11:01:49 +02:00 |
|
Alex Kriuchykhin
|
2c3c690713
|
Merge pull request #2113 from okriuchykhin/ok_SCI_3839
Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]
|
2019-10-02 10:39:35 +02:00 |
|
Urban Rotnik
|
4b626ab2dd
|
Merge pull request #2103 from urbanrotnik/ur-sci-3936-permission-issue
Add permission check for button show [SCI-3936]
|
2019-10-02 09:51:53 +02:00 |
|
Oleksii Kriuchykhin
|
dd7f2fe095
|
Fix large preview for documents [SCI-3938]
|
2019-10-01 16:14:28 +02:00 |
|
Oleksii Kriuchykhin
|
efe5d8a6ea
|
Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]
|
2019-10-01 15:49:37 +02:00 |
|
Oleksii Kriuchykhin
|
6a6a43f5ff
|
Improve file processing indicator [SCI-3938]
|
2019-10-01 15:20:46 +02:00 |
|
aignatov-bio
|
835410a3d8
|
Merge pull request #2107 from aignatov-bio/ai-sci-3941-fix-docx-report-for-active-storage
Fix docx report for active storage [SCI-3941]
|
2019-10-01 14:54:29 +02:00 |
|
aignatov-bio
|
675d5eb088
|
Fix MarvinJS representation in global search
|
2019-10-01 14:20:20 +02:00 |
|
Alex Kriuchykhin
|
b5769ee66c
|
Merge pull request #2100 from okriuchykhin/ok_SCI_3935
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
|
2019-10-01 13:45:26 +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 |
|
Oleksii Kriuchykhin
|
46bcc0e78e
|
Fix cloning of TinyMCE images in protocol description [SCI-3935][SCI-3926][SCI-3934]
|
2019-10-01 13:38:09 +02:00 |
|
Oleksii Kriuchykhin
|
584f2d07c0
|
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
|
2019-10-01 13:06:01 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Anton Ignatov
|
b382eb607b
|
Fix docx report for active storage
|
2019-10-01 10:26:24 +02:00 |
|
aignatov-bio
|
91cc054096
|
Merge pull request #2105 from aignatov-bio/ai-sci-fix-tests-for-import-repository-row
Fix tests for repository row importer
|
2019-09-30 16:47:17 +02:00 |
|
Anton Ignatov
|
99005cf22e
|
Fix tests for repository row importer
|
2019-09-30 16:27:45 +02:00 |
|
Anton Ignatov
|
859c5931a4
|
Update MArvinJS asset on result text cancel
|
2019-09-30 16:09:43 +02:00 |
|
Jure Grabnar
|
9f704559ef
|
Fix hound formatting issues
|
2019-09-30 14:42:15 +02:00 |
|
Jure Grabnar
|
096228abbb
|
Shorten padding format in scss
|
2019-09-30 14:32:09 +02:00 |
|
Urban Rotnik
|
5812ebe4d5
|
Add permission check for button show
SCI-3936
|
2019-09-30 14:30:03 +02:00 |
|
Jure Grabnar
|
070c307721
|
Implement style changes suggested by Anton
|
2019-09-30 14:27:00 +02:00 |
|
Urban Rotnik
|
9397705033
|
Fix positions of CoSign and Unlock buttons
|
2019-09-30 13:39:23 +02:00 |
|
Urban Rotnik
|
b13c429d26
|
SystemNotifications count position fixed
|
2019-09-30 13:12:35 +02:00 |
|
Urban Rotnik
|
dfafd4767c
|
Fix Protocol buttons group
[SCI-3929]
|
2019-09-30 11:51:37 +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 |
|
Jure Grabnar
|
e24541ae51
|
Merge pull request #2087 from jbargu/jg_sci_3870
[SCI-3870] Change/fix asset locking mechanism
|
2019-09-30 08:48:39 +02:00 |
|
Jure Grabnar
|
0a3389f310
|
Fix operator for removing the lock on asset
|
2019-09-30 08:46:16 +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 |
|
Miha Mencin
|
db36f379bb
|
Merge pull request #2097 from aignatov-bio/ai-sci-3930-fix-preview-for-result
Fix preview for result [SCI-3930]
|
2019-09-27 10:48:59 +02:00 |
|
Miha Mencin
|
0e75ea2e3e
|
Merge pull request #2096 from aignatov-bio/ai-sci-3932-fix-tiny-mce-render-in-report
Fix tinymce assets render in report [SCI-3932]
|
2019-09-27 10:48:10 +02:00 |
|
Miha Mencin
|
56b196f9b4
|
Merge pull request #2091 from aignatov-bio/ai-sci-3907-fix-cancel-button-for-tiny-mce
Fix cancel button for marvinJS images [SCI-3907]
|
2019-09-27 10:46:38 +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 |
|
Jure Grabnar
|
0c24210f6a
|
[SCI-3784] Small RTF improvements (#2061)
[SCI-3784] Small RTF improvements
|
2019-09-27 10:27:57 +02:00 |
|
mlorb
|
e3b0e149b6
|
Merge pull request #2077 from mlorb/ml-sci-3764
Expand clickable area of links in secondary navigation [SCI-3764]
|
2019-09-27 10:15:12 +02:00 |
|
mlorb
|
495d57b607
|
Merge pull request #2078 from mlorb/ml-sci-3906
Fix bug with inventory navigation height [SCI-3906]
|
2019-09-27 10:14:25 +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
|
93363da4e5
|
Fix preview for result
|
2019-09-26 16:49:56 +02:00 |
|
Anton Ignatov
|
40a8c6a1cc
|
Markup fix
|
2019-09-26 16:29:26 +02:00 |
|
Anton Ignatov
|
1f02fb4bc7
|
Fix tinymce assets render in report
|
2019-09-26 16:27:22 +02:00 |
|
Jure Grabnar
|
668f902570
|
Fix export all with active storage
Close SCI-3924
|
2019-09-26 16:01:30 +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 |
|
Anton Ignatov
|
305e9dc109
|
Fix error handling and rubocop error
|
2019-09-25 13:45:34 +02:00 |
|
Jure Grabnar
|
5cb900370a
|
Change/fix asset locking mechanism
Close SCI-3870
|
2019-09-25 11:07:53 +02:00 |
|
aignatov-bio
|
429de4f115
|
Merge pull request #2083 from aignatov-bio/ai-sci-3904-fix-padding-for-marvinjs-promo-modal
Fix padding for marvinjs modal [SCI-3904]
|
2019-09-24 14:26:18 +02:00 |
|
aignatov-bio
|
856e876b61
|
Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy
Fix error on task copy [SCI-3900]
|
2019-09-24 14:16:38 +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
|
e01c438055
|
Fix padding for marvinjs modal
|
2019-09-24 11:02:15 +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
|
646107a35b
|
Fix error on task copy
|
2019-09-23 16:33:57 +02:00 |
|
Mojca Lorber
|
a85c80d994
|
Fix bug with inventory navigation height
|
2019-09-23 16:12:41 +02:00 |
|
Mojca Lorber
|
9f30e05594
|
Expand clickable area of links in secondary navigation
|
2019-09-23 14:34:48 +02:00 |
|
Anton Ignatov
|
09e3b7c80b
|
Fix repository row import/export
|
2019-09-23 13:33:02 +02:00 |
|
Jure Grabnar
|
8780e5183b
|
Remove CSRF check in WopiController
|
2019-09-19 15:55:29 +02:00 |
|
Jure Grabnar
|
cc561d8ee5
|
Change wopi_controller using Paperclip for reading
|
2019-09-19 15:03:13 +02:00 |
|
Alex Kriuchykhin
|
29ffe05442
|
Merge pull request #1964 from okriuchykhin/ok_SCI_3643
Add text extraction from MarvinJS for search [SCI-3643]
|
2019-09-18 16:22:11 +02:00 |
|
aignatov-bio
|
d783391290
|
Merge pull request #2071 from aignatov-bio/ai-sci-3889-fix-error-on-archived-experiment-page
Fix error on archived experiment page [SCI-3889]
|
2019-09-18 15:35:53 +02:00 |
|
aignatov-bio
|
7951ae4218
|
Merge pull request #2070 from aignatov-bio/ai-sci-3874-error-handling-when-image-unavalialbe-for-base64
Error handling, when image unavaliable for base64 [SCI-3874]
|
2019-09-18 15:27:49 +02:00 |
|
Anton Ignatov
|
5a1efb84c6
|
Fix error on archived experiment page
|
2019-09-18 15:23:45 +02:00 |
|
Anton Ignatov
|
69eb8681bd
|
Error handling, when image unavaliable for base64
|
2019-09-18 15:11:51 +02:00 |
|
Mojca Lorber
|
4263edf0cc
|
Fix inventory item selection when previewing file
|
2019-09-18 15:08:40 +02:00 |
|
aignatov-bio
|
fba030dc9d
|
Merge pull request #2067 from aignatov-bio/ai-sci-3880-fix-error-when-save-pdf-to-inventory
Fix error when save report to inventory [SCI-3880]
|
2019-09-18 14:59:47 +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
|
b9f6b3a082
|
Fix error when save report to inventory
|
2019-09-18 12:50:54 +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
|
f205e4aa80
|
Merge pull request #2064 from aignatov-bio/ai-sci-3873-fix-file-preview-in-inventory
Fix file preview in inventory [SCI-3873]
|
2019-09-18 11:36:43 +02:00 |
|
aignatov-bio
|
d028856fe0
|
Fix hidden buttons in inventory (#2063)
|
2019-09-18 11:36:30 +02:00 |
|
Anton Ignatov
|
68994a77c8
|
Fix file preview in inventory
|
2019-09-18 11:21:33 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +02:00 |
|
aignatov-bio
|
52499fa285
|
Fix pathe to icon for chemical structure (#2056)
|
2019-09-18 11:18:31 +02:00 |
|
Jure Grabnar
|
40aa1a37a2
|
Change colors of active buttons TinyMCE
Close SCI-3784
|
2019-09-17 15:45:27 +02:00 |
|
Oleksii Kriuchykhin
|
e12cd0ae9d
|
Fix autoloading issues [SCI-3881]
|
2019-09-17 10:50:01 +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 |
|
Oleksii Kriuchykhin
|
bc38c6b29e
|
Fix failing test [SCI-3745]
|
2019-09-16 10:26:13 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +02:00 |
|
Alex Kriuchykhin
|
0d6f011e61
|
Merge pull request #2006 from okriuchykhin/ok_SCI_3765
Add path method to custom ActiveStorage S3 service [SCI-3765]
|
2019-09-12 15:34:03 +02:00 |
|
aignatov-bio
|
c4e8e8ed07
|
Revert "Fix formulas in project export (#2047)" (#2049)
This reverts commit 36ae7d05f9 .
|
2019-09-12 10:45:43 +02:00 |
|
aignatov-bio
|
a3b2c7d5fe
|
Fix report image issues [SCI-3772] (#1983)
* Fix report image issues
* Small fixes
|
2019-09-12 09:02:45 +02:00 |
|
aignatov-bio
|
36ae7d05f9
|
Fix formulas in project export (#2047)
|
2019-09-12 08:43:59 +02:00 |
|
aignatov-bio
|
07b9091e23
|
Fix html escape in unshared warning (#2048)
|
2019-09-11 16:33:31 +02:00 |
|
aignatov-bio
|
40b5b2406b
|
Fix big inventory names (#2046)
|
2019-09-11 15:44:38 +02:00 |
|
aignatov-bio
|
27104a495c
|
Fix styling for unshared warning message (#2044)
|
2019-09-11 11:50:02 +02:00 |
|
mlorb
|
cf8c98dfa3
|
Merge pull request #2042 from biosistemika/hotfix-september
Hotfix september
|
2019-09-10 13:53:28 +02:00 |
|
mlorb
|
e596afa595
|
Merge pull request #2041 from mlorb/ml-sci-3847
Fix missing icon on shared inventories in global search [SCI-3847]
|
2019-09-10 13:51:58 +02:00 |
|
aignatov-bio
|
1f12a63a25
|
Fix counter on task inventory and failing test (#2043)
|
2019-09-10 13:51:37 +02:00 |
|
Mojca Lorber
|
e8f24b18e2
|
Fix missing icon on shared inventories in global search
|
2019-09-10 11:20:18 +02:00 |
|
Miha Mencin
|
33d495956e
|
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen
adding missing file
|
2019-09-09 16:47:47 +02:00 |
|
Miha Mencin
|
01628e1efc
|
adding missing file
|
2019-09-09 16:46:51 +02:00 |
|
aignatov-bio
|
01d6a17f2b
|
Fix permission check for inventory (#2039)
|
2019-09-09 15:11:18 +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 |
|
Alex Kriuchykhin
|
1714212630
|
Merge pull request #2035 from okriuchykhin/ok_SCI_3827
Add local sorting for ProtocolsIO [SCI-3827]
|
2019-09-09 10:55:22 +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 |
|
aignatov-bio
|
fdce4e6c7c
|
Remove link to archived project page (#2037)
|
2019-09-09 10:43:08 +02:00 |
|
Oleksii Kriuchykhin
|
265047caf3
|
Improve behaviour of inventory items export modal [SCI-3815]
|
2019-09-09 10:38:47 +02:00 |
|
Miha Mencin
|
12d6804263
|
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen
SCI-3818-unshared-inventory-screen
|
2019-09-09 09:30:34 +02:00 |
|
Miha Mencin
|
d522b3807a
|
codestyle improvements
|
2019-09-06 14:59:30 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Oleksii Kriuchykhin
|
6f7ef25514
|
Add local sorting for ProtocolsIO [SCI-3827]
|
2019-09-05 14:49:16 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +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
|
bc86d5bc40
|
Fix import items to inventory (#2019)
|
2019-09-05 08:35:11 +02:00 |
|
aignatov-bio
|
b8e68e02a1
|
Fix error, when cancel tag editing (#2025)
|
2019-09-05 08:34:33 +02:00 |
|
Alex Kriuchykhin
|
59a85d8181
|
Merge pull request #2004 from okriuchykhin/ok_SCI_3778
Fix new office file creation [SCI-3778]
|
2019-09-04 15:40:34 +02:00 |
|
Mojca Lorber
|
a312c0c4b8
|
fix bug on api endpoint when creating result
|
2019-09-04 13:41:06 +02:00 |
|
aignatov-bio
|
481be7b92e
|
Fix padding to share modal (#2024)
|
2019-09-03 12:06:16 +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 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +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
|
d3ccdbd83e
|
Create copy permission (#2017)
|
2019-08-29 13:39:22 +02:00 |
|
aignatov-bio
|
4d20cd7d55
|
Fix copy inventory permission (#2016)
|
2019-08-26 14:48:38 +02:00 |
|
Miha Mencin
|
0058198bb5
|
Merge branch 'master' into SCI-3806-shared-status-dropdown
|
2019-08-26 11:55:25 +02:00 |
|
mlorb
|
ffe06d5070
|
Merge pull request #2010 from mlorb/ml-sci-3805
Add a team name to inventory item card [SCI-3805]
|
2019-08-26 11:29:12 +02:00 |
|
aignatov-bio
|
66326d90e5
|
Fix shared icon show/hidden (#2014)
|
2019-08-26 11:24:22 +02:00 |
|
Miha Mencin
|
a7bb7a1dd8
|
additional checking for icon: check also if user is guest
|
2019-08-26 11:20:18 +02:00 |
|
aignatov-bio
|
b3e3c443f0
|
Fix big gap in title of navbar (#2015)
|
2019-08-26 11:20:03 +02:00 |
|
Miha Mencin
|
b850efbceb
|
Code review remarks, added tooltip for unshared inventory
|
2019-08-26 10:45:40 +02:00 |
|
aignatov-bio
|
5bf3a5d418
|
Fix sharing check in service [SCI-3798] (#2011)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
* Fix sharing check in service
* Fix rebase conflicts
|
2019-08-26 09:36:41 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
aignatov-bio
|
96e132c62e
|
Hide share button for users with one team (#2005)
|
2019-08-23 11:29:03 +02:00 |
|
aignatov-bio
|
5515bac773
|
Add assigned items from shared inventories to report (#2002)
|
2019-08-23 11:28:09 +02:00 |
|
Mojca Lorber
|
50c78f182c
|
Add a team name to inventory item card
|
2019-08-23 11:13:58 +02:00 |
|
aignatov-bio
|
0810699770
|
Update shared inventory permissions [SCI-3802] (#2009)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
|
2019-08-23 10:57:02 +02:00 |
|
Luka Murn
|
5d3a0d7eea
|
Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views
Remove legacy projects archive HTML views
|
2019-08-21 17:08:27 +02:00 |
|
Luka Murn
|
701bdbd294
|
Remove archive controller action
|
2019-08-21 16:01:12 +02:00 |
|
aignatov-bio
|
d70b7e2272
|
Make share status icon dynamic (#2007)
|
2019-08-21 15:32:57 +02:00 |
|
aignatov-bio
|
5e3f1d59f5
|
Fix inventory rows import (#1997)
|
2019-08-21 15:32:45 +02:00 |
|
Oleksii Kriuchykhin
|
2298ba4e4e
|
Add path method to custom ActiveStorage S3 service [SCI-3765]
|
2019-08-21 14:33:28 +02:00 |
|
Oleksii Kriuchykhin
|
3918c893db
|
Fix new office file creation [SCI-3778]
|
2019-08-21 13:26:11 +02:00 |
|
Luka Murn
|
084cdcdd6b
|
Remove old archive endpoint, controller logic
|
2019-08-21 13:17:19 +02:00 |
|
Luka Murn
|
2db39c049e
|
Remove projects archive page
|
2019-08-21 13:10:54 +02:00 |
|
aignatov-bio
|
f94b8165dc
|
Fix marvinjs edit button and icon (#1985)
|
2019-08-21 11:15:57 +02:00 |
|
aignatov-bio
|
e682a3e5d9
|
Fix steps description and table saving (#1984)
|
2019-08-21 11:05:49 +02:00 |
|
aignatov-bio
|
4730e7bfee
|
Change notification counter position (#2000)
|
2019-08-21 10:39:56 +02:00 |
|
aignatov-bio
|
0b85dcbead
|
Fix long inventory names (#1999)
|
2019-08-21 10:39:48 +02:00 |
|
aignatov-bio
|
e2ad383c69
|
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998)
* Fix ux for task inventory dropdown and big task title
* Fix markup
|
2019-08-21 10:39:37 +02:00 |
|
Anton Ignatov
|
ed8ef7aa8f
|
Fix permission check;
|
2019-08-20 16:07:22 +02:00 |
|
Anton Ignatov
|
a2c50cbe38
|
Add new permission check for share button
|
2019-08-20 15:08:53 +02:00 |
|
Mojca Lorber
|
530d09df64
|
add i-shared inventory icon
|
2019-08-19 15:43:55 +02:00 |
|
Luka Murn
|
ebda2c832a
|
Merge pull request #1995 from biosistemika/release-1.16.8
Merge release-1.16.8 into master
|
2019-08-19 15:08:33 +02:00 |
|
aignatov-bio
|
58d9be480f
|
Remove rename button from dropdown (#1994)
|
2019-08-19 14:29:38 +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
|
b6661682ad
|
Fix shared inventory in task dropdown (#1993)
|
2019-08-19 13:56:02 +02:00 |
|
aignatov-bio
|
2cf7f52f15
|
Add inline editing for inventories [SCI-3763] (#1991)
* Add inline editing for inventories
* Remove old locals
* Markup fix
|
2019-08-19 13:30:56 +02:00 |
|
aignatov-bio
|
d4aedbb35f
|
Small ux changes for inventories (#1989)
|
2019-08-19 09:24:10 +02:00 |
|
aignatov-bio
|
d741e52427
|
Fix global search for inventories (#1988)
|
2019-08-19 09:23:59 +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 |
|
Anton Ignatov
|
d1e1da8580
|
Fix permission check for invite users
|
2019-08-14 14:47:02 +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
|
6fda5401f5
|
Fix protocol import (#1981)
|
2019-08-14 09:06:25 +02:00 |
|
aignatov-bio
|
710af85743
|
Fix template generating (#1980)
|
2019-08-14 09:06:12 +02:00 |
|
Alex Kriuchykhin
|
960e69eaa8
|
Fix wopi file download URL [SCI-3757] (#1975)
|
2019-08-14 09:06:00 +02:00 |
|
Urban Rotnik
|
0ce331227c
|
Update permission and model to share repository over all teams
|
2019-08-13 14:07:24 +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
|
dc4751e49a
|
Update scope 'accessible_by_teams' and fix load_vars method in controllers
|
2019-08-12 10:55:30 +02:00 |
|
Oleksii Kriuchykhin
|
32054c5516
|
Handle situation for assets without blob in list sorting [SCI-3757]
|
2019-08-09 15:17:19 +02:00 |
|
Oleksii Kriuchykhin
|
c352a73d79
|
ActiveStorage fixies after latest master merge [SCI-3757]
|
2019-08-09 14:56:00 +02:00 |
|
Urban Rotnik
|
61af9e21ad
|
Fix datatable filter position
|
2019-08-09 14:22:24 +02:00 |
|
Urban Rotnik
|
d04b0ccff1
|
Move '+ new inventory' link above list in sidebar
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
7719b825e3
|
Update wording for sharing activities, rename button, add view-only paragraph
|
2019-08-09 14:15:51 +02:00 |
|
Urban Rotnik
|
786716974b
|
Add validation for team on TeamRepository
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
23d7d117e9
|
Remove Repository's team from sharring list
|
2019-08-09 14:15:50 +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
|
6cbece9f86
|
Add service for multiple share
|
2019-08-09 14:15:49 +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 |
|
Mojca Lorber
|
3c1f28ec06
|
fix smart annotation permission check
|
2019-08-09 14:13:03 +02:00 |
|
Mojca Lorber
|
71b881cbdf
|
fix failing tests
|
2019-08-09 14:13:03 +02:00 |
|
Mojca Lorber
|
4c7c7ccdf1
|
Add ability to browse through shared inventories to smart annotations
|
2019-08-09 14:13:03 +02:00 |
|
Mojca Lorber
|
0e5afa6048
|
Small refactor
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
26bd81621f
|
Add new icons also to the inventories list in navigation
|
2019-08-09 14:13:02 +02:00 |
|
Mojca Lorber
|
7d4941015f
|
Update global search, so it will be able to search through shared inventories
|
2019-08-09 14:13:01 +02:00 |
|
Urban Rotnik
|
171cdb319b
|
Add ShareInventory activities
|
2019-08-09 14:13:01 +02:00 |
|
Mojca Lorber
|
b005f90e95
|
Add tests for permission can_read_repository
|
2019-08-09 14:13:01 +02:00 |
|
Mojca Lorber
|
7e9be932f3
|
Make scope for repositories accessible by teams and simplify read permission
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
15432ac851
|
Make changes to inventory list in navigation based on new mockup
|
2019-08-09 14:13:00 +02:00 |
|
Mojca Lorber
|
cac7dab440
|
Show shared inventories in left navigation and fix read repository permission
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
1a77702fa7
|
Add uniq index for Repository and Team in TeamRepositories
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
5456c1e38a
|
Add basic controller for TeamRepositories
|
2019-08-09 14:12:59 +02:00 |
|
Urban Rotnik
|
077369d960
|
Update permissions for Repositories
|
2019-08-09 14:12:59 +02:00 |
|
Urban Rotnik
|
f569411bc7
|
Add TeamRepository model
|
2019-08-09 14:12:59 +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
|
d52df56fc4
|
Fix production build and update packages [SCI-3678]
|
2019-08-08 14:03:15 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Oleksii Kriuchykhin
|
b4f632dba8
|
Remove dowload endpoint from assets controller [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Oleksii Kriuchykhin
|
d942788581
|
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
|
2019-08-07 15:21:41 +02:00 |
|
Alex Kriuchykhin
|
328f8dd8a0
|
Merge pull request #1966 from okriuchykhin/ok_SCI_3681
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-07 10:49:05 +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
|
973fc775c0
|
Enforce file size limits for direct uploads on S3 [SCI-3681]
|
2019-08-06 17:09:00 +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 |
|
Urban Rotnik
|
50045b9796
|
Merge pull request #1956 from urbanrotnik/ur-sci-3733-add-button-new
Add additional NewStep button [SCI-3733]
|
2019-08-06 15:26:51 +02:00 |
|
Oleksii Kriuchykhin
|
423528933e
|
Switch to global JS constants [SCI-3679]
|
2019-08-06 15:06:19 +02:00 |
|
Anton Ignatov
|
e2e876b2a3
|
Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests
|
2019-08-05 13:51:04 +02:00 |
|
Jure Grabnar
|
a9d67ba151
|
[SCI-3588] Security precautions for omniauth CVE-2015-9284 (#1961)
[SCI-3588] Security precautions for omniauth CVE-2015-9284
|
2019-08-05 13:14:21 +02:00 |
|
Jure Grabnar
|
d9ce3e5e8e
|
[SCI-3674] Remove width on comments (#1954)
[SCI-3674] Remove width on comments
|
2019-08-05 13:14:03 +02:00 |
|
aignatov-bio
|
f0b7771e19
|
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export
Fix protocol copy, add metadata to assets [SCI-3629]
|
2019-08-05 12:55:16 +02:00 |
|