Oleksii Kriuchykhin
837437309e
Fix failing tests [SCI-4516]
2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin
3a67c99982
Switch to STI for repositories, fix cell values snapshotting [SCI-4516]
2020-04-09 12:33:04 +02:00
Oleksii Kriuchykhin
a9c3102835
Add repository snapshots with service, refactor item assigning [SCI-4516]
2020-04-07 18:26:39 +02:00
aignatov-bio
9a64ebdfd0
Update sql and add accordion effect
2020-04-03 13:15:56 +02:00
aignatov-bio
dd3f2cb219
Update my_module assigned repository method
2020-04-03 12:33:42 +02:00
aignatov-bio
9678372dd5
Add assigned repositories list
2020-04-02 12:05:07 +02:00
aignatov-bio
4c33abff05
Assign user after task created
2020-03-30 15:16:14 +02:00
aignatov-bio
6bdd45e7b7
Fix timezone when import datetime
2020-03-24 17:45:09 +01:00
Miha Mencin
fd8462b008
codstyle
2020-03-18 10:35:31 +01:00
Miha Mencin
ecd49cb1e7
fix format and export_format mess
2020-03-18 09:57:57 +01:00
Miha Mencin
24b979aa6f
fix CR comments
2020-03-18 09:53:47 +01:00
Miha Mencin
c89503f691
SCI-4464 fix the import of the dates, some tests
2020-03-17 21:20:50 +01:00
Oleksii Kriuchykhin
675b578272
Add used space calculation method to the team model [SCI-4459]
2020-03-17 16:56:55 +01:00
Oleksii Kriuchykhin
a518bfe023
Enable time fraction for task due date [SCI-4408]
2020-03-16 17:55:35 +01:00
aignatov-bio
d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout
...
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
2020-03-12 11:26:23 +01:00
aignatov-bio
a32a3db8e5
Split joins scope
2020-03-11 14:30:41 +01:00
aignatov-bio
bfaf5a1786
Fix markup
2020-03-11 11:39:17 +01:00
aignatov-bio
c13721f842
Fix recent work service and move templates to html
2020-03-11 11:34:59 +01:00
Miha Mencin
26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard
...
Features/dashboard
2020-03-10 18:06:23 +01:00
Alex Kriuchykhin
4bea0781da
Merge pull request #2418 from okriuchykhin/ok_SCI_4276
...
Add API endpoints for new column types [SCI-4276]
2020-03-09 12:58:54 +01:00
Miha Mencin
62b934f012
Merge branch 'develop' into features/dashboard
2020-03-09 09:56:32 +01:00
Alex Kriuchykhin
de0d389b96
Merge pull request #2454 from okriuchykhin/ok_SCI_4434
...
Refactor inventory limit checks [SCI-4434]
2020-03-06 15:33:01 +01:00
Oleksii Kriuchykhin
02817a5a1e
Refactor inventory limit checks [SCI-4434]
2020-03-05 15:26:25 +01:00
aignatov-bio
4af992ef35
Fix date import for repository
2020-03-05 14:34:31 +01:00
aignatov-bio
eb4a783337
Fix task visibility for current task widget
2020-03-03 13:13:46 +01:00
Oleksii Kriuchykhin
78ceb41a9e
Improve loading of tasks statistics for dashboard [SCI-4356]
2020-02-28 16:17:32 +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
Mojca Lorber
9bd2e8bec4
Dashboard current tasks visual layout and backend
2020-02-21 10:41:42 +01:00
aignatov-bio
cf4dbd5ff4
Add calendar widget
2020-02-20 17:02:38 +01:00
Oleksii Kriuchykhin
9d0d75acc5
Add API endpoints for new column types [SCI-4276]
2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin
0fec8f4d95
Improve speed of inventory import [SCI-4336]
2020-02-11 13:51:34 +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
Oleksii Kriuchykhin
f97577ec12
Remove byebug entry [SCI-4220]
2020-02-10 10:40:38 +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
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
Urban Rotnik
3db48c44f7
Add ordered scope
2020-01-30 13:47:14 +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
13c9dd8cf6
Safe navigation for serializer value of RepositoryListItem
2020-01-28 13:38:37 +01:00
Urban Rotnik
503c05805d
Move editable? method from helper to model
2020-01-25 09:43:05 +01:00
Urban Rotnik
8d7f51edde
Fix for items with newline
2020-01-22 13:15: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
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
Oleksii Kriuchykhin
8c2b1e5037
Fix global search for repositories and checklists update [SCI-4251]
2020-01-16 15:30:19 +01:00
Urban Rotnik
469714c40d
Remove Checklist item min length validation and modal fixes
2020-01-16 15:21:01 +01:00
Urban Rotnik
507443ba38
Add custom method for repository report JSON data
2020-01-16 14:42:26 +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
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
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
Urban Rotnik
97954b3930
fixup! Fix list item update
2020-01-15 11:28:31 +01:00
Oleksii Kriuchykhin
9e8bd23616
Merge latest branch 'develop' into ok_SCI_3988
2020-01-15 10:52:20 +01:00
Oleksii Kriuchykhin
eed68a2590
Refactor repository cell clonning to support all data types [SCI-4204]
2020-01-14 16:55:10 +01:00
Oleksii Kriuchykhin
7b82e33eb6
Fix repository filtering and improve speed [SCI-4224]
2020-01-13 16:09:07 +01:00
aignatov-bio
ac2f431a0b
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value
...
Fix big number in repository number value [SCI-4221]
2020-01-13 10:42:13 +01:00
Alex Kriuchykhin
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
Alex Kriuchykhin
007cae39e8
Merge pull request #2291 from okriuchykhin/ok_SCI_4197
...
Fix sorting for date time columns [SCI-4197]
2020-01-10 15:25:53 +01:00
aignatov-bio
9ede0ef716
Fix big number in repository number value
2020-01-10 13:00:14 +01:00
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
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
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
522ae12f08
Merge branch 'develop' into ok_SCI_3988
2020-01-07 17:07:22 +01:00
Oleksii Kriuchykhin
d9b9243da7
Merge branch 'develop' into features/new-column-types
2020-01-07 16:03:33 +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
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
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
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
dfe3c5292e
Add TimeRange and DateRange renderer
2019-12-20 14:57:04 +01:00
Urban Rotnik
5d4453470a
Add DateTimeRange renderer
2019-12-20 14:56:11 +01:00
Urban Rotnik
2a63854123
Edit and new renderers for DateTime columns
2019-12-20 14:55:11 +01:00
Alex Kriuchykhin
0566b17d50
Merge pull request #2272 from okriuchykhin/ok_SCI_4166
...
Add view/edit renderers for numeric data type [SCI-4166]
2019-12-19 11:57:13 +01:00
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
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
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
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
b68aadf506
Update params nesting
2019-12-10 14:29:35 +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
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
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
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
Urban Rotnik
eca0c84bbd
Fix tests
2019-12-06 14:20:37 +01:00
Urban Rotnik
e934e08c17
Implement STI for DateTimeValue types
2019-12-06 12:50:19 +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
43ff9f6f26
Fix experiment copy
2019-12-02 15:34:42 +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
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
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
b591346a3f
Add DateTime type column
2019-11-29 10:19:13 +01:00
Urban Rotnik
1e8261ac2a
Update InventoryColumns API for new Status Type
2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin
73be1181ac
Fix failing tests for repository states [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
Urban Rotnik
1720623665
Refactor RepositoryListColumn controller
2019-11-29 10:17:50 +01:00
Urban Rotnik
14b43d516e
Add UpdateStatusColumnService service
2019-11-29 10:16:45 +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
Oleksii Kriuchykhin
6b20a10473
Refactor Azure configuration [SCI-4098]
2019-11-26 15:09:40 +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
Miha Mencin
48fc7708f8
SCI-4109 fix the file copying
2019-11-25 13:38:16 +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
b2862b6c9e
Remove Paperclip DB columns and fix experiment templates [SCI-3988]
2019-11-18 14:16:28 +01:00
Anton Ignatov
7117b767f4
Fix commnets to PR
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
7b855f54ac
Finish main part of selectors
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
060125a1c4
Add file size validation
2019-11-18 11:11:38 +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
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
aignatov-bio
a9690482d1
Add autosave feature to text fields
2019-11-12 11:26:18 +01:00
aignatov-bio
0c5ce90895
Fix eln export for file without extension
2019-11-06 09:53:44 +01:00
Oleksii Kriuchykhin
b2eda231a0
Fix TinyMCE images in protocol clonning [SCI-4053]
2019-11-05 18:13:44 +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
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
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
Oleksii Kriuchykhin
53402c9ce1
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
2019-10-17 13:30:14 +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
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
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
Oleksii Kriuchykhin
3d9c2282f3
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
2019-10-08 10:42:55 +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
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
Oleksii Kriuchykhin
bab228e1df
Skip missing files when clonning TinyMceAsset [SCI-3950]
2019-10-03 15:43:39 +02:00
Oleksii Kriuchykhin
260fcd6e89
Remove Paperclip from codebase [SCI-3908]
2019-10-02 19:45:14 +02:00
Oleksii Kriuchykhin
efe5d8a6ea
Remove the deprecated foreign keys from TinyMceAsset [SCI-3839]
2019-10-01 15:49:37 +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
Jure Grabnar
0a3389f310
Fix operator for removing the lock on asset
2019-09-30 08:46:16 +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
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
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
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
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
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
Anton Ignatov
69eb8681bd
Error handling, when image unavaliable for base64
2019-09-18 15:11:51 +02:00
Oleksii Kriuchykhin
3509543e7b
Merge branch 'master' into ok_SCI_3881
2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin
c068901b00
Upgrade Rails to 6.0 [SCI-3745]
2019-09-12 17:24:08 +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
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
Oleksii Kriuchykhin
267c53c2d2
Refactor inventory sharing logic [SCI-3803]
2019-08-29 17:21:49 +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
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
Oleksii Kriuchykhin
3918c893db
Fix new office file creation [SCI-3778]
2019-08-21 13:26:11 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon ( #1985 )
2019-08-21 11:15:57 +02:00
Mojca Lorber
530d09df64
add i-shared inventory icon
2019-08-19 15:43:55 +02:00
aignatov-bio
d741e52427
Fix global search for inventories ( #1988 )
2019-08-19 09:23:59 +02:00
Urban Rotnik
89f289660b
Add share_with_all feature to service, add new activities
2019-08-14 11:03:15 +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
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
786716974b
Add validation for team on TeamRepository
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
Mojca Lorber
0e5afa6048
Small refactor
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
Mojca Lorber
7e9be932f3
Make scope for repositories accessible by teams and simplify read permission
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
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
Oleksii Kriuchykhin
973efa55e1
Merge branch 'master' into ok_SCI_3678
2019-08-08 11:17:07 +02:00
Jure Grabnar
bbdc5ce6c3
Remove couple of Samples related logic/comments
2019-08-05 14:09:13 +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
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
Anton Ignatov
feadd940f7
Fix duplicate for TinyMCE model
2019-08-05 11:33:49 +02:00
Anton Ignatov
24da016465
Reuse duplicate file method
2019-08-05 11:30:36 +02:00
Oleksii Kriuchykhin
a2fe4bee94
Add text extraction from MarvinJS for search [SCI-3643]
2019-08-02 15:17:28 +02:00
Anton Ignatov
7e379d4e0d
Fix download file
2019-07-29 10:24:31 +02:00
Anton Ignatov
f35f4886a3
Fix markup
2019-07-29 10:18:34 +02:00
Anton Ignatov
a4b2825258
Fix tests for active storage
2019-07-26 15:58:51 +02:00
Anton Ignatov
618f0cc334
Fix tests for services
2019-07-26 14:16:44 +02:00
Anton Ignatov
84fe10df47
Fix tests for models and tema import/export
2019-07-26 12:40:36 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
Anton Ignatov
3b7f715e0b
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-22 13:09:17 +02:00
Anton Ignatov
b762ae6a90
Copy protocol assets through tempfile
2019-07-19 15:23:34 +02:00
aignatov-bio
4fe0227d8c
Add metadata for .eln assets ( #1942 )
2019-07-19 10:53:33 +02:00
aignatov-bio
2fae7d8208
Fix issue in report ( #1941 )
2019-07-19 10:37:44 +02:00
Anton Ignatov
b5a35f583a
Fix protocol copy, add metadata to assets
2019-07-18 15:39:08 +02:00
Anton Ignatov
1e8663548e
Add MarvinJS assets to TinyMCE
2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf
Add MarvinJS to Result and TinyMce MarvinJS refactor
2019-07-15 17:17:14 +02:00
Anton Ignatov
ba1d6d45ca
Fix merging issues
2019-07-12 15:47:15 +02:00
Anton Ignatov
ffd415d409
Inital refactor for Assets model
2019-07-12 15:02:06 +02:00
Anton Ignatov
7831b0a089
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 15:00:07 +02:00
Anton Ignatov
57a273d5d0
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
64b7a5646a
Implement custom document file previewer [SCI-3677]
2019-07-10 14:37:23 +02:00
Oleksii Kriuchykhin
a1941a21dc
Futher refactoring of old Paperclip methods [SCI-3539]
2019-07-09 10:28:15 +02:00
Miha Mencin
ab9b7a7429
Merge pull request #1902 from biosistemika/release-1.16.6
...
Merge 'release-1.16.6' into 'master'
2019-07-08 12:49:40 +02:00
Alex Kriuchykhin
82708f0124
Merge pull request #1891 from okriuchykhin/ok_SCI_3654
...
Fix project page view saving [SCI-3654]
2019-07-08 11:46:54 +02:00
Oleksii Kriuchykhin
9d926dc956
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
2019-07-05 16:56:05 +02:00
aignatov-bio
88dc2dcdd0
Hot fix for TinyMCE asset permission check ( #1896 )
...
* Hot fix for TimyMCE asset permission check
2019-07-04 15:59:11 +02:00
Oleksii Kriuchykhin
c0c8e0e1a3
Refactor Experiment workflow images [SCI-3539]
2019-07-04 09:33:12 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration ( #1893 )
...
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
aignatov-bio
d147e8260d
Fix issue with moving protocol in repository ( #1887 )
2019-07-03 15:35:37 +02:00
Oleksii Kriuchykhin
e16cb513e1
Fix project page view saving [SCI-3654]
2019-07-03 15:34:16 +02:00
Oleksii Kriuchykhin
4ea6b56582
Fix Step and Result file previews [SCI-3539]
2019-07-01 23:30:20 +02:00
Anton Ignatov
1f40fa69fc
Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
2019-07-01 11:51:27 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled ( #1872 )
2019-07-01 11:51:13 +02:00
Anton Ignatov
c9ae9f056e
Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration
2019-07-01 10:44:29 +02:00
aignatov-bio
2793777463
Features/docx report ( #1873 )
...
* Initial setup for docx report
* Add render for project, experiment, my_module
* Implement converter for RTE fields
* Add all report elements
* fix markup
* Change headers, remove empty blocks, refactored repository draw
* Add smart annotations support
* Fix justify fields
* Prepare for addons integration
* Fix markup
* Add comments to GemFile
* Fix TinyMCE error
* Change UI for new report download selector
* Fix file error in inventory cell for docx
* Fix i18n object for header
2019-07-01 10:14:16 +02:00
Anton Ignatov
390002f40f
Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539
2019-07-01 10:12:26 +02:00
Oleksii Kriuchykhin
5acb16d43e
Update Asset helper methods [SCI-3539]
2019-06-28 08:17:09 +02:00
Oleksii Kriuchykhin
ba2daede0b
Add migration scripts [SCI-3539]
2019-06-24 15:17:42 +02:00
Anton Ignatov
7e5c39d3e4
Merge branch 'master' into features/marvinjs-integration
2019-06-21 14:51:45 +02:00
Alex Kriuchykhin
db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
...
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-20 11:31:15 +02:00
Oleksii Kriuchykhin
f2b617ac12
Fix code formatting [SCI-3436]
2019-06-19 14:23:12 +02:00
Oleksii Kriuchykhin
ae1a63037b
Raise an exception if required methods for ViewableModel are not implemented [SCI-3436]
2019-06-19 14:17:17 +02:00
aignatov-bio
9653f16196
Convert image to base64 in PDF reports [SCI-3557] ( #1835 )
...
* Convert image to base64 in PDF reports
* Fix typo error
2019-06-19 13:57:04 +02:00
Urban Rotnik
807104035c
Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated
2019-06-17 12:24:09 +02:00
aignatov-bio
68937dd192
Fix RTE import for protocol repository ( #1833 )
2019-06-14 16:20:27 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments ( #1838 )
2019-06-14 16:20:13 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] ( #1800 )
...
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin
097639e71e
Fix view state validation [SCI-3436]
2019-06-13 14:28:46 +02:00
Alex Kriuchykhin
599274eb13
Merge pull request #1830 from okriuchykhin/ok_SCI_3528
...
Make repositories more extendable [SCI-3528]
2019-06-13 09:45:18 +02:00
Oleksii Kriuchykhin
6e1a7a3392
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-11 10:08:33 +02:00
Jure Grabnar
bbfe2b9c89
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview
...
File preview on new attachments layout [SCI-3145]
2019-06-10 17:59:12 +02:00
Jure Grabnar
56949db9da
Move extract_image_quality to before_post_process
2019-06-10 17:48:00 +02:00
Jure Grabnar
c2d615ab48
Remove image quality preprocessor
2019-06-10 15:10:07 +02:00
Urban Rotnik
bbe0062bfd
Small fixes for factories
2019-06-10 12:24:05 +02:00
Urban Rotnik
965b7eb58b
Add missing factories
2019-06-10 12:24:04 +02:00
Urban Rotnik
f19eeba8dc
Add factory valid check for User's associations
2019-06-10 12:24:04 +02:00
Urban Rotnik
ba340f7bee
Add valid factory check for Table, Tag, Team
2019-06-10 12:24:03 +02:00
Urban Rotnik
9348886fb1
Minior changes in SystemNotifications tests
2019-06-10 12:24:03 +02:00
Urban Rotnik
15cbd8864c
Add valid factory check to Steps models
2019-06-10 12:24:03 +02:00
Urban Rotnik
1e60102a7d
Add valid factory check for Sample(s) models
2019-06-10 12:24:02 +02:00
Urban Rotnik
c66aa29227
Add valid factory check for Result(s) models
2019-06-10 12:24:02 +02:00
Urban Rotnik
3adf2bb736
Add factories and validation tests for repositories and related models
...
Repositories, cells, columns, values (date, text, asset, list), rows, items
2019-06-10 12:24:02 +02:00
Urban Rotnik
a7558d83be
Add valid factory check for Project, MyModules, notification, protocol
2019-06-10 12:24:01 +02:00
Urban Rotnik
3348b81b14
Checklist, checklist_item, activity, experiment spec and factories updated
2019-06-10 12:24:01 +02:00
Urban Rotnik
6321c0f5c0
Assets spec and factories updated
2019-06-10 12:24:01 +02:00
Oleksii Kriuchykhin
8920d38a02
Make repositories more extendable [SCI-3528]
2019-06-06 17:28:59 +02:00
Oleksii Kriuchykhin
e543a849d4
Add document file preview generation with LibreOffice [SCI-3145]
2019-06-05 14:52:30 +02:00
Anton Ignatov
c9a29b12ba
Merge branch 'master' into features/marvinjs-integration
2019-05-31 10:27:14 +02:00
aignatov-bio
0b3b6d593b
Small style fixes [SCI-3498] ( #1799 )
...
* Adding error, if TinyMCE asset not in text, when we copy anything
* Small style fixes
2019-05-27 16:27:27 +02:00
Luka Murn
d7fe23c6ce
Merge pull request #1796 from Ducz0r/lm-sci-3494
...
Fix the user.activities association so it works [SCI-3494]
2019-05-24 14:21:42 +02:00
Luka Murn
3a2bf2ce8a
Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup
...
Add a startup check for WOPI_ENABLED == true variables
2019-05-22 16:56:55 +02:00
aignatov-bio
0f86ebf173
Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] ( #1797 )
...
* Adding error, if TinyMCE asset not in text, when we copy anything
2019-05-22 16:13:40 +02:00
Luka Murn
8b116d9de7
Fix the user.activities association so it works
...
Closes SCI-3494.
2019-05-22 15:42:50 +02:00
Oleksii Kriuchykhin
d3f29d5d72
Add type column to zip_exports for STI [SCI-3368]
2019-05-20 16:35:24 +02:00
aignatov-bio
b22dba7f05
Add delay job for handling unknown tinyMCE images ( #1781 )
...
* Add delay job for handling unknown tinyMCE images
2019-05-20 12:44:16 +02:00
Luka Murn
4136aa0575
Add a startup check for WOPI_ENABLED == true variables
2019-05-18 10:22:53 +02:00
Luka Murn
8aa702a4bf
Fix bug with external TinyMCE assets
2019-05-16 13:33:04 +02:00
Anton Ignatov
259b75a6ba
Merge branch 'master' into features/marvinjs-integration
2019-05-16 09:28:48 +02:00
aignatov-bio
980d86824f
Fix updating process for old tinyMCE tags ( #1772 )
...
* Fix update old tinyMCE for deleted objects
* Add error handling
2019-05-15 16:11:48 +02:00
aignatov-bio
f1f04adeb2
Fix placeholder in protocol description [SCI-3454] ( #1769 )
...
* Fix placeholder in protocol description
* Change task tags text
2019-05-15 14:13:13 +02:00
Miha Mencin
13d126bc39
Merge pull request #1761 from mlorb/ml-sci-3456
...
Fix broken global activities team filter [SCI-3456]
2019-05-14 16:36:44 +02:00
aignatov-bio
1555daa0c6
Fix non associated tinyMCE images ( #1762 )
...
* Fix non assosiated tinyMCE images
2019-05-14 15:01:57 +02:00
Mojca Lorber
54f735551c
Fix broken global activities team filter
2019-05-14 13:50:10 +02:00
Oleksii Kriuchykhin
65fb4b1372
Fix processing_image_url for S3 storage [SCI-3381]
2019-05-14 12:53:35 +02:00
Luka Murn
bd9ffe4bd2
Refactor WOPI filename length validation onto the model
2019-05-13 15:41:39 +02:00
Anton Ignatov
652fba0e23
Merge branch 'master-with-note-section'
2019-05-13 11:08:11 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] ( #1753 )
...
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
aignatov-bio
da5b24ef57
Fix attachment appearence after update ( #1745 )
2019-05-13 10:54:16 +02:00
aignatov-bio
0b194eb3b1
Revert "Fix report saving ( #1748 )" ( #1752 )
...
This reverts commit 3db6129808
.
2019-05-13 09:09:36 +02:00
aignatov-bio
3db6129808
Fix report saving ( #1748 )
2019-05-13 08:58:47 +02:00
Anton Ignatov
e5b4adcc25
Merge branch 'master-with-note-section' into features/marvinjs-integration
2019-05-11 20:51:01 +02:00
aignatov-bio
bbf54de9c7
Merge pull request #1736 from aignatov-bio/ai-sci-3423-add-old-tinymce-support
...
Add old tinymce image support [SCI-3423]
2019-05-10 15:27:42 +02:00
Alex Kriuchykhin
2a7f70929a
Merge pull request #1717 from okriuchykhin/ok_SCI_3368
...
Improve clean up of Export All files [SCI-3368]
2019-05-09 13:37:56 +02:00
Oleksii Kriuchykhin
40550f92c9
Improve HTML data escaping in JSON endpoints [SCI-3403]
2019-05-08 17:38:24 +02:00
Anton Ignatov
995408e7fc
Fix protocol update error, rollback bootstrap gems and fix step name
2019-05-08 17:18:19 +02:00
Anton Ignatov
bee87f51ba
Fix tests
2019-05-08 15:22:06 +02:00
Anton Ignatov
b5271bdd2c
Add remote api support
2019-05-08 15:00:36 +02:00
Anton Ignatov
5a5101410c
Fix markup
2019-05-08 14:35:28 +02:00
Anton Ignatov
b2063d3018
Fix markup
2019-05-08 14:30:33 +02:00
Anton Ignatov
f201c5440b
Add check for old tinymce for report and reassign process
2019-05-08 14:29:25 +02:00
Anton Ignatov
5d959f648e
Convert old tinymce assets to new on fly
2019-05-08 14:23:26 +02:00
Anton Ignatov
dcf94e78e1
Merge branch 'master-with-note-section' into feature/marvinjs-integration
2019-05-08 14:03:41 +02:00
Urban Rotnik
62bc0520e9
Update method last_sync_timestamp from Last to First user
2019-05-08 08:38:11 +02:00
Urban Rotnik
2364c2653f
Add bulk insert for UserSystemNotifications, New service for sending emails
2019-05-08 08:38:10 +02:00
Urban Rotnik
357c6e6b98
Change ordering by created_at instead by last_time_changed_at
2019-05-08 08:37:34 +02:00
Oleksii Kriuchykhin
8461949bed
Fix deletion of inconfirmed users [SCI-3351]
2019-05-07 16:02:45 +02:00
Anton Ignatov
7f296b35fa
Update team exporter for new tinymce images
2019-05-07 13:22:55 +02:00
Jure Grabnar
c866d96ea7
Merge pull request #1720 from jbargu/jg_sci_3375
...
One project is duplicated in project list [SCI-3375]
2019-05-06 11:43:24 +02:00
Anton Ignatov
565a4959b4
small fixes and improvments
2019-05-03 15:24:28 +02:00
Anton Ignatov
88e67a16c2
Merge branch 'master-with-note-section' into feature/marvinjs-integration
2019-05-02 16:16:03 +02:00
Anton Ignatov
fef691d30f
Add error handling and secutiry checks
2019-05-02 16:12:25 +02:00
Anton Ignatov
4d0d5aa014
Adding team sketches selector
2019-04-30 17:32:55 +02:00
Jure Grabnar
de6509cc97
Add distinct to #visible_to in project.rb
...
Closes SCI-3375
2019-04-30 16:40:12 +02:00
Anton Ignatov
7c55fcf0cf
Merge branch 'master' into master-with-note-section
2019-04-30 12:07:59 +02:00
Oleksii Kriuchykhin
1b792e2b7e
Improve clean up of Export All files [SCI-3368]
2019-04-30 00:43:34 +02:00
Mojca Lorber
5fd4c47388
Move change owner functionality to RepositoryRow
2019-04-29 14:02:02 +02:00
Anton Ignatov
f80d881847
Fix markup
2019-04-28 19:11:41 +02:00
Anton Ignatov
2847ec7609
Add env variable and check for MarvinJS available
2019-04-28 17:08:18 +02:00
Anton Ignatov
260810fff8
Add editing mode for tinymce images
2019-04-28 16:16:31 +02:00
Anton Ignatov
193edfbc35
Add marvin js support to TinyMCE
2019-04-27 22:54:59 +02:00
Anton Ignatov
fe620c4a63
Add marvin model and controller
2019-04-26 22:59:38 +02:00
Mojca Lorber
eac90109f7
Change ownership of inventory items, when a user leaves a team
2019-04-26 10:47:08 +02:00
Alex Kriuchykhin
6bb19ed0be
Merge pull request #1697 from okriuchykhin/ok_SCI_3264
...
Update limits for new rich text enabled fileds [SCI-3264]
2019-04-25 23:54:05 +02:00
Oleksii Kriuchykhin
a3f5974dbd
Update limits for new rich text enabled fileds [SCI-3264]
2019-04-24 13:37:22 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] ( #1689 )
...
* Update protocol repository for new description format
* move image clone method to concerns
2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin
7c91b4a255
Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266
2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin
c7a707f9db
Fix task clonning with TinyMCE images [SCI-3266]
2019-04-23 15:16:40 +02:00
Urban Rotnik
11a7a975af
Merge branch 'features/scinote-improvements' into master-with-note-section
2019-04-23 14:50:03 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
Jure Grabnar
1da1558849
Merge pull request #1683 from jbargu/jg_3179
...
Archived results are now separated in exported project
2019-04-19 18:26:22 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format ( #1680 )
2019-04-19 14:44:40 +02:00
Jure Grabnar
1295c0583a
Archived results are now separated in exported project
...
Closes SCI-3179
2019-04-17 16:37:21 +02:00
Oleksii Kriuchykhin
f9832013b0
Improve experiment preview image generation [SCI-3177]
2019-04-17 12:06:46 +02:00
Urban Rotnik
0ba0dccd57
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix
...
Fix for exports_left, fix for some edge cases [SCI-3345]
2019-04-16 10:32:31 +02:00
Urban Rotnik
22af36dd2d
Fix for exports_left, fix for some edge cases
2019-04-16 09:59:02 +02:00
aignatov-bio
8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] ( #1654 )
...
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
2019-04-15 09:49:44 +02:00
aignatov-bio
8ba0555922
Add check for tasks complete in project notifications ( #1657 )
2019-04-12 09:17:34 +02:00
Urban Rotnik
caccf8d9f0
Reset counter for export in last 24 hours
...
Fix for check if user has avaiable exports, bit refactored increas_counter method.
2019-04-10 10:56:33 +02:00
aignatov-bio
e2e299b424
Add dynamic generating filters for global activities [SCI-3228] ( #1644 )
...
* Add dynamic generating filters
* Add url methods
2019-04-09 09:08:27 +02:00
Jure Grabnar
bc9eff2ef5
Add asset validation on wopi creation
...
Missing file
2019-04-04 17:05:25 +02:00
Miha Mencin
97d9fde3fd
SCI-3286 add breadcrumbs to the report activity
2019-04-04 10:30:31 +02:00
Jure Grabnar
26848ecaef
Refactor step position + 1 into a method
2019-04-03 13:07:30 +02:00
Alex Kriuchykhin
bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281
...
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-03 11:39:59 +02:00
aignatov-bio
e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] ( #1631 )
...
* Fix bug with update protocol from repository and modal disable button
2019-04-03 09:18:18 +02:00
Oleksii Kriuchykhin
ffa7c5ecb2
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-02 16:38:53 +02:00
Anton Ignatov
c9f9523210
Remove src when save description and rename token tag
2019-04-02 13:41:32 +02:00
aignatov-bio
e6102c72c7
Adding missed activities [SCI-3253] ( #1614 )
...
* Adding missed activties
* Adding test for activities
2019-04-02 11:50:37 +02:00
aignatov-bio
e93b0c3109
Adding preload filters for global activities [SCI-3254] ( #1619 )
...
* Adding preload filter for global activities
* Adding link to task activities
2019-04-02 11:14:36 +02:00
Urban Rotnik
b91f08fe99
Add activity for copying Inventory and Invetory item
2019-04-01 15:40:00 +02:00
Alex Kriuchykhin
b3aa6be23d
Merge pull request #1621 from okriuchykhin/ok_SCI_3255
...
Add global activities to reports [SCI-3255]
2019-04-01 15:07:06 +02:00
Jure Grabnar
83130426e2
Merge pull request #1617 from jbargu/jg_3244
...
Duplicated activity, report activity ... [SCI-3244]
2019-04-01 14:31:53 +02:00
Jure Grabnar
111b0e2b7f
Merge pull request #1615 from jbargu/jg_sci_3252
...
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
2019-04-01 12:30:48 +02:00
Oleksii Kriuchykhin
98e58ff7eb
Add global activities to reports [SCI-3255]
2019-04-01 11:26:51 +02:00
Jure Grabnar
6533368763
Add activity for importing inv items
2019-03-29 15:41:34 +01:00
Jure Grabnar
f843092aac
Add activity for moving worklfows
...
Closes SCI-3252
2019-03-29 13:51:17 +01:00
Oleksii Kriuchykhin
7d4fbcb32e
Fix unconfirmed users clean-up issues [SCI-3172]
2019-03-29 11:11:53 +01:00
Alex Kriuchykhin
9137740266
Merge pull request #1607 from okriuchykhin/ok_SCI_3229
...
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin
d7d45bec70
Fix links for archived objects in global activities [SCI-3229]
2019-03-28 13:43:50 +01:00
mlorb
5f663b3c74
Merge pull request #1600 from mlorb/ml-sci-3215
...
Implement missing tests for global activities [SCI-3215][SCI-3219]
2019-03-28 11:10:38 +01:00
Oleksii Kriuchykhin
37c559debd
Fix experiment workflow image display after touching [SCI-3177]
2019-03-27 17:02:59 +01:00
Mojca Lorber
f06358b2ae
Implement missing tests for global activities (task and protocol activities)
2019-03-27 11:24:44 +01:00
aignatov-bio
c2e1e85913
Adding localization for activity name and activity group ( #1598 )
2019-03-27 10:33:33 +01:00
Oleksii Kriuchykhin
dab75d5aec
Fix duplicated projects in new report modal [SCI-3173]
2019-03-26 17:24:30 +01:00
Alex Kriuchykhin
935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
...
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
2019-03-26 16:02:44 +01:00
aignatov-bio
54fd3a748b
Adding activity groups [SCI-3203] ( #1588 )
...
* Adding activty groups
2019-03-26 15:29:21 +01:00
Oleksii Kriuchykhin
e3a3ec4491
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225]
2019-03-25 17:38:13 +01:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities
2019-03-25 14:35:24 +01:00
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
Anton Ignatov
5d6f009ee8
fix error for delay deleting
2019-03-20 15:20:31 +01:00
Anton Ignatov
55c93922ea
markup fixes
2019-03-20 14:46:54 +01:00
Anton Ignatov
07c2819163
refactoring tinymce image uploading
2019-03-20 14:46:54 +01:00
Mojca Lorber
4f9814b884
Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021
2019-03-20 11:03:00 +01:00
Mojca Lorber
42ff1c0a68
fix bug in revert protocol method
2019-03-20 09:43:38 +01:00
Mojca Lorber
cd7a87348f
Protocol activities refactoring, without tests
2019-03-19 16:12:07 +01:00
Mojca Lorber
c476816359
Task activities refactoring, without tests
2019-03-19 15:33:57 +01:00
Urban Rotnik
fe35c805b7
Add model breadcrumbs, update activities_helper
2019-03-19 14:01:06 +01:00
aignatov-bio
6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] ( #1568 )
...
*Add permission check for assets editing
* Add check for image format
2019-03-19 13:52:57 +01:00
Oleksii Kriuchykhin
0c71493fdb
Add viewing permissions for global activities [SCI-2997]
2019-03-18 15:38:19 +01:00
Urban Rotnik
2ea2700837
fixup! Fix failing tests
2019-03-15 10:30:51 +01:00
Urban Rotnik
3f18166320
Add Task and TaskTags activities
2019-03-12 09:15:06 +01:00
Urban Rotnik
b33e95e18a
New Protocols actions logging
2019-03-12 09:14:53 +01:00
Urban Rotnik
3992336db9
Add type and value_for attributes to user hash
2019-03-11 08:37:22 +01:00
Urban Rotnik
b8e84b5685
Add logic for saving message items values and types
2019-03-11 08:37:22 +01:00
Urban Rotnik
117944117b
Add service for activity creation
2019-03-11 08:36:15 +01:00
Alex Kriuchykhin
ec1aec3bf1
Merge pull request #1556 from okriuchykhin/ok_SCI_3048
...
Fix local storage file download links [SCI-3048]
2019-03-07 16:58:30 +01:00
Oleksii Kriuchykhin
0c99ea9c5c
Fix local storage file download links [SCI-3048]
2019-03-07 16:46:05 +01:00
Oleksii Kriuchykhin
8cc95bf491
Embed tables JS files to main HTML of Export All [SCI-3151]
2019-03-07 14:23:10 +01:00
Oleksii Kriuchykhin
2b239e2f35
Fix JS files inclusion in export all report [SCI-3150]
2019-03-07 11:14:38 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] ( #1521 )
...
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
Alex Kriuchykhin
985820a97c
Merge pull request #1527 from okriuchykhin/ok_SCI_3101
...
Move templates project creation for new team to delayed job [SCI-3101]
2019-03-01 13:55:49 +01:00
Miha Mencin
576520659c
Merge pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations
...
added uniquness validator and index on user_projects and user_teams r…
2019-02-27 19:53:25 +01:00
Miha Mencin
51b3aea49a
added uniquness validator and index on user_projects and user_teams relations
...
finxing typo, fixied failing test
fixing mistakenly commited file
fixing schema to include bigint migration
2019-02-27 15:09:47 +01:00
Anton Ignatov
a6666c688c
Adding check for user tutorial
2019-02-27 13:55:46 +01:00
Oleksii Kriuchykhin
74a60d443d
Merge branch 'features/global-activities' into ok_SCI_3014_v2
2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin
a0d2f7c676
Move templates project creation for new team to delayed job [SCI-3101]
2019-02-26 13:32:00 +01:00
Oleksii Kriuchykhin
61147b480c
Add main global activities bussiness logic [SCI-3014]
2019-02-26 11:01:15 +01:00
Urban Rotnik
5a123d26ac
Activity model update
2019-02-26 07:15:05 +01:00
Urban Rotnik
3ad6cee766
Fix tests, remove nullable field
2019-02-25 16:50:38 +01:00
Urban Rotnik
5b5c6c7122
Changes to Activity model
2019-02-25 16:49:55 +01:00
Jure Grabnar
f9cb8c8803
Add utc conversion to due_date
2019-02-22 10:47:39 +01:00
Jure Grabnar
87dcf301fb
Change due_date calculation to DateTime#end_of_day
2019-02-22 10:23:12 +01:00
Jure Grabnar
96f2da1e8b
Shift due day calculations for 1 day
...
Closes SCI-3069.
2019-02-22 08:01:15 +01:00
Miha Mencin
bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-21 16:38:58 +01:00
aignatov-bio
5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] ( #1513 )
...
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
2019-02-21 16:15:13 +01:00
aignatov-bio
5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-20 17:22:57 +01:00
Urban Rotnik
82ea31e275
Add validation limits for system notification fields
2019-02-20 16:05:15 +01:00
Urban Rotnik
7b6c6c414d
Merge branch 'master' into features/templates
2019-02-19 14:46:15 +01:00
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-19 13:51:18 +01:00
Urban Rotnik
f63eaaefe7
Add user_system_notification records when syncing notifications, update email sending
2019-02-19 11:22:58 +01:00
Urban Rotnik
29d77ca81d
Add system_notification sending email feature
2019-02-19 11:20:25 +01:00
aignatov-bio
8e905b67b2
System notification navbar menu drop down [SCI 2955] ( #1498 )
...
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
2019-02-19 11:08:59 +01:00
aignatov-bio
c598541e09
System notification modal window [SCI-2957 and SCI-2958] ( #1484 )
...
* Added new system notification modal
* Adding loading system notification on sign in
2019-02-15 13:07:29 +01:00
Alex Kriuchykhin
185e3b4832
Merge pull request #1495 from okriuchykhin/ok_SCI_3039
...
Create templates project when syncing templates if team doesn't have it [SCI-3039]
2019-02-14 17:40:01 +01:00
Mojca Lorber
343a46584f
Rename scope
2019-02-14 14:54:04 +01:00
Mojca Lorber
0e14c126e5
Add scope instead of method for active my_module_group
2019-02-14 10:53:48 +01:00
Urban Rotnik
9f3187abdf
Add service for sync system notifications
2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin
da30d187a6
Create templates project when syncing templates if team doesn't have it [SCI-3039]
2019-02-13 15:17:33 +01:00
mlorb
71e4cc4dbd
Merge branch 'master' into ml-sci-2940
2019-02-13 14:35:03 +01:00
Mojca Lorber
0adb8b2b61
Fix failing tests
2019-02-13 14:31:26 +01:00
aignatov-bio
5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] ( #1482 )
...
* System notification view and notification partial (SCI 2956 and SCI 3001)
2019-02-13 13:06:14 +01:00
Oleksii Kriuchykhin
fdff69f22e
Add comment for Tika start up code [SCI-2967]
2019-02-07 11:06:25 +01:00
Oleksii Kriuchykhin
13c4bd25af
Optionally disable Tika background mode through env variable [SCI-2967]
2019-02-04 16:47:29 +01:00
mz3944
a315808d58
Merge pull request #1473 from mz3944/mz-SCI-2918
...
In html project export there is formula instead of result in table [SCI-2918]
2019-02-01 04:49:14 +01:00
Urban Rotnik
8ebb7561d9
Add last_time_changed_at columnd to SystemNotifications
2019-01-31 16:44:20 +01:00
Matej Zrimšek
ac78c7d21b
Process Handsontable formulas in project HTML files in team export [SCI-2918]
2019-01-31 07:39:17 +01:00
Urban Rotnik
6f7fcb0831
Refactor method clone_experiment_as_template
into service object
...
[SCI-2925]
2019-01-31 07:13:40 +01:00
Oleksii Kriuchykhin
cc92de3726
Merge latest features/templates [SCI-2939]
2019-01-30 10:43:54 +01:00
Urban Rotnik
3e2c9934d0
Add SystemNotification model
...
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
2019-01-29 11:40:26 +01:00
Urban Rotnik
4cf12d12d1
Refactor 'move_experiment' method into service object
...
Jira Ticket: SCI-2926
2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin
05edfae766
Fix failing tests [SCI-2939]
2019-01-25 14:13:00 +01:00
Urban Rotnik
247bae8a9f
Refactor export_all_counter increasing/reseting logic
...
- Remove daily task
- Add method to user Model
2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin
bd2efa55ac
Add templates business logic [SCI-2939]
2019-01-25 10:55:08 +01:00
Mojca Lorber
fa1dff6352
refactor Demo project generation
2019-01-24 13:40:53 +01:00
mz3944
f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903
...
Fix (unite) Date and Time display formats [SCI-2903]
2019-01-21 09:50:34 +01:00
Urban Rotnik
f1d59e65f3
Add module and rename service object
2019-01-18 16:56:33 +01:00
Urban Rotnik
47cc6a9d10
Refactor workflow_image_generation and move to service class
2019-01-18 16:56:33 +01:00
Urban Rotnik
686f10cbd0
Refactor instance method 'ordered_modules' to scope
2019-01-18 16:56:33 +01:00
Urban Rotnik
1b70f42817
Refactor 'Experiment.modules_without_group' to Module's scope
2019-01-18 16:54:00 +01:00
Oleksii Kriuchykhin
e62e1873b0
Fix issue with caching in inventories dropdown [SCI-2776]
2019-01-17 15:04:20 +01:00
Oleksii Kriuchykhin
4f9eb7e165
Fix binary files in Export All archive [SCI2950]
2019-01-16 17:07:05 +01:00
Oleksii Kriuchykhin
534866467b
Add counters to task inventories dropdown [SCI-2776]
2019-01-03 14:11:00 +01:00
Matej Zrimšek
b74105abc2
Fix Date and Time display formats
2018-12-23 20:30:09 +01:00
Luka Murn
1c8407e4f4
Merge pull request #1433 from okriuchykhin/ok_SCI_2864
...
Additional fix for export all S3 path [SCI-2864]
2018-12-20 13:27:50 +01:00
Oleksii Kriuchykhin
2fa4f42883
Additional fix for export all S3 path [SCI-2864]
2018-12-20 13:22:56 +01:00
Luka Murn
faf6601962
Merge pull request #1432 from okriuchykhin/ok_SCI_2864
...
Fix S3 zip exports path [SCI-2864]
2018-12-20 11:08:48 +01:00
Oleksii Kriuchykhin
c880f3fd84
Fix S3 zip exports path [SCI-2864]
2018-12-20 11:07:19 +01:00
Luka Murn
8935e4c7c1
Merge pull request #1426 from Ducz0r/lm-add-queue-to-export-all-jobs
...
Add team_zip_export job queue to export all delayed jobs
2018-12-16 22:16:10 +01:00
Alex Kriuchykhin
abdf64a8c7
Merge pull request #1420 from okriuchykhin/ok_SCI_2894
...
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
2018-12-16 19:44:50 +01:00
Luka Murn
7ba9628cfb
Add team_zip_export job queue to export all delayed jobs
2018-12-13 18:40:56 +01:00
Oleksii Kriuchykhin
311189a2e9
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
2018-12-13 11:18:09 +01:00
Luka Murn
3d7b633c25
Hound is love, Hound is life
2018-12-12 14:03:16 +01:00
Luka Murn
24af108e98
Change PDF in export all to HTML
2018-12-12 11:15:16 +01:00
Alex Kriuchykhin
51ba74cbab
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
...
Enable caching for navigation sidebar [SCI-2757]
2018-12-10 14:11:05 +01:00
Matej Zrimšek
9480234682
Show all smart annotations when they contain special characters [SCI-2816]
2018-12-09 11:15:31 +01:00
Alex Kriuchykhin
9621f0b372
Merge pull request #1408 from okriuchykhin/ok_SCI_2802
...
Search for IDs on inventory table as text [SCI-2802]
2018-12-03 11:39:57 +01:00
Oleksii Kriuchykhin
2c0927b254
Search for IDs on inventory table as text [SCI-2802]
2018-11-30 15:32:01 +01:00
Oleksii Kriuchykhin
bf3c7e7840
Fix search across reports, search all readable projects [SCI-2823]
2018-11-30 11:46:13 +01:00
Oleksii Kriuchykhin
e43b366cdb
Disable fragment caching
2018-11-29 18:07:31 +01:00
Oleksii Kriuchykhin
60a19734b2
Enable caching for navigation sidebar [SCI-2757]
2018-11-29 11:28:36 +01:00
Alex Kriuchykhin
c3ef391641
Merge pull request #1380 from okriuchykhin/ok_SCI_2869
...
Prevent user being added to project/task multiple times [SCI-2869]
2018-11-20 22:38:38 +01:00
mz3944
6b996fc000
Merge pull request #1362 from mz3944/mz-SCI-2817
...
Export - various small changes/fixes [SCI-2817]
2018-11-20 21:32:47 +01:00
Oleksii Kriuchykhin
5deaf25fd9
Prevent user being added to project/task multiple times [SCI-2869]
2018-11-20 14:29:33 +01:00
Alex Kriuchykhin
a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830
...
Refactor result and step comments [SCI-2830]
2018-11-20 00:13:15 +01:00
Alex Kriuchykhin
d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
...
Add time format selection to settings [SCI-2778]
2018-11-19 10:17:09 +01:00
Matej Zrimšek
dea4ed4e15
Add model name to the archive folders in export-all ZIP structure [SCI-2817]
2018-11-19 04:46:33 +01:00
Luka Murn
e9c0b34662
Merge branch 'core-api' into 'master'
...
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
Oleksii Kriuchykhin
537de596a7
Merge latest master [SCI-2778]
2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin
380a96dcce
Add caching for step and result fragments [SCI-2830]
2018-11-14 11:57:53 +01:00
mz3944
056efe170b
Merge pull request #1358 from mz3944/mz-SCI-2646
...
Removal of the temporary files for export all [SCI-2646]
2018-11-13 20:31:04 +01:00
Luka Murn
84df2c81f9
Merge branch 'features/export-all'
...
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
Matej Zrimšek
2a5b36b3c2
Fix index/position for export-all folder names [SCI-2817]
2018-11-09 01:21:30 +01:00
Matej Zrimšek
6ff117d662
Fix path creation and construction for export-all [SCI-2817]
2018-11-09 00:44:17 +01:00
Matej Zrimšek
f23160ba6d
Refactor logic for handling model path in export-all [SCI-2817]
2018-11-08 23:23:23 +01:00
Matej Zrimšek
58b2310d26
Add archived models in corresponding archive directory [SCI-2817]
2018-11-08 23:21:25 +01:00
Matej Zrimšek
efb4e0c549
Change indexing in task names in export-all PDF [SCI-2817]
2018-11-08 21:48:09 +01:00
Matej Zrimšek
dc91be3749
Preserve task order from project sidebar in export-all file structure [SCI-2817]
2018-11-08 21:48:09 +01:00
Matej Zrimšek
08396b2101
Make folder and file names more readable for export-all ZIP [SCI-2817]
2018-11-08 21:48:09 +01:00
Matej Zrimšek
d65fcdc312
Change datetime to human friendly format for ZIP exports [SCI-2817]
2018-11-08 21:48:09 +01:00
Matej Zrimšek
159f6d1ee2
Minor refactoring of exports [SCI-2646]
2018-11-08 21:39:09 +01:00
Matej Zrimšek
b7fdd82409
Ensure temp files deletion after export is done [SCI-2646]
2018-11-08 21:32:07 +01:00
mlorb
4d156080ac
fix empty projects page bug and projects tree bug
2018-11-07 13:45:46 +01:00
Oleksii Kriuchykhin
82a11ebca2
Remove duplicate destroy for report [SCI-2834]
2018-11-07 09:55:06 +01:00
Matej Zrimšek
2f6a6072e1
Fix repository ZIP export test to work with enabled workers [SCI-2646]
2018-11-07 06:14:40 +01:00
Matej Zrimšek
8fe0249f45
Fix test for repository ZIP export & return path for ZIP exports [SCI-2646]
2018-11-07 05:04:29 +01:00
Oleksii Kriuchykhin
0e192cc830
Ensure that temporary report is always deleted [SCI-2834]
2018-11-06 09:33:18 +01:00
Matej Zrimšek
ee611a45d9
Also remove temp file after other types of ZIP export generation [SCI-2646]
2018-11-04 01:39:16 +01:00
Matej Zrimšek
5defbdd76e
Remove temp files after export-all ZIP generation [SCI-2646]
2018-11-04 01:33:50 +01:00
Oleksii Kriuchykhin
daaeb385bb
Fix permission helpers in delayed export job [SCI-2834]
2018-10-30 14:04:01 +01:00
Alex Kriuchykhin
c1d853f7bd
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
...
Fix issue with project dropdown caching [SCI-2783]
2018-10-29 10:56:02 +01:00
mz3944
d733f4e357
Merge pull request #1346 from mz3944/mz-SCI-2787
...
In project list table table is not updated when archiving/restoring project [SCI-2787]
2018-10-28 14:36:17 +01:00
Oleksii Kriuchykhin
9ad2718f32
Fix project index endpoint permission bug [SCI-2818]
2018-10-26 16:46:01 +02:00
Alex Kriuchykhin
802290df8b
Merge pull request #1343 from okriuchykhin/ok_SCI_2826
...
Skip missing files in assets [SCI-2826]
2018-10-26 14:23:23 +02:00
Alex Kriuchykhin
f581829357
Merge pull request #1339 from okriuchykhin/ok_SCI_2804
...
Fix relative links to files in export all PDF [SCI-2804]
2018-10-26 10:57:04 +02:00
Oleksii Kriuchykhin
641d74829a
Fix issue with project dropdown caching [SCI-2783]
2018-10-24 17:52:40 +02:00
Oleksii Kriuchykhin
744ad5b196
Skip missimg files in assets [SCI-2826]
2018-10-24 14:58:59 +02:00
Oleksii Kriuchykhin
990d3a34ca
Fix link to inventory CSV file [SCI-2804]
2018-10-24 12:59:04 +02:00
Matej Zrimšek
18e52e2c6f
Fix fetching all user projects [SCI-2787]
2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin
83566cc9d5
Fix relative links to files in export all PDF [SCI-2804]
2018-10-19 16:25:43 +02:00
Oleksii Kriuchykhin
02f536cd08
Merge latest features/export-all [SCI-2733]
2018-10-16 17:20:19 +02:00
Jure Grabnar
c13e7531ea
Change generate_team method name
2018-10-16 11:13:01 +02:00
Jure Grabnar
d50f56e319
Disable/enable export proejct button
...
Fix filesystem saving
2018-10-16 11:01:58 +02:00
Jure Grabnar
6b47165ac1
Fix formatting according to Houndbot
2018-10-16 11:00:38 +02:00
Jure Grabnar
2558b7a313
Fix formatting according to HoundBot
2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98
Add export project modal
...
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Jure Grabnar
b9bb0db62d
Merge pull request #1314 from mz3944/mz-SCI-2752
...
Render SciNote tables within exported PDF as using HTML Tables [SCI-2752]
2018-10-15 10:03:42 +02:00
Jure Grabnar
ab71471a49
Fix inventories attachment/CSV file path
2018-10-15 08:55:00 +02:00
Matej Zrimšek
ef5bf42fc2
Refactor table styling for export all PDF; remove 'min-width' from table cells to also display bigger tables nicely
2018-10-15 08:00:04 +02:00
Matej Zrimšek
7fe6837206
Style tables in export all PDF (in same way as in PDF reports) [SCI-2752]
2018-10-15 07:59:28 +02:00
Matej Zrimšek
97e6fe34a1
Add unstyled tables to the export all PDF [SCI-2752]
2018-10-15 07:58:44 +02:00
Matej Zrimšek
46da1e6b7d
Fix handling relative URLs in export all PDF after rebase; minor refactoring [SCI-2641]
2018-10-15 07:13:41 +02:00
Matej Zrimšek
9fb5520970
Refactor/match exported filenames in export all PDF [SCI-2641]
2018-10-15 05:54:19 +02:00
Matej Zrimšek
17380ba0ca
Refactoring rebased code [SCI-2641]
2018-10-15 01:12:25 +02:00
Matej Zrimšek
1bf16537f6
Add PDF content to the export all ZIP [SCI-2641]
2018-10-14 23:56:10 +02:00
Matej Zrimšek
48a6a64502
Move PDF generation and export logic of export all PDF to the model
2018-10-14 22:52:54 +02:00
Oleksii Kriuchykhin
1cafbd8c50
Move generic code to Viewable Concern [SCI-2733]
2018-10-12 16:14:24 +02:00
Oleksii Kriuchykhin
f221d71bbc
Fix datatables state restore [SCI-2733]
2018-10-12 15:15:43 +02:00
Matej Zrimšek
e242e9a516
Refactor export all PDF content generation [SCI-2641]
2018-10-12 07:40:22 +02:00
Matej Zrimšek
a16d16bc5b
Move export all report business logic to model [SCI-2641]
2018-10-12 07:40:21 +02:00
Matej Zrimšek
5ce94b5ecd
Remove dynamically created export all report after it's no longer needed
2018-10-12 07:40:21 +02:00
Matej Zrimšek
b15cc66b2f
Add export project PDF for dummy project
2018-10-12 07:40:21 +02:00
Oleksii Kriuchykhin
af02f29fb5
Implement user state saving for projects overview [SCI-2733]
2018-10-10 16:15:31 +02:00
Jure Grabnar
d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure
...
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin
0c452f519d
Add CRUD endpoints for inventory cells [SCI-2765]
2018-10-05 00:18:42 +02:00
Jure Grabnar
553ac4c360
Refactor code according to PR review
...
PR review: https://github.com/biosistemika/scinote-web/pull/1304
Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
2018-09-30 16:37:18 +02:00
Oleksii Kriuchykhin
2508394924
Refactor Projects view - cards view [SCI-2730]
2018-09-27 10:43:44 +02:00
Alex Kriuchykhin
112343e65d
Merge pull request #1311 from okriuchykhin/ok_SCI_2738
...
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
2018-09-25 11:49:19 +02:00
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663
...
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
2018-09-24 16:23:28 +02:00
Jure Grabnar
6106904460
Format according to Houndbot #5
2018-09-23 12:07:53 +02:00
Jure Grabnar
90b220ddda
Format according to Houndbot #4
2018-09-23 12:06:06 +02:00
Jure Grabnar
970341e7d7
Format according to Houndbot #3
2018-09-23 11:56:23 +02:00
Jure Grabnar
a3d7d37081
Format according to Hound bot #2
2018-09-23 11:30:20 +02:00
Jure Grabnar
64a6ed7ffe
Format according to houndbot
2018-09-23 11:14:59 +02:00
Oleksii Kriuchykhin
7f7ece2be0
Improve delayed jobs for TempFile deletion and Asset text extraction [SCI-2738]
2018-09-21 17:46:18 +02:00
Oleksii Kriuchykhin
84428b37c2
Add project view JSON endpoints [SCI-2728]
2018-09-21 10:39:20 +02:00
Oleksii Kriuchykhin
4ee9eb3134
Improve search speed on files and inventories [SCI-2739]
2018-09-17 17:06:47 +02:00
Jure Grabnar
d40096f663
Remove typo and add hyperlink to inventories
2018-09-16 23:45:38 +02:00
Jure Grabnar
f8b1db7f72
Fix repository export and relative hyperlinks
2018-09-16 23:01:44 +02:00
Jure Grabnar
06eaafd118
Suffix should append to basename first and then extension
2018-09-16 20:57:37 +02:00
Jure Grabnar
449aa12070
Refactor TeamZipExport code (move it into special file)
2018-09-16 20:28:26 +02:00
Oleksii Kriuchykhin
49e788a9ad
Mergre latest core-api [SCI-2515]
2018-09-14 10:24:05 +02:00
Luka Murn
cbb5bda7fe
Hound is love, Hound is life
2018-09-05 16:42:15 +02:00
Luka Murn
586a442abc
Refactor the settings page, rename setting to tooltips_enabled
2018-09-05 16:36:32 +02:00
Zanz2
384371802c
fixes travis
2018-08-31 13:12:34 +02:00
Zanz2
1bed2c2a3c
Partially fixed according to pull request review, added comments to code review
2018-08-31 12:11:51 +02:00
Jure Grabnar
93bd461a83
Generate table.csv
2018-08-29 00:31:11 +02:00
Jure Grabnar
01d48cf679
Add suffixes to all names
2018-08-29 00:21:17 +02:00
Jure Grabnar
4b0357b392
Add export of Inventories and their assets
2018-08-28 23:22:55 +02:00
Oleksii Kriuchykhin
c86063f79e
Fix failing tests [SCI-2688]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
c8efa4bffc
Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689]
2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin
490376513b
Add inventory item CREATE endpoint [SCI-2687]
2018-08-24 15:36:19 +02:00
Oleksii Kriuchykhin
c8abb3d9b8
Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686]
2018-08-24 15:27:59 +02:00
Jure Grabnar
295c6a9432
Add export all functionality (basic skeleton)
2018-08-21 21:07:45 +02:00
Zanz2
beb1d02914
Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always
2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin
ecde634a2c
Add OAuth2 provider [SCI-2515]
2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin
6c59e1e159
Fix failing tests [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-08 17:01:49 +02:00
okriuchykhin
3503eb775b
Merge pull request #1254 from okriuchykhin/ok_SCI_2601
...
Fix files search results display [SCI-2601]
2018-08-02 11:53:02 +02:00
Oleksii Kriuchykhin
563005cf89
Fix files search results display [SCI-2601]
2018-07-26 09:55:18 +02:00
Oleksii Kriuchykhin
0e372af729
Adds API authentication with Azure AD [SCI-2608]
2018-07-24 14:21:33 +02:00
Zanz2
887ddbfce3
Merge pull request #1229 from Zanz2/unify_match_case_sci1324
...
Fix protocol names are case insensitive unique [SCI-1324]
2018-07-17 08:22:03 +02:00
zmagod
e654725d9e
fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511]
2018-07-06 14:26:20 +02:00
Zanz2
8e42dba7de
Found the fix
2018-07-03 08:20:56 +02:00
zmagod
db1944cc90
move maximum file size limit to an ENV variable [fixes SCI-2415]
2018-06-19 14:15:14 +02:00
zmagod
ed39294733
removes duplicated keywords [fixes SCI-2294]
2018-06-18 12:15:52 +02:00
Oleksii Kriuchykhin
e10ed86fa1
Remove result validation [SCI-2376]
2018-06-13 14:06:55 +02:00
zmagod
f8ac083d39
adds an additional check if some other user has added/removed repository columns [fixes SCI-2408]
2018-06-12 15:28:03 +02:00
Zmago Devetak
eff68aead8
Merge pull request #1193 from ZmagoD/zd_SCI_2481_
...
fixes project validation message [fixes SCI-2481]
2018-06-08 14:40:27 +02:00
Zmago Devetak
74ccaf06b9
Merge pull request #1184 from ZmagoD/zd_SCI_2417
...
adds asset_text_data to global search options
2018-06-08 14:30:52 +02:00
zmagod
11ebea573a
fixes project validation message [fixes SCI-2481]
2018-06-07 16:42:11 +02:00
zmagod
2def874ffd
fixes project duplication [fixes SCI-2486]
2018-06-05 09:44:03 +02:00
Oleksii Kriuchykhin
8de0e282e3
Fix project_tree for non admin users [SCI-2478]
2018-06-01 16:38:49 +02:00
Oleksii Kriuchykhin
2ddc0fb561
Improve sidebar rendering performance [SCI-2478]
2018-06-01 13:49:02 +02:00
zmagod
3da098cb60
fixes the issue with extraction of text from file [fixes SCI-2417]
2018-05-31 09:42:57 +02:00
Luka Murn
68f5a6bebd
Fix inventory rows without files not being saved bug
...
Closes SCI-2471.
2018-05-30 14:41:20 +02:00
Oleksii Kriuchykhin
6cf9149baa
Add user id tracking when discarding repository [SCI-2462]
2018-05-29 15:33:02 +02:00
Zmago Devetak
147e74b4a5
Merge pull request #1164 from ZmagoD/zd_SCI_2448
...
adds discard gem, move deletion of repositories in a rake task to run…
2018-05-28 15:04:54 +02:00
zmagod
bbbe06e491
fixes reports index for guest users
2018-05-24 15:28:54 +02:00
zmagod
1f8db7bc49
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340
2018-05-24 15:00:59 +02:00
zmagod
b13e39a0d9
adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448]
2018-05-24 14:39:25 +02:00
zmagod
ba2aafae39
fix access to public reports [fixes SCI-2340]
2018-05-21 14:45:18 +02:00
Zmago Devetak
2ac04ee476
Merge pull request #1150 from ZmagoD/zd_SCI_2426
...
migrations that fixes the bug with smart annotations [fixes SCI-2426]
2018-05-21 14:15:47 +02:00
zmagod
b8098093ee
migrations that fixes the bug with smart annotations [fixes SCI-2426]
2018-05-18 13:57:52 +02:00
Luka Murn
5e90ae7383
Remove uneccesary save when setting notification settings on user
...
These methods should behave as the rest of setters on
ActiveRecords, ergo setting the model state, but not saving it.
The save is called at the end of the action inside the controller
anyway, so this save is redundant.
2018-05-18 13:43:04 +02:00
zmagod
b125863baf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71
fixes typos, fixes pdf rendering
2018-05-17 11:21:34 +02:00
zmagod
4573655ec8
adds save PDF report to inventory feature [fixes SCI-2371]
2018-05-16 09:31:19 +02:00
Oleksii Kriuchykhin
39d594b0da
Disable some validations in repository import to improve speed [SCI-2404]
2018-05-15 11:14:43 +02:00
Zmago Devetak
0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261
...
propagate assigned repository items in workflow [fixes SCI-2261]
2018-05-10 09:57:49 +02:00
Zmago Devetak
d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323
...
sign_out user after 7 days [fixes SCI-2323]
2018-05-03 14:36:44 +02:00
Zmago Devetak
19d5c687ef
remove unneeded :rememberable module
2018-05-03 14:35:59 +02:00
Zmago Devetak
4fe4fea4fc
Merge pull request #1122 from ZmagoD/zd_SCI_2339
...
repository when sorting/searching bug fix [SCI-2339]
2018-05-03 12:05:39 +02:00
zmagod
0584453575
fixes per @okriuchykhin 's request
2018-04-26 17:18:03 +02:00
zmagod
8dac887f10
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261
2018-04-26 14:18:41 +02:00
zmagod
24acd5c779
fixes per @duco 's request
2018-04-26 14:13:46 +02:00
Luka Murn
cb6fe50832
Merge branch 'master' into ux-release-1
...
Conflicts:
app/assets/javascripts/repositories/index.js
2018-04-26 11:38:54 +02:00
zmagod
23f8f35a2c
a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339]
2018-04-26 11:05:02 +02:00
Luka Murn
cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix
...
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
2018-04-25 12:37:27 +02:00
zmagod
199a2a23bf
fixes per @mlorb 's request
2018-04-23 12:26:21 +02:00
Luka Murn
d023db16af
Update the destroy_column action so it properly updates all states
2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e
Refactor all the methods into two new services
2018-04-20 12:31:22 +02:00
Luka Murn
d8ca42aa0c
Refactor repository_table_state and its class methods
2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc
Change default repository state to Ruby representation
...
Also remove some dead code from repositories datatables
2018-04-20 12:31:22 +02:00
zmagod
c23eacfe13
fixes for_admin action/ test visible_by functlion
2018-04-19 12:41:00 +02:00
zmagod
9d282d1800
adds new reports index page [fixes SCI-2124]
2018-04-18 16:47:52 +02:00
Luka Murn
9bf8b5d864
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
...
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
2018-04-12 13:16:46 +02:00
zmagod
024032faff
refactor update protocol keywords action [fixes SCI-2257]
2018-04-06 15:41:50 +02:00
zmagod
6e255a4657
fixes failing specs
2018-04-04 14:44:32 +02:00
zmagod
e630d3113f
add ID column to repository [fixes SCI-2206]
2018-04-04 11:55:11 +02:00
Oleksii Kriuchykhin
e42fc3117b
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-26 13:19:09 +02:00
Zmago Devetak
75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068
...
Write server-side endpoints for custom repositories [SCI-2068]
2018-03-20 14:30:47 +01:00
okriuchykhin
d906baff61
Merge pull request #1039 from okriuchykhin/ok_SCI_1697
...
Improve connections between repository models [SCI-1697]
2018-03-19 16:42:55 +01:00
Oleksii Kriuchykhin
a105e61d48
Remove tutorial [SCI-1860]
2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin
9371d77762
Improve connections between repository models [SCI-1697]
2018-03-16 13:12:33 +01:00
zmagod
fad4001273
fix edit row action
2018-03-16 12:27:19 +01:00
Oleksii Kriuchykhin
27a605d974
Fix failing test [SCI-2148][SCI-2149]
2018-03-16 11:05:38 +01:00
zmagod
1cdba5e0d3
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068
2018-03-16 11:05:16 +01:00
zmagod
d69754af04
implement search on list items dropdown, update, create actions [fixes SCI-2070]
2018-03-15 15:43:16 +01:00
zmagod
b67a54e2d1
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import
2018-03-13 15:25:57 +01:00
okriuchykhin
503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025
2018-03-13 14:44:20 +01:00
zmagod
dd2f7dd417
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
2018-03-13 13:24:36 +01:00
Oleksii Kriuchykhin
269f7d74fa
Add explicit ordering to samples_tables [SCI-2148][SCI-2149]
2018-03-13 13:16:34 +01:00
okriuchykhin
262c21d145
Merge pull request #1036 from okriuchykhin/ok_SCI_2078
...
Implement importable selector for repository columns [SCI-2078]
2018-03-13 13:14:53 +01:00
Oleksii Kriuchykhin
be1ead22e0
Implement importable selector for repository columns [SCI-2078]
2018-03-13 11:36:05 +01:00
Oleksii Kriuchykhin
21c07371c9
Fix repository export to support file columns [SCI-2079]
2018-03-13 10:40:27 +01:00
mlorb
34f5c2c7ac
fix validation in asset model and change formatted method in repository_asset_value model
2018-03-12 10:50:45 +01:00
mlorb
64e26e1c60
add file custom column type to db
2018-03-09 17:04:54 +01:00
Oleksii Kriuchykhin
e4d974aa58
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
2018-03-09 15:34:06 +01:00
zmagod
4f951f6679
adds unit specs for datatable service [fixes SCI-2068]
2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin
1765d83cd1
Refactor search to support repository list items [SCI-2108]
2018-03-09 11:05:43 +01:00