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
zmagod
26883af386
fix assigned ordering
2018-03-08 17:36:10 +01:00
zmagod
fb66131e29
setup endpoint for repository_rows paging/search
2018-03-06 16:32:39 +01:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011
...
Wrapping up the permissions [SCI-2011]
2018-03-06 07:10:40 +01:00
zmagod
fca01bd54f
refactor repository export [fixes SCI-2025]
2018-03-05 15:54:04 +01:00
Zmago Devetak
50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066
...
add info modal for repository items [fixes SCI-2066]
2018-03-05 12:49:29 +01:00
zmagod
0996745781
refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024]
2018-03-02 13:39:22 +01:00
mlorb
08439e7f58
sign up with linkedIn account
2018-02-28 18:12:21 +01:00
Matej Zrimšek
b8b9707c06
Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.
2018-02-19 14:51:14 +01:00
Matej Zrimšek
321ddc2916
Grouped existing project permissions and used 'canaid' gem.
2018-02-14 13:09:45 +01:00
zmagod
36595d33f4
fix name scope
2018-02-12 09:09:56 +01:00
zmagod
d12f8403e4
add reference to repository column
2018-02-12 09:05:41 +01:00
zmagod
ae99c92516
follow @okriuchykhin 's suggestions
2018-02-09 16:28:21 +01:00
zmagod
557aeca049
refactor relations
2018-02-09 14:11:56 +01:00
zmagod
7c13c5a1f4
fixes typo, follows @okriuchykhin 's suggestions
2018-02-09 11:38:52 +01:00
zmagod
6b7ff11bcf
setup models for repository list column [fixes SCI-2015]
2018-02-07 15:28:28 +01:00
Oleksii Kriuchykhin
16e1d072b9
Improve files handling in protocol clonning [SCI-2003]
2018-02-01 15:44:08 +01:00
mlorb
775b8b3201
fix bug with ajax error caused to the other user when deleting column in custom repository
2018-01-29 16:01:33 +01:00
zmagod
f8a3fca2db
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin
819febb05b
Remove skip_on_import from repository_cell [SCI-1939]
2018-01-17 12:54:32 +01:00
Oleksii Kriuchykhin
a64012237e
Fix repository records import [SCI-1939]
2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin
2ddb0ea009
Improve XLSX parsing with Roo [SCI-1915]
2018-01-11 17:52:57 +01:00
zmagod
862b73cae7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866
2018-01-05 09:13:43 +01:00
okriuchykhin
e49ffb61d4
Merge pull request #914 from okriuchykhin/ok_SCI_1873
...
Fix repositories [SCI-1873]
2018-01-04 13:33:30 +01:00
Oleksii Kriuchykhin
66869fe4cf
Fix canvas update [SCI-1871]
2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin
512ee07bde
Fix repositories [SCI-1873]
2017-12-19 17:53:45 +01:00
Luka Murn
cf291bf887
Merge branch 'gilson-iot-rails4'
...
Conflicts:
Gemfile.lock
2017-12-19 10:56:39 +01:00
zmagod
219ef3baf6
setup new pagination for activities
2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin
6256acdfea
Rename notifications settings accessor [SCI-1864]
2017-12-07 13:59:33 +01:00
Zmago Devetak
027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651
...
export and import RTE images
2017-11-24 16:28:28 +01:00
Zmago Devetak
3cd7e6fdde
fix open method
2017-11-24 15:19:58 +01:00
mlorb
9e7b75a880
Merge pull request #892 from mlorb/ml-sci-1215_v2
...
Make background gray for paperclip images [SCI-1215]
2017-11-23 17:32:09 +01:00
Mojca Lorber
0ffe476a54
make background gray for paperclip images
2017-11-23 14:35:42 +01:00
Luka Murn
00fe267a2a
Minor codestyle fixes
2017-11-23 11:33:39 +01:00
Mojca Lorber
fe5828fa97
add copying of TinyMce assets when cloning the protocol
2017-11-22 16:47:21 +01:00
zmagod
91fec89cab
adds tiny_mce_assets to protocol export
2017-11-21 16:30:48 +01:00
Luka Murn
d715eb06ef
Add team & project role-related helper functions to User model
...
This will be required later once we start using Canaid.
2017-11-16 15:50:30 +01:00
Oleksii Kriuchykhin
f202687291
Allow import of the sample with missing non mandatory fields [SCI-1819]
2017-11-15 16:40:14 +01:00
Oleksii Kriuchykhin
84f4aba213
Pull latest master into gilson-iot-rails4
2017-11-15 15:15:26 +01:00
Mojca Lorber
f75a2710d5
fix preview for images with transparent background
2017-11-13 18:03:14 +01:00
zmagod
e0b6683a44
create view directory per @Ducz0r 's request
2017-11-09 10:06:53 +01:00
zmagod
e0323a0a46
fixes failing tests
2017-10-27 09:35:39 +02:00
zmagod
3d22a5404d
add scenic gem, teams datatables sql view
2017-10-26 16:59:00 +02:00
Luka Murn
82f982e983
Merge branch 'rails-5.1' into decoupling-settings-page
...
Conflicts:
Gemfile
Gemfile.lock
2017-10-23 10:59:10 +02:00
Luka Murn
6c2c5aff17
Additional fixes required by latest merge from master
2017-10-23 09:51:13 +02:00
Luka Murn
8254153bb9
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
app/models/connection.rb
app/models/experiment.rb
app/models/my_module.rb
2017-10-23 08:57:57 +02:00
okriuchykhin
8e90e041b9
Merge pull request #825 from okriuchykhin/ok_SCI_1665
...
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-17 17:26:00 +02:00
Oleksii Kriuchykhin
c8d2ae70fa
Move duplicated code to service [SCI-1665]
2017-10-17 14:46:16 +02:00
zmagod
6fe48a07ae
fix hound, add custom hook for webpacker:compile
2017-10-16 17:02:35 +02:00
zmagod
c5978f2d86
adds cucumber test for profile page [fixes SCI-1572]
2017-10-16 16:21:52 +02:00
Oleksii Kriuchykhin
d266034406
Use case insensitive sample types and groups in import [SCI-1689]
2017-10-13 17:15:51 +02:00
Oleksii Kriuchykhin
56f52ebfa7
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-12 14:43:25 +02:00
Oleksii Kriuchykhin
9a8e33c6d7
Small fixes [SCI-1642]
2017-10-11 17:24:31 +02:00
Oleksii Kriuchykhin
6820511ea0
Further canvas optimizations [SCI-1642]
2017-10-06 12:43:27 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +02:00
zmagod
c20f0c2d8a
fixes user_controller specs, adds user model specs for settings
2017-10-05 15:53:05 +02:00
zmagod
a020e23286
follow suggestions of @Ducz0r
2017-10-05 13:56:56 +02:00
zmagod
cb4bacc372
refactor preferences page [fixes SCI-1564]
2017-09-28 16:53:51 +02:00
zmagod
c8c8afdd1d
update react-bootstrap
2017-09-28 15:00:54 +02:00
zmagod
26b526d61b
adds getter and setters for user settings
2017-09-27 14:38:52 +02:00
zmagod
e2aa0d7515
fixes user profile
2017-09-26 17:29:11 +02:00
Luka Murn
e078ae4f77
Merge branch 'rails-5.1' into decoupling-settings-page
2017-09-21 08:36:09 +02:00
Luka Murn
beae1b05d8
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
2017-09-21 08:27:38 +02:00
Mojca Lorber
0e14420193
fix bugs with importing samples
2017-09-06 14:41:14 +02:00
zmagod
9c01ab414c
refactor leave team
2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin
fc0e2d2172
Add validation for uid uniqness [GIOT-29]
2017-09-01 17:00:13 +02:00
Oleksii Kriuchykhin
c3fceb90df
Backport API to Rails-4 [SCI-1579]
2017-08-30 13:30:41 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
zmagod
db16da7bd6
adds custom query to fetch teams data
2017-08-25 16:07:37 +02:00
zmagod
c5e32c4ea0
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch
2017-08-21 09:52:14 +02:00
Luka Murn
ec7b7ffe08
You are my sunshine, my only sunshine,
...
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
2017-08-10 14:42:58 +02:00
Luka Murn
9227ea5854
Finish the user settings jsonb, also fix references throughout app
...
Closes SCI-1475.
2017-08-10 14:29:01 +02:00
Luka Murn
c62002381b
Add default settings migration and concern
2017-08-10 11:30:57 +02:00
Zmago Devetak
4be39a8580
Merge pull request #762 from ZmagoD/zd_SCI_1493
...
Copy navbar to React
2017-08-07 14:07:55 +02:00
Luka Murn
ae5bccf709
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
zmagod
c314bae28d
add team switch js/controller
2017-08-03 16:03:15 +02:00
zmagod
b69ec22dfe
fixes failing tests [fixes SCI-1470]
2017-07-28 10:14:50 +02:00
zmagod
416ab8eee3
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400
2017-07-26 16:20:09 +02:00
Oleksii Kriuchykhin
6a43483a2f
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:22:26 +02:00
Oleksii Kriuchykhin
efd03db6db
Further samples import improvement [SCI-101]
2017-07-25 10:56:07 +02:00
Oleksii Kriuchykhin
67b0c78593
Improve samples import speed [SCI-101]
2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin
6d56e6b72e
Remove redundant self [SCI-1487]
2017-07-20 11:51:42 +02:00
Oleksii Kriuchykhin
6c33b46f6a
Improve import of repository records plus tsv file import fixes [SCI-1487]
2017-07-20 11:44:10 +02:00
Oleksii Kriuchykhin
ece27b2652
Fix importing files with empty header cells and error messages improvements [SCI-1484]
2017-07-18 14:54:35 +02:00
Nbernot
d746ae2549
Removes parentheses around if conditions
2017-07-11 13:33:47 +02:00
Luka Murn
9f60ece25f
Merge branch 'master' into rails-5.1
...
Conflicts:
app/models/repository.rb
app/models/repository_row.rb
app/views/projects/index.html.erb
app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
zmagod
750c82a80f
setup testing tools [fixes SCI-1400]
2017-07-06 09:07:05 +02:00
Nejc Bernot
803934e07d
Changes the host for the download and redirect paths
2017-07-05 10:23:10 +02:00
Nejc Bernot
91fe7fe4ad
Changes the completely NOT ruby code
2017-07-04 17:13:59 +02:00
Luka Murn
e3b9c1c644
Woops, almost forgot on this one
2017-07-04 15:00:14 +02:00
Luka Murn
8d68769d09
Hound is Love, Hound is Life
2017-07-04 14:47:58 +02:00
Luka Murn
91cddce8a6
Fixes DEPRECATION WARNING-s for Rails 5.1.2
...
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).
Closes SCI-1427.
2017-07-04 14:35:51 +02:00
Nejc Bernot
bd9904adb3
Adds support for business servers
...
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
2017-07-04 14:27:43 +02:00
Zmago Devetak
5f4006fe4a
Merge pull request #723 from ZmagoD/zd_SCI_1408
...
Fixes bugs on canvas [fixes SCI-1408]
2017-07-04 11:16:04 +02:00
okriuchykhin
75c887ce7d
Merge pull request #721 from okriuchykhin/ok_SCI_1412
...
Fix activities [SCI-1412]
2017-07-04 10:59:08 +02:00
Oleksii Kriuchykhin
b234c07c13
Fix datatables [SCI-1409]
2017-07-03 15:33:50 +02:00
zmagod
311270ff49
refactor
2017-07-03 15:32:02 +02:00
zmagod
fd13921720
fixes repeat tutorial [fixes SCI-1410]
2017-06-29 11:00:50 +02:00
zmagod
bef5a085c4
Fixes bugs on canvas [fixes SCI-1408]
2017-06-29 10:29:41 +02:00
Oleksii Kriuchykhin
e474cda03a
Fix activities [SCI-1412]
2017-06-28 16:49:50 +02:00
Zmago Devetak
502eb5c211
fixes tabs
2017-06-28 15:40:15 +02:00
zmagod
d8a3fdea20
fixes hound
2017-06-28 15:29:10 +02:00
zmagod
525c9770ac
fixes experiment page [fixes SCI-1395]
2017-06-28 15:21:32 +02:00
zmagod
71aa05bb0e
refactor
2017-06-27 14:58:49 +02:00
okriuchykhin
d126391940
Merge pull request #710 from okriuchykhin/ok_SCI_1356
...
Add global search in custom repositories [SCI-1356]
2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin
f2f57de264
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
zmagod
703be13fb0
removes imported repository row if the row value is not valid [fixes SCI-1393]
2017-06-22 15:21:36 +02:00
zmagod
28129ebb73
refactor
2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba
fix hound
2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Matej Zrimšek
6c7987681c
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
2017-06-20 14:52:41 +02:00
zmagod
70fa681519
split the import service
2017-06-19 14:05:37 +02:00
Zmago Devetak
21577cd0e9
Merge pull request #664 from ZmagoD/zd_SCI_1315
...
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-13 09:32:26 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
Matej Zrimšek
e3db79b3cc
Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]
2017-06-12 17:49:42 +02:00
Matej Zrimšek
4ea8972a6c
Fixed rebasing mistake. [SCI-1275]
2017-06-09 19:48:20 +02:00
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
zmagod
5f8606c9c5
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-08 14:03:06 +02:00
Luka Murn
810599bef2
Fix en.yml localization bug
2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
b94d2c5c03
Implement 'copy' method on Repository object
2017-06-07 18:28:07 +02:00
Luka Murn
42f7b4f68d
Hound is love, Hound is life
2017-06-07 18:22:15 +02:00
Luka Murn
9e45d197df
Change some stuff for repos to work, fix some bugs
...
Closes SCI-1279.
2017-06-07 18:07:49 +02:00
Luka Murn
02dd6636ba
Allow saving & editing of reports with repository elements
...
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94
Allow custom repositories to be added to reports
2017-06-07 16:54:32 +02:00
Luka Murn
bb20d2661f
Add association between repository rows & my modules
2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
ad8dd6d740
PR fixes [SCI-1274]
2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Matej Zrimšek
5aba15e220
Made repository names case insensitive. [fix 1269]
2017-06-05 10:38:04 +02:00
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
Oleksii Kriuchykhin
85e81e9ea2
Improve repository models and migration [SCI-1267]
2017-05-17 10:04:07 +02:00
Oleksii Kriuchykhin
0dc0c7d096
Add validation of text_value length [SCI-1267]
2017-05-16 15:57:21 +02:00
Oleksii Kriuchykhin
72a651c7de
Add migrations and models for custom repositories [SCI-1267]
2017-05-16 15:27:36 +02:00
okriuchykhin
8e523782d9
Merge pull request #619 from okriuchykhin/ok_SCI_617
...
Fixes error when cloning experiments with long names [SCI-617]
2017-05-12 16:53:38 +02:00
okriuchykhin
a8bbc3c3ba
Merge pull request #615 from okriuchykhin/ok_SCI_1008
...
Fix task and step ordering in reports [SCI-1008]
2017-05-12 16:44:57 +02:00
Oleksii Kriuchykhin
79efb34191
Fixes error when clonning experiments with long names [SCI-617]
2017-05-12 11:07:11 +02:00
Oleksii Kriuchykhin
bb8c7c342c
Add additional info to samples info modal [SCI-960]
2017-05-11 22:20:06 +02:00
Oleksii Kriuchykhin
5d55720aad
Fix steps ordering in reports [SCI-1008]
2017-05-11 15:56:33 +02:00
Zmago Devetak
9911c0d148
Merge pull request #613 from ZmagoD/zd_SCI_1241_v3
...
replace all ActionController::Base.helpers.sanitize calls with custom…
2017-05-11 14:30:26 +02:00
zmagod
80a0af8c9f
replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241]
2017-05-11 11:36:47 +02:00
Oleksii Kriuchykhin
a5926726ce
Add notifications counter badge to project card [SCI-1253]
2017-05-10 17:28:37 +02:00
zmagod
2081e0a94b
Merge branch 'master' of https://github.com/biosistemika/scinote-web into release-1.10.1
2017-05-10 15:14:17 +02:00
Zmago Devetak
ff0f85fce8
Merge pull request #592 from ZmagoD/zd_SCI_160
...
removes TempFile after 7 days [fixes SCI-160]
2017-05-10 09:32:18 +02:00
zmagod
04ee24d553
refactor
2017-05-09 14:05:21 +02:00
zmagod
2d69896897
fixes pdf export and image size [fixes SCI-1247]
2017-05-09 13:59:59 +02:00
okriuchykhin
ccc640f2bc
Merge pull request #593 from okriuchykhin/ok_SCI_1158
...
Add advanced search options [SCI-1158]
2017-05-09 10:23:34 +02:00
Oleksii Kriuchykhin
bd5a48b9c8
Improve code style [SCI-1158]
2017-05-08 18:00:14 +02:00
Zmago Devetak
4b816f5322
Merge pull request #568 from ZmagoD/zd_SCI_1119
...
Add images to fields with rich text formatting
2017-05-08 13:06:58 +02:00
Oleksii Kriuchykhin
a3f847a232
Fix hound [SCI-1158]
2017-05-08 10:22:54 +02:00
Oleksii Kriuchykhin
0ee7e11620
Add advanced search options [SCI-1158]
2017-05-05 16:41:23 +02:00
zmagod
f079a097c5
removes TempFile after 7 days [fixes SCI-160]
2017-05-05 14:54:22 +02:00
zmagod
8d0c22327b
adds asc order to checklists [fixes SCI-1228]
2017-05-04 15:17:34 +02:00
zmagod
acc5594f1b
add popup for approval to complete the Task [fixes SCI-1200]
2017-05-04 12:41:22 +02:00
okriuchykhin
5ec41c0d0a
Merge pull request #576 from okriuchykhin/ok_SCI_763
...
Add additional sanitization to search parameters in datatables [SCI-763]
2017-04-26 13:44:15 +02:00
zmagod
0e383109a1
refactor query
2017-04-26 13:32:03 +02:00
Oleksii Kriuchykhin
9055894d07
Add additional sanitization to search parameters in datatables [SCI-763]
2017-04-25 17:37:42 +02:00
zmagod
615bbb9967
make search for users case insensitive [fixes SCI-1192]
2017-04-25 15:33:51 +02:00
Luka Murn
92159b734f
Merge pull request #559 from Ducz0r/lm-sci-1175-fix
...
Fix encoding when cloning tables [SCI-1175]
2017-04-25 14:38:34 +02:00
zmagod
ed24448817
adds relation to team, adds rake task to delete obsolete images [fixes SCI-1203]
2017-04-25 14:24:05 +02:00
zmagod
1fefeee3d1
adds team space related methods
2017-04-25 13:44:31 +02:00
zmagod
66f43803c0
refactor, fix user annotation bug
2017-04-24 16:22:25 +02:00
zmagod
55c8c498e2
add image upload functionality to result text
2017-04-24 12:28:27 +02:00
zmagod
550f563666
working version for steps first run
2017-04-21 16:09:04 +02:00
Mojca Lorber
3aa1225e16
fix hound
2017-04-20 18:14:12 +02:00
Mojca Lorber
0bae4657f6
add experiment level to user smart annotation notification
2017-04-20 13:21:02 +02:00
Mojca Lorber
b1e939e715
add experiment to activities
2017-04-20 13:16:11 +02:00
Mojca Lorber
c13b8ab270
styling
2017-04-20 13:16:11 +02:00
Mojca Lorber
1606e2163c
add experiment level to notifications
2017-04-20 13:16:11 +02:00
Matej Zrimšek
314e8fcbd2
Added :inverse_of reference for all specific comment models. [fixes SCI-1207]
2017-04-19 23:38:23 +02:00
zmagod
0757563d02
adds step tiny_mce asset relation
2017-04-19 17:22:57 +02:00
Luka Murn
9479b65140
Hopefully fixes the encoding issues with audit trails
...
Closes SCI-1175.
2017-04-19 08:35:04 +02:00
Luka Murn
6a7e383316
Please the Hound
2017-04-18 15:38:11 +02:00
Zmago Devetak
e1a30cc17c
Merge pull request #558 from ZmagoD/zd_SCI_1192
...
fixes broken users search method for smart annotation [fixes SCI-1192]
2017-04-14 15:38:33 +02:00
Luka Murn
9c28608fbf
Fix encoding when cloning tables
...
Closes SCI-1175.
2017-04-13 17:00:27 +02:00
zmagod
9ee971c24b
fixes broken users search method for smart annotation [fixes SCI-1192]
2017-04-13 16:14:12 +02:00
Zmago Devetak
40af0df882
Merge pull request #551 from ZmagoD/zd_SCI_1189
...
fixes the user_name field in csv export [fixes SCI-1189]
2017-04-13 14:36:44 +02:00
zmagod
a6183af63d
fix method_missing again
2017-04-13 14:34:58 +02:00
zmagod
0534bce1ed
adds super in method_missing
2017-04-13 14:03:56 +02:00
zmagod
241af0620a
fixes hound alerts
2017-04-13 13:27:43 +02:00
zmagod
b6daf2648b
refactor zip_export
2017-04-13 13:01:05 +02:00
okriuchykhin
0fe84c4e24
Merge pull request #550 from okriuchykhin/ok_SCI_1157
...
Improve speed of search [SCI-1157]
2017-04-12 13:11:26 +02:00
zmagod
f4fdb840d8
fixes the user_name field in csv export [fixes SCI-1189]
2017-04-12 09:05:54 +02:00
Oleksii Kriuchykhin
07d658ab82
Improve speed of search [SCI-1157]
2017-04-11 14:55:44 +02:00
Matej Zrimšek
1447a34dc7
Files didn't get deleted in previous commit. [fixes SCI-1150]
2017-04-06 16:59:34 +02:00
Matej Zrimšek
e72184d10d
Fixed so that file deletion callbacks are triggered (and hence audit trails for this is generated). [fixes SCI-1150]
2017-04-06 11:34:03 +02:00
zmagod
e1ee53eeb5
generates query in background worker
2017-04-03 13:37:54 +02:00
Oleksii Kriuchykhin
42ccefe2ce
Remove logs table and old unused logging code [SCI-1127]
2017-03-30 11:47:57 +02:00
zmagod
0996c14449
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_765
2017-03-27 10:41:58 +02:00
zmagod
239a44c26b
change send to public_send
2017-03-24 16:25:50 +01:00
zmagod
4635a3320d
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-24 16:09:28 +01:00
zmagod
b352ef1600
removed unneeded method
2017-03-24 12:53:33 +01:00
zmagod
023b3213e8
fixes email link [fixes SCI-765]
2017-03-24 12:10:07 +01:00
zmagod
94732c6d18
adds delayed zip generator
2017-03-23 15:45:02 +01:00
Oleksii Kriuchykhin
2edebb282a
Add team_id field to assets and tables [SCI-1046]
2017-03-23 10:36:55 +01:00
zmagod
4385c68f5f
adds zip_export utility first run
2017-03-21 16:15:11 +01:00
zmagod
856a4611c6
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends
2017-03-14 15:58:08 +01:00
zmagod
0c2523beca
Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration
2017-03-10 16:21:43 +01:00
okriuchykhin
2a33391f4b
Merge pull request #511 from okriuchykhin/ok_SCI_1090
...
Refactoring of the comments using STI [SCI-1090]
2017-03-10 10:50:43 +01:00
zmagod
1d42d46c02
fixes bug with step comments
2017-03-09 16:02:52 +01:00
zmagod
9939d8df06
refactor
2017-03-09 10:51:54 +01:00
zmagod
5c2e9a4b04
adds extends and fixes report methods
2017-03-08 14:14:03 +01:00
Oleksii Kriuchykhin
0f8336e5a5
Refactoring of the comments using STI [SCI-1090]
2017-03-08 13:18:20 +01:00
Luka Murn
043613782e
Minor change
2017-03-02 13:04:13 +01:00
zmagod
e1b3dcc2ba
adds enum extends to report element part of SCI-1003
2017-02-27 13:53:46 +01:00
Oleksii Kriuchykhin
35b0b33ddf
Add more extensive explanation when project name is already taken [SCI-759]
2017-02-22 14:18:48 +01:00
Oleksii Kriuchykhin
53ba9437b2
Fix circular dependency while loading Settings [SCI-1004]
2017-02-21 14:38:13 +01:00
okriuchykhin
95af5001ab
Merge pull request #484 from okriuchykhin/ok_SCI_1004
...
Add global settings base class [SCI-1004]
2017-02-21 13:20:24 +01:00
Oleksii Kriuchykhin
7703db3386
Change implementation of the Settings base class [SCI-1004]
2017-02-21 13:07:10 +01:00
okriuchykhin
8e18ff44a6
Merge pull request #479 from okriuchykhin/ok_SCI_999
...
Add task complete/uncomplete functionality [SCI-999]
2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin
2aba0f46a6
Add global settings base class [SCI-1004]
2017-02-20 15:11:57 +01:00
Oleksii Kriuchykhin
218e96b1f0
Code style fixes [SCI-999]
2017-02-16 11:45:07 +01:00
Luka Murn
86be639a7c
Please the Hound
2017-02-13 14:20:44 +01:00
Luka Murn
3313d14316
Fix search for administrators and projects
...
Closes SCI-958.
2017-02-13 14:15:53 +01:00
Luka Murn
c6ed73bc82
Allow team admins to see all projects, even hidden ones
2017-02-13 13:42:53 +01:00
Oleksii Kriuchykhin
cf8566df33
Add task complete/uncomplete functionality [SCI-999]
2017-02-10 14:27:20 +01:00
Zmago Devetak
5c9954bb89
Merge pull request #450 from ZmagoD/zd_SCI_939
...
Refactor "organizations" to "teams"
2017-02-01 13:12:02 +01:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +01:00
mlorb
bc8c4c3c6c
Merge pull request #463 from mlorb/ml_sci_965
...
Fix step does not save if table is without content [SCI-965]
2017-01-30 11:08:21 +01:00
Mojca Lorber
b291553d01
fix hound
2017-01-27 16:36:03 +01:00
Mojca Lorber
d5021fad2c
fix step does not save if table is without content
2017-01-27 16:25:11 +01:00
Oleksii Kriuchykhin
08aa882155
Fix generation of image previews after protocol loading from repo [SCI-951]
2017-01-26 13:19:59 +01:00
zmagod
1220466035
fixing hound
2017-01-25 15:00:14 +01:00
zmagod
f04a2f663a
renamed organizations in config/
2017-01-25 12:30:11 +01:00
zmagod
9d90b9b42a
rename Organization to Team in models
2017-01-24 17:08:48 +01:00
zmagod
a193850ae6
rename models where org/organization
2017-01-24 16:34:21 +01:00
Luka Murn
53699193a2
Merge branch 'smart-annotations'
...
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
2017-01-24 14:33:23 +01:00
zmagod
20cde2654b
fixed user without permissions bug [fixes SCI-922]
2017-01-23 10:53:42 +01:00
zmagod
9550c6dd35
fixes highlight.js
2017-01-19 17:09:25 +01:00
mz3944
b5e38afb64
Merge pull request #416 from mz3944/mz-sci-884
...
Smart annotation bug fixes [SCI-884, SCI-889] [WIP]
2017-01-18 16:13:19 +01:00
Mojca Lorber
6155a458e7
update search
2017-01-18 14:22:19 +01:00
Mojca Lorber
dde9854bf1
update protocol import/export and clone
2017-01-18 14:22:19 +01:00
Mojca Lorber
b3c423c582
add table name in protocol step
2017-01-18 14:22:18 +01:00
Oleksii Kriuchykhin
55d0e82fcd
Change If statement to ternary operator [SCI-887]
2017-01-18 13:43:21 +01:00
Luka Murn
cf72da5635
Merge branch 'improved-files-handling' into 'master'
...
Conflicts:
app/assets/javascripts/protocols/steps.js.erb
app/helpers/assets_helper.rb
db/schema.rb
2017-01-18 11:29:40 +01:00
Matej Zrimšek
3085452ec9
Fixed some hound alerts. [SCI-884]
2017-01-17 11:04:16 +01:00
Oleksii Kriuchykhin
50edaef4ff
Do not show archived projects, experiments and tasks in smart annotations [SCI-887]
2017-01-16 16:55:10 +01:00
okriuchykhin
02bfd19d1c
Merge pull request #385 from okriuchykhin/ok_SCI_102
...
Fix XSS on activites and throghout the rest of app [SCI-102]
2017-01-16 11:41:38 +01:00
Matej Zrimšek
15d7944302
Preventing splitting of the words in the lookup query for # smart annotations. Query on the # is now performed on every character input, before it sometimes just filtered out the old (results count limited) query. Some refactoring of samrt annotations JS. [SCI-884, SCI-889]
2017-01-13 18:51:05 +01:00
Oleksii Kriuchykhin
75031e17b9
Remove double sanitization from views [SCI-102]
2017-01-12 16:54:15 +01:00
Oleksii Kriuchykhin
69b65c27f8
Remove input sanitization in the models [SCI-102]
2017-01-12 16:20:37 +01:00
Oleksii Kriuchykhin
0350f2f792
Add html escaping to name filelds in the views [SCI-102]
2017-01-12 11:03:14 +01:00