Luka Murn
084cdcdd6b
Remove old archive endpoint, controller logic
2019-08-21 13:17:19 +02:00
Anton Ignatov
ed8ef7aa8f
Fix permission check;
2019-08-20 16:07:22 +02:00
Luka Murn
ebda2c832a
Merge pull request #1995 from biosistemika/release-1.16.8
...
Merge release-1.16.8 into master
2019-08-19 15:08:33 +02:00
aignatov-bio
b6661682ad
Fix shared inventory in task dropdown ( #1993 )
2019-08-19 13:56:02 +02:00
aignatov-bio
2cf7f52f15
Add inline editing for inventories [SCI-3763] ( #1991 )
...
* Add inline editing for inventories
* Remove old locals
* Markup fix
2019-08-19 13:30:56 +02:00
aignatov-bio
d741e52427
Fix global search for inventories ( #1988 )
2019-08-19 09:23:59 +02:00
Anton Ignatov
d1e1da8580
Fix permission check for invite users
2019-08-14 14:47:02 +02:00
Urban Rotnik
89f289660b
Add share_with_all feature to service, add new activities
2019-08-14 11:03:15 +02:00
Alex Kriuchykhin
960e69eaa8
Fix wopi file download URL [SCI-3757] ( #1975 )
2019-08-14 09:06:00 +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
7719b825e3
Update wording for sharing activities, rename button, add view-only paragraph
2019-08-09 14:15:51 +02:00
Urban Rotnik
32783576c1
Add controller action 'multiple_update'
...
Add controller action, add update permission activity, add JS for handling ajax req
2019-08-09 14:15:50 +02:00
Urban Rotnik
2648521924
Invite modal with form
2019-08-09 14:15:49 +02:00
Mojca Lorber
4c7c7ccdf1
Add ability to browse through shared inventories to smart annotations
2019-08-09 14:13:03 +02:00
Mojca Lorber
7d4941015f
Update global search, so it will be able to search through shared inventories
2019-08-09 14:13:01 +02:00
Urban Rotnik
171cdb319b
Add ShareInventory activities
2019-08-09 14:13:01 +02:00
Mojca Lorber
7e9be932f3
Make scope for repositories accessible by teams and simplify read permission
2019-08-09 14:13:00 +02:00
Mojca Lorber
15432ac851
Make changes to inventory list in navigation based on new mockup
2019-08-09 14:13:00 +02:00
Mojca Lorber
cac7dab440
Show shared inventories in left navigation and fix read repository permission
2019-08-09 14:13:00 +02:00
Urban Rotnik
5456c1e38a
Add basic controller for TeamRepositories
2019-08-09 14:12:59 +02:00
Urban Rotnik
077369d960
Update permissions for Repositories
2019-08-09 14:12:59 +02:00
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
Oleksii Kriuchykhin
b4f632dba8
Remove dowload endpoint from assets controller [SCI-3680]
2019-08-07 15:21:41 +02:00
Oleksii Kriuchykhin
d942788581
Implement read permissions checks for ActiveStorage controllers [SCI-3680]
2019-08-07 15:21:41 +02:00
Alex Kriuchykhin
328f8dd8a0
Merge pull request #1966 from okriuchykhin/ok_SCI_3681
...
Enforce file size limits for direct uploads on S3 [SCI-3681]
2019-08-07 10:49:05 +02:00
aignatov-bio
aa5061a1af
Add custom context menu to TinyMCE images [SCI-3582] ( #1944 )
...
* Add custom context menu to TinyMCE images
* Fix permission check for unsaved objects
* Fix markup
2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin
973fc775c0
Enforce file size limits for direct uploads on S3 [SCI-3681]
2019-08-06 17:09:00 +02:00
Oleksii Kriuchykhin
eaf9d59819
Merge branch 'activestorage_migration' into ok_SCI_3679
2019-08-06 15:27:31 +02:00
Jure Grabnar
bbdc5ce6c3
Remove couple of Samples related logic/comments
2019-08-05 14:09:13 +02:00
Luka Murn
83bb89fdf5
Cherry-picked commit from ZZ (and LM)'s various changes
2019-07-26 10:13:14 +02:00
Oleksii Kriuchykhin
5e65b07bdc
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
2019-07-25 18:00:24 +02:00
Urban Rotnik
1b9db2f61e
Fix for file annotating on Safari
2019-07-24 14:16:29 +02:00
Anton Ignatov
0702dacc5b
Security fixes
2019-07-19 14:10:38 +02:00
Anton Ignatov
ad7130d3b2
Simplify TinyMCE assets for MarvinJS
2019-07-19 09:27:03 +02:00
Anton Ignatov
d79fec3345
Move TinyMCE logic to correspond controller
2019-07-16 15:51:44 +02:00
Anton Ignatov
1e8663548e
Add MarvinJS assets to TinyMCE
2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf
Add MarvinJS to Result and TinyMce MarvinJS refactor
2019-07-15 17:17:14 +02:00
Alex Kriuchykhin
313d2d27b9
Update repository_rows_controller.rb
2019-07-12 17:03:09 +02:00
Oleksii Kriuchykhin
1c235aafe5
Improve permissions checks for reports [SCI-3700]
2019-07-12 16:44:15 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641
...
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
2019-07-12 15:52:40 +02:00
Anton Ignatov
ba1d6d45ca
Fix merging issues
2019-07-12 15:47:15 +02:00
Anton Ignatov
ffd415d409
Inital refactor for Assets model
2019-07-12 15:02:06 +02:00
Oleksii Kriuchykhin
6166a0dbb0
Fix file result update method [SCI-3695]
2019-07-12 14:42:04 +02:00
Anton Ignatov
57a273d5d0
Merge branch 'activestorage_migration' into features/marvinjs-integration
2019-07-12 11:34:41 +02:00
Mojca Lorber
f8afc92606
Fix page redirect and add success flash msg after protocols.io import action
2019-07-11 09:50:39 +02:00
Jure Grabnar
5eb197127f
Fix relative links in protocolsio iframe
...
Closes SCI-3660
2019-07-10 19:20:40 +02:00
Oleksii Kriuchykhin
a1941a21dc
Futher refactoring of old Paperclip methods [SCI-3539]
2019-07-09 10:28:15 +02:00
mlorb
7272d838b6
Merge pull request #1875 from mlorb/ml-sci-3618
...
Remove unassign_user_from_project notification…[SCI-3618]
2019-07-08 15:23:06 +02:00
Jure Grabnar
bdd1ca2a65
Merge pull request #1908 from jbargu/jg_sci_3587
...
[SCI-3587] Endless spinner at file preview
2019-07-08 13:06:39 +02:00
Jure Grabnar
0ee0b1c834
Fix file preview not showing in modal when processing is done
...
Close SCI-3587
2019-07-08 12:45:22 +02:00
Oleksii Kriuchykhin
9d926dc956
Refactor TinyMce assets, user avatars, zip files [SCI-3539]
2019-07-05 16:56:05 +02:00
Jure Grabnar
dc7fee51fa
Add Show more protocols functionality to external protocols
...
Closes SCI-3646
2019-07-04 15:35:18 +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
09dacf3be2
Fix infinite update for image annotation ( #1889 )
2019-07-03 15:35:49 +02:00
Miha Mencin
37cc526ac9
fix CR comments
2019-07-03 10:22:59 +02:00
Miha Mencin
74b4e0d774
SCI-3644 hide the import button and show it only on hover & when appropriate user
2019-07-02 18:24:07 +02:00
Oleksii Kriuchykhin
4ea6b56582
Fix Step and Result file previews [SCI-3539]
2019-07-01 23:30:20 +02:00
Mojca Lorber
41935a9471
Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation
2019-07-01 13:44:27 +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
Anton Ignatov
6be227b2d3
Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration
2019-06-28 10:47:38 +02:00
Oleksii Kriuchykhin
5acb16d43e
Update Asset helper methods [SCI-3539]
2019-06-28 08:17:09 +02:00
Jure Grabnar
bc4b07cc0f
Refactor hardcoded protocol_source in SearchService
2019-06-28 02:26:31 +02:00
Jure Grabnar
d3afcbed50
Style card view on external protocols
...
Closes SCI-3535
2019-06-28 00:43:05 +02:00
Urban Rotnik
9cb4454537
New implementation for attachments creation
2019-06-27 17:02:06 +02:00
Urban Rotnik
1fd0ca6795
Add steps preview
2019-06-27 16:46:02 +02:00
Urban Rotnik
2761079479
Add modal for import
2019-06-27 16:46:02 +02:00
Jure Grabnar
86bc69e510
Simplify V3 errors structure
2019-06-27 09:42:21 +02:00
Mojca Lorber
9fd83d54a0
Put network error handeling into api and refactor errors
2019-06-26 14:04:03 +02:00
aignatov-bio
83bc9eb22f
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
...
Adding new activities for image editing [SCI-3369]
2019-06-24 10:31:39 +02:00
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
Anton Ignatov
3069ec8dd2
Add check for edit permission
2019-06-20 09:43:23 +02:00
Anton Ignatov
a843a016a0
Fix markup and naming
2019-06-19 15:19:47 +02:00
Mojca Lorber
ebcaa4b014
Implement protocols.io error handling for api client and normalizer
2019-06-18 14:01:57 +02:00
Urban Rotnik
88d96c0938
Use service in controller
2019-06-17 12:24:15 +02:00
Jure Grabnar
4f6397b5b9
Add form to external_sources#new action
...
Closes SCI-3532
2019-06-17 12:24:15 +02:00
Jure Grabnar
c8b8bcffdb
Add external_protocols#show action
2019-06-17 12:24:14 +02:00
Jure Grabnar
f7c6f78925
Add external_protocols#index action
2019-06-17 12:24:14 +02:00
Jure Grabnar
2a61075156
Add ExternalProtocols#create action and tests
2019-06-17 12:24:14 +02:00
Jure Grabnar
9baa66c998
Refactor OnlineSources -> ExternalProtocols
2019-06-17 12:24:13 +02:00
Jure Grabnar
eb0d677a36
Refactor pio_protocol -> built_protocol
2019-06-17 12:24:13 +02:00
Jure Grabnar
94e7fe1e6c
OnlineSourcesController skeleton and #new action tested
2019-06-17 12:24:13 +02:00
Anton Ignatov
f480c0eb8d
Adding new activtiies for image editing
2019-06-14 16:15:30 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] ( #1800 )
...
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
Alex Kriuchykhin
bc94771828
Merge pull request #1791 from okriuchykhin/ok_SCI_3461
...
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-06-12 15:35:15 +02:00
Alex Kriuchykhin
4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller
...
Fix nil issue in tags_my_module controller [SCI-3525]
2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin
a855eade4c
Merge branch 'master' into ok_SCI_3461
2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin
6e1a7a3392
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-11 10:08:33 +02:00
Alex Kriuchykhin
36255f82ed
Merge pull request #1817 from okriuchykhin/ok_SCI_3522
...
Add system notifications service to health check endpoint [SCI-3522]
2019-06-04 14:41:43 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] ( #1808 )
...
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
2019-06-04 14:40:21 +02:00
Anton Ignatov
5df55d39be
Fix nil issue in module controller
2019-05-31 16:02:21 +02:00
Oleksii Kriuchykhin
552f69b9b1
Add system notifications service to health check endpoint [SCI-3522]
2019-05-31 15:52:47 +02:00
Anton Ignatov
c9a29b12ba
Merge branch 'master' into features/marvinjs-integration
2019-05-31 10:27:14 +02:00
aignatov-bio
94b220172d
Fix empty result name issue ( #1812 )
2019-05-31 09:48:58 +02:00
Oleksii Kriuchykhin
5a9640c5d1
Add aditional checks for inventory state objects [SCI-3412]
2019-05-27 17:32:21 +02:00
aignatov-bio
8f2d873130
Fix error when editing office document ( #1793 )
2019-05-22 10:34:16 +02:00
Oleksii Kriuchykhin
84a2ad4487
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-05-21 17:29:33 +02:00
aignatov-bio
59e824ef9e
Fix nil handling in different places [SCI-2840] ( #1777 )
...
* Fix nil handling in different places
2019-05-21 15:53:34 +02:00
mlorb
be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
...
Update protocol status bar upon protocol changing [SCI-3193]
2019-05-21 15:28:58 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] ( #1787 )
...
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
Mojca Lorber
b479a6a145
Cover all use cases for updating protocol status bar
2019-05-20 16:09:43 +02:00
Oleksii Kriuchykhin
1128fedc51
Refactor title inline editing permission checking [SCI-3471]
2019-05-20 13:13:31 +02:00
Alex Kriuchykhin
df59c54bd4
Merge pull request #1776 from okriuchykhin/ok_SCI_3477
...
Fix protocol metadata editing in repository [SCI-3477]
2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin
488fc99dae
Fix protocol metadata editing in repository [SCI-3477]
2019-05-16 17:11:17 +02:00
Anton Ignatov
259b75a6ba
Merge branch 'master' into features/marvinjs-integration
2019-05-16 09:28:48 +02:00
aignatov-bio
24e30867da
Add smart annotation to comments [SCI-3458] ( #1768 )
...
* Add smart annotation to comments
2019-05-15 14:59:15 +02:00
Oleksii Kriuchykhin
5b0e9872c3
Improve handling of CSRF token errors [SCI-2841]
2019-05-14 17:02:56 +02:00
Alex Kriuchykhin
e544edeaf7
Merge pull request #1758 from okriuchykhin/ok_SCI_3381
...
Fix handling of processing step attachments [SCI-3381]
2019-05-14 09:26:30 +02:00
Oleksii Kriuchykhin
4b1c4bd140
Fix handling of proccessing step attachments [SCI-3381]
2019-05-13 17:12:06 +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
Miha Mencin
5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426
...
Changes to create new office file button [SCI-3426]
2019-05-13 10:55:58 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] ( #1753 )
...
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
aignatov-bio
da5b24ef57
Fix attachment appearence after update ( #1745 )
2019-05-13 10:54:16 +02:00
Anton Ignatov
e5b4adcc25
Merge branch 'master-with-note-section' into features/marvinjs-integration
2019-05-11 20:51:01 +02:00
Luka Murn
890df8803e
Add file name validation to create new Office file modal window
2019-05-10 18:19:32 +02:00
Luka Murn
5135922254
Move the WOPI controls partial to /wopi folder, fix typo
2019-05-10 16:51:54 +02:00
Luka Murn
b78caef915
Fix the file preview modal so it supports WOPI_ENABLED == false
2019-05-10 16:41:11 +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
Anton Ignatov
2e6bab4638
Fix smart anottation to protocols in repository
2019-05-09 09:40:40 +02:00
Oleksii Kriuchykhin
40550f92c9
Improve HTML data escaping in JSON endpoints [SCI-3403]
2019-05-08 17:38: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
f73dd38780
Add image editor to tinymce drawings
2019-04-30 18:32:59 +02:00
Anton Ignatov
4d0d5aa014
Adding team sketches selector
2019-04-30 17:32:55 +02:00
Anton Ignatov
7c55fcf0cf
Merge branch 'master' into master-with-note-section
2019-04-30 12:07:59 +02:00
aignatov-bio
687b53feb1
Add new tag activtiies [SCI-3341] ( #1712 )
...
* Add new tag activtiies
2019-04-30 10:23:09 +02:00
Jure Grabnar
b37349624a
Merge pull request #1714 from biosistemika/jg_sci_3380
...
Add editnew action for editing new office files [SCI-3380]
2019-04-30 09:57:07 +02:00
Jure Grabnar
ed003aca13
Add editnew action for editing new office files
...
Closes SCI-3380
2019-04-30 08:19:52 +02:00
Oleksii Kriuchykhin
1b792e2b7e
Improve clean up of Export All files [SCI-3368]
2019-04-30 00:43:34 +02:00
Anton Ignatov
f80d881847
Fix markup
2019-04-28 19:11:41 +02:00
Anton Ignatov
260810fff8
Add editing mode for tinymce images
2019-04-28 16:16:31 +02:00
Anton Ignatov
193edfbc35
Add marvin js support to TinyMCE
2019-04-27 22:54:59 +02:00
Anton Ignatov
54731856f0
Finish step chemical attachments
2019-04-27 19:08:40 +02:00
Anton Ignatov
cf4ff41ec6
Add delete feature
2019-04-27 13:51:35 +02:00
Anton Ignatov
fe620c4a63
Add marvin model and controller
2019-04-26 22:59:38 +02:00
Mojca Lorber
9e04eb8ea1
Fixes upon Urbans request
2019-04-26 11:34:53 +02:00
aignatov-bio
1a860037f7
Update reports for new RTE [SCI-3263] ( #1691 )
...
* Update reports for new RTE
2019-04-25 16:16:43 +02:00
Urban Rotnik
0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes
...
Comments section changes [SCI-3135]
2019-04-25 14:18:05 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] ( #1689 )
...
* Update protocol repository for new description format
* move image clone method to concerns
2019-04-24 13:34:56 +02:00
Urban Rotnik
774521df7a
Changes to comments section in Task Steps
2019-04-23 15:02:58 +02:00
Urban Rotnik
11a7a975af
Merge branch 'features/scinote-improvements' into master-with-note-section
2019-04-23 14:50:03 +02:00
Anton Ignatov
7d60eb5572
Fix migration issues
2019-04-23 11:11:22 +02:00
Anton Ignatov
aa2dab2014
Merge branch 'features/note-section' into master-with-note-section
2019-04-23 10:31:37 +02:00
aignatov-bio
6b45dcd475
Update eln export for new tinyMCE image format ( #1680 )
2019-04-19 14:44:40 +02:00
aignatov-bio
a75c4c2f91
Update Result API for new tiny mce image format ( #1674 )
2019-04-19 14:44:16 +02:00
Mojca Lorber
b00cf07684
Add activity for importing inventory items
2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin
f9832013b0
Improve experiment preview image generation [SCI-3177]
2019-04-17 12:06:46 +02:00
Urban Rotnik
782d1dfc2d
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2
...
Exports left after export [SCI-3345]
2019-04-16 14:44:48 +02:00
Urban Rotnik
4f8faba84e
Exports left after export fix
2019-04-16 14:21:47 +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
Urban Rotnik
7eeba0e57e
Merge pull request #1670 from urbanrotnik/ur-sci-3343-dynamic-filtering-default-fix
...
Dynamic filtering default fix [SCI-3343]
2019-04-15 11:40:16 +02:00
Urban Rotnik
83f2a5c961
Dynamic filtering default fix
2019-04-15 11:20:43 +02:00
Alex Kriuchykhin
a61d637e6d
Merge pull request #1669 from okriuchykhin/ok_SCI_3340
...
Fix crash when no activities present [SCI-3340]
2019-04-15 11:13:25 +02:00
Oleksii Kriuchykhin
a43e42fdb3
Fix crash when no activities present [SCI-3340]
2019-04-15 10:51:59 +02:00
aignatov-bio
063f02dc56
Add ability to select filters with keyboard [SCI-3200] ( #1649 )
...
* Add ability to select fitlers with keyboard
2019-04-15 10:30:08 +02:00
aignatov-bio
8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] ( #1654 )
...
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
2019-04-15 09:49:44 +02:00
Alex Kriuchykhin
3250ab70f4
Merge pull request #1668 from okriuchykhin/ok_SCI_3292_v2
...
Switch to kaminari pagination in global activities [SCI-3292]
2019-04-12 16:04:48 +02:00
Oleksii Kriuchykhin
231106e131
Switch to kaminari pagination in global activities [SCI-3292]
2019-04-12 15:37:45 +02:00
Jure Grabnar
be90881849
Merge pull request #1665 from jbargu/jg_sci_2949_3318
...
Disable editing of office file in view mode when module is locked [SCI-2949, 3318]
2019-04-12 13:00:18 +02:00
Jure Grabnar
1e5721ce95
Disable editing of office file in view mode when module is locked
...
Closes SCI-2949
2019-04-11 17:21:07 +02:00
Alex Kriuchykhin
7f20b7fa20
Merge pull request #1661 from okriuchykhin/ok_SCI_3292
...
Improve global activities pagination and fetching [SCI-3292]
2019-04-11 16:23:37 +02:00
aignatov-bio
9377628f5e
Release team space after update image [SCI-3299] ( #1656 )
...
* Release team space after update image
2019-04-11 09:20:05 +02:00
Oleksii Kriuchykhin
d378e33038
Improve global activities pagination and fetching [SCI-3292]
2019-04-10 15:45:17 +02:00
aignatov-bio
cfbb2a83a6
Merge pull request #1650 from aignatov-bio/ai-sci-3295-update-api-endpoints-new-activities
...
Update API endpoints for new activities [SCI-3295]
2019-04-10 13:46:30 +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
Anton Ignatov
811f07a62c
Update API endpoints for new activities
2019-04-08 15:07:45 +02:00
Jure Grabnar
d60cc2cd1c
Refactor create_wopi_file
2019-04-04 17:05:25 +02:00
Jure Grabnar
20446fb39d
Hound formatting fixes
2019-04-04 17:05:25 +02:00
Jure Grabnar
983f90ddf6
Add file name presence check
2019-04-04 17:05:25 +02:00
Jure Grabnar
b12916b828
Add main functionality
2019-04-04 17:05:25 +02:00
Jure Grabnar
613843d095
Temp commit
2019-04-04 16:58:55 +02:00
Jure Grabnar
9a4cd4fda2
Add file_present true
2019-04-04 16:57:36 +02:00
Jure Grabnar
3b8e6fa47c
Test office online
2019-04-04 16:57:36 +02:00
aignatov-bio
a1047f4597
Fix activities wording [SCI-3287] ( #1635 )
...
* Fix activities wording
* Adding project to export protocol
2019-04-04 10:45:35 +02:00
Alex Kriuchykhin
c86b535a25
Merge pull request #1638 from okriuchykhin/ok_SCI_3289
...
Improve large image saving after editing [SCI-3289]
2019-04-03 16:44:08 +02:00
Oleksii Kriuchykhin
9e91e9e59d
Improve large image saving after editing [SCI-3289]
2019-04-03 16:31:56 +02:00
Jure Grabnar
f00f4d39af
Refactor step activities using position_plus_one
...
Closes SCI-3273
2019-04-03 13:10:45 +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
Jure Grabnar
6a9ef8b98d
Merge pull request #1633 from jbargu/jg_sci_3276
...
Wrap user sign_in into rescue block [SCI-3276]
2019-04-03 10:56:56 +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
Jure Grabnar
91820ed9c1
Wrap sign_in user into begin/rescue block
...
Closes SCI-3276
2019-04-03 09:09:20 +02:00
Oleksii Kriuchykhin
c47d243b1f
Disable WOPI edit button in read only mode [SCI-3281]
2019-04-02 17:45:26 +02:00
Oleksii Kriuchykhin
ffa7c5ecb2
Fix permition checks for file editing and make protocol preview files read only [SCI-3281]
2019-04-02 16:38:53 +02:00
Anton Ignatov
94efd2e649
Fix tests
2019-04-02 16:04:50 +02:00
Urban Rotnik
86ddbc68b6
fixup! Show date actual value without link
2019-04-02 14:21:06 +02:00
Anton Ignatov
c9f9523210
Remove src when save description and rename token tag
2019-04-02 13:41:32 +02:00
Urban Rotnik
8eaeeee9f8
Show date actual value without link
2019-04-02 13:15:34 +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
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163
...
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
2019-04-01 14:32:54 +02:00
Mojca Lorber
3c69225d6b
Change activities for task protocols
2019-03-29 15:09:20 +01:00
Oleksii Kriuchykhin
7d4fbcb32e
Fix unconfirmed users clean-up issues [SCI-3172]
2019-03-29 11:11:53 +01:00
Alex Kriuchykhin
913bdd91be
Merge pull request #1610 from okriuchykhin/ok_SCI_3251
...
Make subject search more precise in global activities [SCI-3251]
2019-03-29 09:28:13 +01:00
aignatov-bio
b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] ( #1605 )
...
* Adding children selector to global activities subjects
* Fix naming, add seperate check for project id
2019-03-29 09:26:27 +01:00
Alex Kriuchykhin
88b4ca0798
Merge pull request #1609 from okriuchykhin/ok_SCI_3213
...
Fix role name in change user role in team activity [SCI-3213]
2019-03-28 17:32:51 +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
58af23e9b5
Make subject search more precise in global activities [SCI-3251]
2019-03-28 17:03:05 +01:00
Oleksii Kriuchykhin
6bc944fcc7
Fix role name in change user role in team activity [SCI-3213]
2019-03-28 16:26:07 +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
aignatov-bio
08263ab64e
adding filters for task activities [SCI-3076] ( #1553 )
...
* update task activity screen
2019-03-28 10:55:48 +01:00
aignatov-bio
8416d1ab1c
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects
2019-03-28 09:13:34 +01:00
Jure Grabnar
07609d34c8
User/teams are now alphabetically listed
2019-03-27 15:34:01 +01:00
Anton Ignatov
3676aeb83c
Adding localization to subjects group name in filters
2019-03-27 15:30:04 +01:00
Mojca Lorber
f06358b2ae
Implement missing tests for global activities (task and protocol activities)
2019-03-27 11:24:44 +01:00
Oleksii Kriuchykhin
dab75d5aec
Fix duplicated projects in new report modal [SCI-3173]
2019-03-26 17:24:30 +01:00
Oleksii Kriuchykhin
2ff43a3320
Change filtering logic when no filters are selected [SCI-3223]
2019-03-26 16:04:03 +01:00
Alex Kriuchykhin
935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199
...
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
2019-03-26 16:02:44 +01:00
Miha Mencin
9a30d7be9d
SCI-3232 renaming the attribute name so it doesnt get 'constantized'
2019-03-26 11:39:54 +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
aignatov-bio
9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype
...
Feature/Image annotation
2019-03-22 16:31:00 +01:00
Anton Ignatov
65521533b4
change js.erb to js
2019-03-22 13:35:11 +01:00
Anton Ignatov
4ec0a3c871
Update TinyMCE image loader for new fields
2019-03-22 10:52:26 +01:00
Anton Ignatov
bc58f0aecd
Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload
2019-03-21 11:48:51 +01:00
Mojca Lorber
c55e314ed5
Refactor upon the review requests
2019-03-20 21:34:47 +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
Oleksii Kriuchykhin
0c2b7959b6
Fix smart annotations in RTE [SCI-3111]
2019-03-20 11:41:36 +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
Jure Grabnar
cf5505d95f
Add missing inventory name in notification
...
Closes SCI-3149
2019-03-20 10:52:58 +01:00
Anton Ignatov
29b67be127
Fix team selection in global activities and add link from navbar
2019-03-20 10:33:22 +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
Mojca Lorber
7757096693
Results activities refactoring
2019-03-19 15:33:57 +01:00
Mojca Lorber
1418abc8d7
Reports activities refactoring
2019-03-19 15:33:57 +01:00
Mojca Lorber
d1e38e5bc9
Project activities refactoring
2019-03-19 15:33:57 +01:00
Mojca Lorber
70eebca5ee
experiment activities refactoring
2019-03-19 15:33:57 +01:00
aignatov-bio
6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] ( #1568 )
...
*Add permission check for assets editing
* Add check for image format
2019-03-19 13:52:57 +01:00
Anton Ignatov
f606210652
Rubocop fix
2019-03-19 13:52:03 +01:00
Anton Ignatov
87280f083a
[SCI-3166] Finalize global activities front end
2019-03-19 13:50:55 +01:00
aignatov-bio
a0a3c4b97f
Fix file format bug ( #1569 )
2019-03-19 11:06:36 +01:00
Oleksii Kriuchykhin
0c71493fdb
Add viewing permissions for global activities [SCI-2997]
2019-03-18 15:38:19 +01:00
Urban Rotnik
5dccdbab17
fixup! Fix failing tests
2019-03-15 11:12:10 +01:00
Urban Rotnik
2ea2700837
fixup! Fix failing tests
2019-03-15 10:30:51 +01:00
Oleksii Kriuchykhin
a822227383
Add rich text editor to task and protocol description [SCI-3062][SCI-3071]
2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin
645930b8d7
Merge branch 'master' into features/note-section
2019-03-14 16:25:51 +01:00
Urban Rotnik
b6a8556601
Add activities for exporting Projects, Inventory items
2019-03-12 09:15:06 +01:00
Urban Rotnik
e7b57aa4f7
Add creating activities for Team actions
2019-03-12 09:15:06 +01:00
Urban Rotnik
3f18166320
Add Task and TaskTags activities
2019-03-12 09:15:06 +01:00
Urban Rotnik
7a05e817ef
Add new Protocol steps 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
cfe2888bea
Repository columns actions loggin
2019-03-12 09:11:00 +01:00
Urban Rotnik
32422c00eb
RepositoryRows actions loggin
2019-03-12 09:11:00 +01:00
Urban Rotnik
2a7bbac733
Repository actions logging
2019-03-12 09:11:00 +01:00
Urban Rotnik
976831e7d3
Edit and Archive experiment activity logging
2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin
feb75f62e1
Add workaround for image caching in fabric js [SCI-2855]
2019-03-11 15:10:32 +01:00
Oleksii Kriuchykhin
80e525fd97
Improve image editor behaviour [SCI-2855]
2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin
89e968c410
Add tui.image-editor [SCI-2815]
2019-03-11 15:08:15 +01:00
Urban Rotnik
9ed3313f0f
Create project activity refactored
2019-03-11 08:36:15 +01:00
Jure Grabnar
eceda4909f
Move edit_file permission for wopi file in a special function
...
Used for overwritting it in addons.
Closes SCI-2949
2019-03-08 12:22:35 +01:00
aignatov-bio
ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] ( #1521 )
...
* Adding side pane filtering and top pane
2019-03-06 10:34:04 +01:00
aignatov-bio
125d2a3b9b
New inline tags editing in task [SCI 3093] ( #1529 )
...
* Adding inline tags selection
2019-03-06 09:18:45 +01:00
aignatov-bio
b1df8c9aa7
Adding inline editing to experiment title, project title and task title [SCI-3059] ( #1524 )
...
* Adding inline editing to experiment title, project title and task title
2019-03-06 09:17:34 +01:00
Miha Mencin
9807c80286
move the create action to the tope section of controller
2019-03-05 10:49:36 +01:00
Miha Mencin
67fe486874
put the scheduling logic into session create action
2019-03-05 10:43:39 +01:00
Miha Mencin
fa7bba9de7
scheduling creation of demo project at the sign in time
...
remove wrong schema, fix comment, add migration
2019-03-04 18:26:15 +01:00
Miha Mencin
844303ae7c
SCI-3119 schedule the creaton of template
2019-03-01 17:47:04 +01:00
Oleksii Kriuchykhin
61147b480c
Add main global activities bussiness logic [SCI-3014]
2019-02-26 11:01:15 +01:00
Urban Rotnik
3ad6cee766
Fix tests, remove nullable field
2019-02-25 16:50:38 +01:00
Miha Mencin
76c3db0b11
added layout, added css, added select2 lib, WIP
2019-02-25 16:50:38 +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
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications
...
Features/system notifications
2019-02-19 13:51:18 +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
mlorb
71e4cc4dbd
Merge branch 'master' into ml-sci-2940
2019-02-13 14:35:03 +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
3376fd012c
Improve error loggin in protocol import [SCI-3023]
2019-02-07 14:00:24 +01:00
Urban Rotnik
6f7fcb0831
Refactor method clone_experiment_as_template
into service object
...
[SCI-2925]
2019-01-31 07:13:40 +01:00
mz3944
2ae56eb13f
Merge pull request #1448 from mz3944/mz-SCI-2929
...
Can not switch team [SCI-2929]
2019-01-31 04:43:39 +01:00
Urban Rotnik
4cf12d12d1
Refactor 'move_experiment' method into service object
...
Jira Ticket: SCI-2926
2019-01-28 11:45:36 +01:00
Urban Rotnik
16e9a56874
Add recaptcha to invitation modal
...
SCI-2935
2019-01-25 11:27:01 +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
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
Miha Mencin
0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
...
Fix task tags update on canvas cards [SCI-2875]
2019-01-16 12:44:50 +01:00
Oleksii Kriuchykhin
3a4b992f4e
Code style fixies []SCI-2875]
2019-01-14 16:31:23 +01:00
Matej Zrimšek
a5c1cf4450
Switch user's team if he's no longer a member of the currently selected one
2019-01-12 23:39:31 +01:00
Oleksii Kriuchykhin
89240659a7
Fix task tags update on canvas cards [SCI-2875]
2019-01-11 17:20:39 +01:00
Alex Kriuchykhin
b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
...
Add counters to task inventories dropdown [SCI-2776]
2019-01-11 16:27:22 +01:00
Oleksii Kriuchykhin
132f46b136
Improve error handling in task inventories dropdown [SCI-2776]
2019-01-10 21:11:20 +01:00
Matej Zrimšek
8070b7f8b5
Fix Date and Time display formats on JS side
2019-01-08 08:07:24 +01:00
Oleksii Kriuchykhin
534866467b
Add counters to task inventories dropdown [SCI-2776]
2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin
2769add4d9
Disable edit button for unsupported WOPI formats [SCI-2904]
2018-12-31 18:10:12 +01:00
Alex Kriuchykhin
8a348b8504
Merge pull request #1422 from okriuchykhin/ok_SCI_2910
...
Improve rendering speed of inventory table [SCI-2910]
2018-12-16 19:45:29 +01:00
Oleksii Kriuchykhin
d5c07fd22a
Improve rendering speed of inventory table [SCI-2910]
2018-12-13 16:17:22 +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
Alex Kriuchykhin
4e416fe81b
Merge pull request #1404 from okriuchykhin/ok_SCI_2822
...
Return task inputs/outputs as references [SCI-2822]
2018-12-12 11:36:39 +01:00
mlorb
3f79cc5f93
Merge pull request #1418 from mlorb/ml-sci-2905
...
Fix due date can not be set [SCI-2905]
2018-12-12 11:27:57 +01:00
mlorb
426fadc10a
Fix due date can not be set
2018-12-11 10:31:13 +01:00
mlorb
4040b31143
Fix behavior when user has no teams
2018-12-10 15:42:05 +01:00
Alex Kriuchykhin
37db41e18e
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
...
Refresh sidebar when project is archived/restored [SCI-2881]
2018-12-10 14:11:34 +01:00
Oleksii Kriuchykhin
2c96f08b98
Refresh sidebar when project is archived/restored [SCI-2881]
2018-11-29 14:20:20 +01:00
Oleksii Kriuchykhin
5b566b48ae
Improve error messages and fix task users/items endpoints [SCI-2886]
2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin
b3a377f949
Return task inputs/outputs as references [SCI-2822]
2018-11-28 11:33:00 +01:00
Alex Kriuchykhin
20e2cbf0ca
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
...
Fix smart annotations rendering issues [SCI-2880]
2018-11-28 09:47:20 +01:00
mlorb
398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676
...
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
2018-11-27 11:06:45 +01:00
mlorb
0b6b3b3609
code simplify
2018-11-27 10:58:51 +01:00
Oleksii Kriuchykhin
d67abfda2c
Additional fixies for smart annotations [SCI-2880]
2018-11-26 15:17:18 +01:00
Jure Grabnar
7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix
...
Protocols - import from protocols.io doesn't work
2018-11-26 14:56:25 +01:00
mlorb
18d9ab5888
fixes upon @Ducz0r request
2018-11-26 14:23:26 +01:00
Jure Grabnar
6ec2c99a28
Hound styling
2018-11-26 13:52:01 +01:00
Jure Grabnar
0086e4dcf3
Catch some of templates error when import protocols.io
2018-11-26 13:43:05 +01:00
Jure Grabnar
1c7a051551
Catch all errors on PIO import and show message
2018-11-23 20:47:48 +01:00
mlorb
f61187dd18
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows
2018-11-23 15:44:04 +01:00
Oleksii Kriuchykhin
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
mlorb
3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842
...
Update the Export all confirmation modal and export interaction [SCI-2842]
2018-11-19 11:36:08 +01:00
Alex Kriuchykhin
d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
...
Add time format selection to settings [SCI-2778]
2018-11-19 10:17:09 +01:00
mlorb
4b540958bd
change close/cancel button and refactor export_project_modal endpoint
2018-11-16 13:37:32 +01:00
mlorb
6453ab6fb1
update the Export all confirmation modal and export interaction
2018-11-15 15:53:58 +01:00
Luka Murn
e9c0b34662
Merge branch 'core-api' into 'master'
...
Conflicts:
Gemfile
app/services/api.rb
config/initializers/api.rb
config/initializers/extends.rb
config/routes.rb
db/schema.rb
spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
Oleksii Kriuchykhin
3fd687161f
Remove unused variables from activities controller [SCI-2778]
2018-11-14 13:17:38 +01:00
Oleksii Kriuchykhin
537de596a7
Merge latest master [SCI-2778]
2018-11-14 13:05:57 +01:00
Luka Murn
c0940b143a
Fix root page bug introduced with merge features/core-api -> master
2018-11-13 21:24:20 +01:00
Oleksii Kriuchykhin
fb309a12b9
Refactor result and step comments initialization [SCI-2830]
2018-11-13 16:57:42 +01:00
Luka Murn
84df2c81f9
Merge branch 'features/export-all'
...
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin
e89d60785f
Fix dates on activities and experiments [SCI-2778]
2018-11-12 10:26:48 +01:00
Oleksii Kriuchykhin
8d0dbc7076
Add time format selection to settings [SCI-2778]
2018-11-09 16:19:40 +01:00
mlorb
75875e5421
fix user_project manage permission
2018-11-09 11:36:44 +01:00
mlorb
a56d22a329
change count to size
2018-11-08 09:43:32 +01:00
Oleksii Kriuchykhin
23ee4760ae
Fix failing tests [SCI-2773]
2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin
30885e060d
Merge latest core-api branch [SCI-2773]
2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin
60e78fa868
Improve code style for error handling [SCI-2773]
2018-11-07 15:43:44 +01:00
mlorb
4d156080ac
fix empty projects page bug and projects tree bug
2018-11-07 13:45:46 +01:00
mlorb
ad5f4c2ebb
Merge pull request #1356 from mlorb/ml-sci-remove-protocol-show-endpoint
...
Remove show protocol api endpoint
2018-10-30 14:04:17 +01:00
Alex Kriuchykhin
2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742
...
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
2018-10-29 16:26:58 +01:00
Alex Kriuchykhin
126fa03305
Merge pull request #1349 from okriuchykhin/ok_SCI_2818
...
Fix project index endpoint permission bug [SCI-2818]
2018-10-29 14:59:22 +01:00
Alex Kriuchykhin
1083ce61fb
Merge pull request #1352 from okriuchykhin/ok_SCI_2814
...
Rename user_id to sub in JWT [SCI-2814]
2018-10-29 14:54:00 +01:00
mlorb
0f8c80172e
remove show protocol api endpoint
2018-10-29 11:21:48 +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
04ff5870af
Rename user_id to sub in JWT [SCI-2814]
2018-10-28 14:34:51 +01:00
Jure Grabnar
0977f5251d
Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export
...
Fix zero limit config on export all
2018-10-28 13:38:21 +01:00
Jure Grabnar
cab0b78afa
Fix zero limit config on export all
2018-10-28 09:43:34 +01:00
Oleksii Kriuchykhin
9ad2718f32
Fix project index endpoint permission bug [SCI-2818]
2018-10-26 16:46:01 +02:00
Oleksii Kriuchykhin
93e7c3f390
Fix inventory column creation permission check [SCI-2782]
2018-10-26 14:38:47 +02:00
Jure Grabnar
7d2f2c3b5f
Merge pull request #1337 from jbargu/jg_bug_sci_2805
...
Add can_export_project? permission to allow archived projects to be exported [SCI-2805]
2018-10-26 11:23:57 +02:00
Matej Zrimšek
18e52e2c6f
Fix fetching all user projects [SCI-2787]
2018-10-24 00:29:30 +02:00
Oleksii Kriuchykhin
b53f2c8347
Improve error messages in API [SCI-2773]
2018-10-23 17:52:48 +02:00
Jure Grabnar
bd5a2a43fd
Add can_export_project? permission
...
Closes [SCI-2805].
2018-10-19 08:41:39 +02:00
Alex Kriuchykhin
18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
...
Implement inventory column data type name mappings [SCI-2772]
2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin
e4e66d3e5d
Merge branch 'core-api' into ok_SCI_2742
2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin
02f536cd08
Merge latest features/export-all [SCI-2733]
2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin
ed46115b3f
Implement inventory column data type name mappings [SCI-2772]
2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin
f6b039d54e
Merge latest core-api branch [SCI-2765]
2018-10-16 12:07:47 +02:00
Jure Grabnar
ed16e8d479
Fix reviewers errors
2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98
Add export project modal
...
Closes [SCI-2645]
2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin
0db9ef44e2
Add experiment, task, result READ endpoints tests [SCI-2742]
2018-10-15 16:27:22 +02:00
Luka Murn
1093ea11f4
Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes
...
Conflicts:
app/serializers/api/v1/activity_serializer.rb
app/serializers/api/v1/inventory_column_serializer.rb
app/serializers/api/v1/project_serializer.rb
2018-10-15 15:20:26 +02:00
Oleksii Kriuchykhin
f221d71bbc
Fix datatables state restore [SCI-2733]
2018-10-12 15:15:43 +02:00
Luka Murn
a217b11bba
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539
...
Created read endpoint for projects and related models [SCI-2539]
2018-10-11 09:03:18 +02:00
Luka Murn
dd4f7b5d02
Fix project users, activities, comments, reports endpoints
2018-10-10 17:35:09 +02:00
Oleksii Kriuchykhin
af02f29fb5
Implement user state saving for projects overview [SCI-2733]
2018-10-10 16:15:31 +02:00
Alex Kriuchykhin
16b29b50a5
Merge pull request #1321 from okriuchykhin/ok_SCI_2731
...
Add Projects view - list/table view [SCI-2731]
2018-10-08 17:53:35 +02:00
Oleksii Kriuchykhin
77e2371091
Add tests for inventory cell endpoints [SCI-2765]
2018-10-08 13:25:03 +02:00
Luka Murn
a8d56d32e2
Hound is love, Hound is life
2018-10-07 13:28:29 +02:00
Luka Murn
7527dc7352
Fix READ index, READ show, POST create /tasks/:id/results endpoints
2018-10-07 12:58:17 +02:00
Luka Murn
fc5cf33614
Fix GET /tasks/:id/activities endpoint
2018-10-07 11:54:11 +02:00
Luka Murn
fca580face
Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints
2018-10-07 11:35:12 +02:00
Luka Murn
239b974fa0
Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts
2018-10-07 11:29:56 +02:00
Luka Murn
24299ef4c0
Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts
2018-10-07 11:10:41 +02:00
Luka Murn
98544f00e8
Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts
2018-10-07 10:20:01 +02:00
Luka Murn
94e80edc9b
Minor variable rename in task_groups_controller.rb
2018-10-07 10:16:00 +02:00
Luka Murn
f56e5b1e5a
Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts
2018-10-07 10:07:37 +02:00
Luka Murn
0de3c7eb4e
Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb
2018-10-07 09:45:24 +02:00
Luka Murn
0643ba216e
Fix GET /connections, /connections/:id endpoints
2018-10-07 00:53:39 +02:00
Luka Murn
c9a15db85f
Fix GET /task_groups endpoints
2018-10-06 20:11:01 +02:00
Luka Murn
d235dd7807
Update GET /inventory_items, GET /inventory_items/:id endpoints
2018-10-06 18:37:40 +02:00
Luka Murn
9e78de6ef2
Update CREATE, PATCH, DELETE inventory_column endpoints
2018-10-06 17:11:59 +02:00
Luka Murn
6625b4019e
Update GET /inventory_columns, GET /inventory_columns/:id endpts
2018-10-06 13:47:41 +02:00
Luka Murn
eaa8a627a8
Update GET /inventories, GET /inventories/:inventory_id endpoints
2018-10-06 12:39:44 +02:00
Luka Murn
6faaff550b
Update GET /teams, GET teams/:team_id endpoints slightly
2018-10-06 12:18:57 +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
Oleksii Kriuchykhin
363c1e4a34
Add endpoints for managing inventory list items [SCI-2741]
2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin
492a5de19e
Add Projects view - list/table view [SCI-2731]
2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin
2508394924
Refactor Projects view - cards view [SCI-2730]
2018-09-27 10:43:44 +02:00
Zanz2
2e0c40ed45
fixed merge
2018-09-26 12:20:13 +02:00
Zanz2
c8ed808920
merged with core-api
2018-09-26 12:17:49 +02:00
Zanz2
1a512698e8
Merge pull request #1286 from Zanz2/zz_search_page_update_bug_sci2684_v2
...
( better solution ) Search page results from different teams than active not switching active team on click [SCI-2684]
2018-09-26 12:04:09 +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
Oleksii Kriuchykhin
e06684b7cf
Few fixes after review [SCI-2718]
2018-09-24 18:10:37 +02:00
Oleksii Kriuchykhin
ab3aeac26b
Merge latest core-api branch [SCI-2718]
2018-09-24 16:49:27 +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
Zanz2
8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667
...
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
2018-09-24 15:31:47 +02:00
Zanz2
e5b7d68031
this should fix travis ci
2018-09-24 13:33:44 +02:00
Zanz2
1e8442e22e
fixed pull request review, forgot some small thing
2018-09-24 12:50:11 +02:00
Zanz2
1a9890ee0f
fixed pull request review
2018-09-24 12:48:53 +02:00
Alex Kriuchykhin
b38e85c282
Merge pull request #1301 from okriuchykhin/ok_SCI_2693_v2
...
Fix CREATE inventory endpoint [SCI-2693]
2018-09-24 10:51:13 +02:00
Jure Grabnar
872a1211bb
Format according to Houndbot #3
2018-09-23 18:58:56 +02:00
Jure Grabnar
d6f7ec2604
Format according to houndbot #2
2018-09-23 18:53:43 +02:00
Jure Grabnar
869967361c
Fix according to Houndbot
2018-09-23 18:48:44 +02:00
Jure Grabnar
59169f882d
Add permission check for every project
2018-09-23 14:34:21 +02:00
Jure Grabnar
90b220ddda
Format according to Houndbot #4
2018-09-23 12:06:06 +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
Luka Murn
5d6881bae1
Merge pull request #1309 from biosistemika/release-1.14.5
...
Merge release-1.14.5 into master
2018-09-20 08:53:51 +02:00
Oleksii Kriuchykhin
872a48082a
Remove Samples from search controller [SCI-2739]
2018-09-18 15:03:19 +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
Oleksii Kriuchykhin
acc00ff3b9
Add CREATE Result endpoint: Create Text result [SCI-2718]
2018-09-13 13:38:11 +02:00
Zanz2
8ac1445ace
Fixed hound
2018-09-13 11:37:07 +02:00
Zanz2
7f704c07e3
Created base endpoints for projects and related models
2018-09-13 11:37:07 +02:00
Zanz2
dace81f724
created base projects endpoint
2018-09-13 11:37:07 +02:00
Zanz2
bd49ea56c5
Added results endpoint
2018-09-13 11:16:34 +02:00
Zanz2
426bd129cc
Added task inputs and outputs functionality
2018-09-13 11:14:22 +02:00
Oleksii Kriuchykhin
9d9a5d07d8
Fix CREATE inventory endpoint [SCI-2693]
2018-09-13 11:08:58 +02:00
Zanz2
2519a010f6
Created new controllers and serializers for nested task related attributes
2018-09-13 11:04:52 +02:00
Zanz2
765ee25853
Merge pull request #1292 from Zanz2/zz_experiments_api_task_2666
...
Created API endpoints for experiments and related data [SCI-2666]
2018-09-13 10:49:49 +02:00
Zanz2
1159ce519c
Review changes
2018-09-13 09:25:16 +02:00
Luka Murn
0b68a670c2
Fix the inventory_columns_controller#create action
...
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
2018-09-12 13:44:10 +02:00
Zanz2
4c2c92445c
fixed oversight, added paging to connections
2018-09-11 13:07:28 +02:00
Zanz2
7cb50145a0
Merge pull request #1275 from Zanz2/zz_adding_removing_table_sci2621
...
Fixed table add and remove crash [SCI-2621]
2018-09-11 09:37:07 +02:00
Zanz2
e64aee5db0
Completed the functionality for experiments and related endpoints
2018-09-07 11:58:02 +02:00
Zanz2
1589cfb1b2
saving work
2018-09-06 15:38:48 +02:00
Luka Murn
586a442abc
Refactor the settings page, rename setting to tooltips_enabled
2018-09-05 16:36:32 +02:00
Zanz2
f9d55f913a
trying to fix display of my modules data
2018-09-05 12:54:08 +02:00
Zanz2
5ada21725f
inital experiments api functionality
2018-09-05 09:55:04 +02:00
Zanz2
1bed2c2a3c
Partially fixed according to pull request review, added comments to code review
2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663
...
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
2018-08-31 11:42:26 +02:00
Zanz2
728b1fe491
Reverted deleted lines by accident
2018-08-28 14:51:05 +02:00
Zanz2
b26530a02f
Found a new, and more elegant fix inside controller with Luka
2018-08-28 14:48:23 +02:00
Alex Kriuchykhin
18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604
...
Improve health check endpoint [SCI-2604]
2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin
4d49671ae8
Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695]
2018-08-24 16:41:26 +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
5488fc66fc
Refactor JSON API mime type registration [SCI-2687]
2018-08-24 15:37:23 +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
Alex Kriuchykhin
eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613
...
Add READ user endpoint [SCI-2613]
2018-08-24 15:23:05 +02:00
Alex Kriuchykhin
427ab5fb41
Merge pull request #1264 from okriuchykhin/ok_SCI_2615
...
Add GET inventory columns API endpoint [SCI-2615]
2018-08-24 15:22:35 +02:00
Alex Kriuchykhin
1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614
...
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
2018-08-24 15:22:13 +02:00
Alex Kriuchykhin
0ca9972905
Merge pull request #1271 from okriuchykhin/ok_SCI_2628
...
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-22 14:21:18 +02:00
Jure Grabnar
295c6a9432
Add export all functionality (basic skeleton)
2018-08-21 21:07:45 +02:00
Luka Murn
92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634
...
fix editing of inventory items of hidden columns [SCI-2634]
2018-08-21 16:59:37 +02:00
Luka Murn
92a4a54ae7
Slighty change the parameter parsing of removed file cells
2018-08-21 16:46:47 +02:00
Oleksii Kriuchykhin
a8013118d4
Add READ user endpoint [SCI-2613]
2018-08-21 13:56:14 +02:00
Zanz2
ab3b15e13e
Found the bug and fixed it
2018-08-21 13:26:16 +02:00
Zanz2
817d09ad5f
fixed hound
2018-08-21 11:29:38 +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
3a5238f6f3
Fix error on activities page when user doesn't have any [SCI-2628]
2018-08-20 14:26:42 +02:00
Oleksii Kriuchykhin
1a57289009
Improve health check endpoint [SCI-2604]
2018-08-17 16:13:21 +02:00
Oleksii Kriuchykhin
ecde634a2c
Add OAuth2 provider [SCI-2515]
2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin
ef7e0ac489
Add GET inventory columns API endpoint [SCI-2615]
2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin
4df9a4c9ca
Fix code style warnings [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
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611
...
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-08-08 16:59:42 +02:00
mlorb
f52ccfd606
fix editing of inventory items of hidden columns
2018-08-07 11:47:26 +02:00
okriuchykhin
29f0f2afeb
Merge pull request #1257 from okriuchykhin/ok_SCI_2609
...
Refactor tasks tree API endpoint [SCI-2609]
2018-08-02 17:10:55 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608
...
Adds API authentication with Azure AD [SCI-2608]
2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
22e12d8fc3
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
26b0bd9e11
Refactor tasks tree API endpoint [SCI-2609]
2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin
0e372af729
Adds API authentication with Azure AD [SCI-2608]
2018-07-24 14:21:33 +02:00
zmagod
29e0ecbc89
move FirstTimeDataGenerator helper from applictaion controller
2018-07-11 11:19:39 +02:00
zmagod
8b86891177
fixes file destroy button [fixes SCI-2546]
2018-07-03 15:25:37 +02:00
zmagod
28bac14667
first working version of the edit form object
2018-07-03 12:57:39 +02:00
ZmagoD
23de3abd61
Fixes repository items edit action, adds additional event listener for file upload
2018-06-29 16:59:26 +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
6a6ff534c0
fixes import flash message [fixes SCI-2398]
2018-06-15 11:12:11 +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
6ba5c587f7
Merge pull request #1189 from ZmagoD/zd_SCI_2211
...
add data-hook, refactor add user to project modal to support addons
2018-06-08 15:23:26 +02:00
zmagod
f769215468
fixes assign items flash message [fixes SCI-2487]
2018-06-08 10:02:57 +02:00
Zmago Devetak
fad67d7730
Merge pull request #1185 from ZmagoD/zd_SCI_2468
...
Limits the max. amount of rows when importing into inventories [fixes…
2018-06-04 16:29:33 +02:00
zmagod
84170f6de0
add data-hook, refactor add user to project modal to support addons
2018-06-01 16:13:22 +02:00
Oleksii Kriuchykhin
58d8414f92
Code fixes for sidebar [SCI-2478]
2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin
2ddc0fb561
Improve sidebar rendering performance [SCI-2478]
2018-06-01 13:49:02 +02:00
zmagod
9abf50e7c5
Limits the max. amount of rows when importing into inventories [fixes SCI-2468]
2018-05-31 10:45:31 +02:00
Oleksii Kriuchykhin
6cf9149baa
Add user id tracking when discarding repository [SCI-2462]
2018-05-29 15:33:02 +02:00
zmagod
89046e9787
fixes items assign flash message [fixes SCI-2395]
2018-05-29 12:54:41 +02:00
okriuchykhin
6deaa7235b
Merge pull request #1136 from okriuchykhin/ok_SCI_2396
...
Handle situation with smart annotations and zero inventories [SCI-2396]
2018-05-28 17:23:29 +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
Zmago Devetak
ad5114090f
Merge pull request #1165 from ZmagoD/zd_SCI_2433
...
fixes tast description/due-date modal [fixes SCI-2433]
2018-05-28 13:10:15 +02:00
okriuchykhin
0e6c89c3de
Merge pull request #1166 from okriuchykhin/ok_SCI_2342
...
Fix WOPI controller to support repositories [SCI-2342]
2018-05-28 13:07:17 +02:00
zmagod
c683cfdbd7
triggers the delayed job in the controller action, fixes smart annotations
2018-05-25 11:41:43 +02:00
Oleksii Kriuchykhin
46d6accf78
Fix search in repositories [SCI-2428]
2018-05-24 17:14:40 +02:00
Oleksii Kriuchykhin
b019ab8f61
Fix WOPI controller to support repositories [SCI-2342]
2018-05-24 16:51:25 +02:00
zmagod
10351bbf83
fixes tast description/due-date modal [fixes SCI-2433]
2018-05-24 16:44:10 +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
okriuchykhin
7b08529e39
Merge pull request #1156 from okriuchykhin/ok_SCI_2342
...
Enable editing office online files in inventories [SCI-2342]
2018-05-23 12:59:12 +02:00
Luka Murn
31a1641b42
Merge pull request #1155 from Ducz0r/lm-sci-2436-fix
...
Update new repository row code so file columns work again [SCI-2436]
2018-05-22 09:27:32 +02:00
Oleksii Kriuchykhin
5c41527b92
Enable editing office online files in inventories [SCI-2342]
2018-05-21 15:48:48 +02:00
Luka Murn
6135081a71
Update new repository row code so file columns work again
...
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.
Closes SCI-2436.
2018-05-21 14:46:30 +02:00
zmagod
ba2aafae39
fix access to public reports [fixes SCI-2340]
2018-05-21 14:45:18 +02:00
zmagod
5514683f96
shorten project name [fixes SCI-2344]
2018-05-18 14:12:12 +02:00
zmagod
38b0cb742c
removes empty space
2018-05-17 15:21:45 +02:00
zmagod
e019767e90
refactor save_pdf_to_inventory_item service
2018-05-17 13:17:19 +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
Zmago Devetak
9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321
...
fixes images preview in repository/library [fixes SCI-2321]
2018-05-16 12:05:33 +02:00
okriuchykhin
19ed711ce2
Merge pull request #1142 from okriuchykhin/ok_SCI_2411
...
Fix pagination in global search inside repositories [SCI-2411]
2018-05-16 10:19:05 +02:00
okriuchykhin
3e2b455d2c
Merge pull request #1139 from okriuchykhin/ok_SCI_2385
...
Fix task resore permissions [SCI-2385]
2018-05-16 10:17:51 +02:00
zmagod
4573655ec8
adds save PDF report to inventory feature [fixes SCI-2371]
2018-05-16 09:31:19 +02:00
Oleksii Kriuchykhin
0ca0884937
Fix pagination in global search inside repositories [SCI-2411]
2018-05-15 17:48:48 +02:00
Oleksii Kriuchykhin
1d0536b064
Fix task resore permissions [SCI-2385]
2018-05-15 11:51:53 +02:00
Oleksii Kriuchykhin
addf4cfe5e
Handle situation with smart annotations and zero inventories [SCI-2396]
2018-05-14 15:34:23 +02:00
Oleksii Kriuchykhin
a92abc5995
Fix editing of inventory rows with existing files [SCI-2394]
2018-05-14 14:26:01 +02:00
okriuchykhin
3b4d9fe744
Merge pull request #1132 from okriuchykhin/ok_SCI_2301
...
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
2018-05-10 10:46:25 +02:00
zmagod
e5c3fb6af2
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
2018-05-10 10:38:56 +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
zmagod
0fe499d4a1
adds the update action to repository records last_modified_by field when downstreaming assigned records
2018-05-10 09:04:12 +02:00
Oleksii Kriuchykhin
8ec643c54b
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
2018-05-09 18:03:16 +02:00
Zmago Devetak
a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344
...
adds new string truncation method [fixes SCI-2344]
2018-05-07 16:30:12 +02:00
zmagod
fa30278153
change dropdown lenght
2018-05-03 16:25:59 +02:00
zmagod
0b721d86b1
adds new string truncation method [fixes SCI-2344]
2018-05-03 14:24:23 +02:00
mlorb
d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244
...
Update buttons positions and wording throughout app [SCI-2244]
2018-05-03 11:05:15 +02:00
zmagod
66b676b5ce
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
2018-04-26 17:04:36 +02:00
zmagod
0afe461962
fixes download link
2018-04-26 17:00:51 +02:00
zmagod
e9642cadad
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304
2018-04-26 14:26:30 +02:00
zmagod
ca539cdce8
remove samples from search
2018-04-26 14:25:02 +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
mlorb
88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244
2018-04-26 14:07:03 +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
Zmago Devetak
a6b2bb0228
Merge pull request #1120 from ZmagoD/zd_SCI_2338
...
add permission check to repostiory show action [fixes SCI-2338]
2018-04-26 09:41:43 +02:00
mlorb
9e11f3b220
update buttons positions and wording throughout app
2018-04-25 13:57:12 +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
12365b3f0f
add permission check to repostiory show action [fixes SCI-2338]
2018-04-25 11:56:30 +02:00
zmagod
c2d19fee52
fixes images preview in repository/library [fixes SCI-2321]
2018-04-24 13:11:55 +02:00
Zmago Devetak
096167c125
Merge pull request #1101 from ZmagoD/zd_SCI_2124
...
adds new reports index page [fixes SCI-2124]
2018-04-23 12:42:24 +02:00
zmagod
199a2a23bf
fixes per @mlorb 's request
2018-04-23 12:26:21 +02:00
zmagod
824962c084
propagate assigned repository items in workflow [fixes SCI-2261]
2018-04-23 11:33:16 +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
e96b690a5b
removes reports link from secondary navigation, fix bug with turbolinks
2018-04-20 11:57:52 +02:00
Zmago Devetak
76c4202664
Merge pull request #1110 from ZmagoD/zd_SCI_2311
...
fixes controller action in manage_columns
2018-04-20 10:36:31 +02:00
zmagod
dafa29d4bf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124
2018-04-20 10:33:15 +02:00
zmagod
74f23ee461
fixes controller action in manage_columns
2018-04-20 09:53:15 +02:00
mlorb
3249d5db0d
Merge pull request #1100 from mlorb/ml-sci-2303
...
Update reports show page to work with new navigation [SCI-2303]
2018-04-20 09:50:35 +02:00
Zmago Devetak
93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259
...
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-19 17:17:54 +02:00
Zmago Devetak
1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207
...
enables copying of repository items [fixes SCI-2207]
2018-04-19 17:13:43 +02:00
zmagod
ce52eb851b
add validation to dropdown items
2018-04-19 14:02:42 +02:00
zmagod
9d282d1800
adds new reports index page [fixes SCI-2124]
2018-04-18 16:47:52 +02:00
mlorb
cc34376253
update reports show page to work with new navigation
2018-04-18 14:40:53 +02:00
mlorb
600ec99c82
fix project navigation to work with archived pages and correct current team
2018-04-17 13:52:43 +02:00
Zmago Devetak
f90589d714
Merge pull request #1095 from ZmagoD/zd_SCI_2300
...
fixes archive button [fixes SCI-2300]
2018-04-16 16:19:21 +02:00
Zmago Devetak
a0f549e935
Merge pull request #1093 from ZmagoD/zd_SCI_2296
...
hides the create new inventory button for non admin users [fixes SCI-…
2018-04-16 16:18:15 +02:00
mlorb
dceef349a4
fix bug and some refectoring
2018-04-16 14:10:49 +02:00
zmagod
a2d8285f35
fixes archive button but [fixes SCI-2300]
2018-04-16 09:22:10 +02:00
mlorb
2627efe402
implement file column type when editing & creating new rows in inventories DataTables
2018-04-13 17:21:17 +02:00
zmagod
bef166ff30
hides the create new inventory button for non admin users [fixes SCI-2296]
2018-04-13 13:39:58 +02:00
zmagod
4f21833373
changes per @duco 's request
2018-04-13 11:47:33 +02:00
Luka Murn
09c60d2468
Fixes per @Ducz0r's request
2018-04-12 14:38:22 +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
6291857bbf
enables copying of repository items [fixes SCI-2207]
2018-04-11 17:17:19 +02:00
zmagod
e4b49e62a3
fixes import limit
2018-04-10 15:45:51 +02:00
mlorb
a10f671184
Merge pull request #1081 from mlorb/ml-sci-2123
...
Refactor settings into the new navigation bar [SCI-2123]
2018-04-09 13:21:16 +02:00
mlorb
80fe1dd73b
fix travis
2018-04-06 17:16:04 +02:00
Zmago Devetak
bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219
...
adds manage columns page
2018-04-06 17:06:28 +02:00
zmagod
cf7761daaa
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223
2018-04-06 12:56:39 +02:00
mlorb
b8e91e91a1
refactor settings into the new navigation bar
2018-04-05 16:30:02 +02:00
zmagod
515c95061c
fixes delete column action
2018-04-05 09:56:09 +02:00
zmagod
a8a19df06d
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-05 08:51:58 +02:00
zmagod
0c05c60ebf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-04 16:06:38 +02:00
Oleksii Kriuchykhin
3b7977ee3b
Merge latest changes from ux-release-1 [SCI-2217]
2018-04-04 14:20:34 +02:00
zmagod
38b84edfb0
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-04-04 12:59:41 +02:00
Oleksii Kriuchykhin
d8d2d75631
Fix repository rows permissions [SCI-2265]
2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin
51860652c1
Refactor smart annotations modal [SCI-2223]
2018-04-02 20:38:56 +02:00
okriuchykhin
5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111
...
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
zmagod
56b0900619
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-03-29 16:42:10 +02:00
zmagod
7c1390ece2
implement sidebar toggle [fixes SCI-2232]
2018-03-28 14:12:11 +02:00
Luka Murn
c07dc98cc8
Fix Office Online editing of files [SCI-2264]
...
Office Online files could not be edited. I believe the reason
was that in Rails 5.1, `render nothing: true` was removed. So
I replaced this in `wopi_controller` with `render body: nil`.
Hopefully this will do the trick.
Closes SCI-2264.
2018-03-28 13:22:30 +02:00
okriuchykhin
fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250
...
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-26 14:19:49 +02:00
okriuchykhin
b1fcdb7474
Merge pull request #1057 from okriuchykhin/ok_SCI_2249
...
Fix sample assign permissions [SCI-2249]
2018-03-26 13:24:38 +02:00
Oleksii Kriuchykhin
e42fc3117b
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-26 13:19:09 +02:00
zmagod
8f09e1f7a4
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-03-26 13:08:31 +02:00
zmagod
c61efb0624
rename before_acton hook
2018-03-26 13:07:00 +02:00
Oleksii Kriuchykhin
aa69624f9f
Fix sample assign permissions [SCI-2249]
2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin
ecd3c73772
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-25 13:36:24 +02:00
zmagod
baf69461f5
adds edit/create modal and related actions
2018-03-23 16:00:33 +01:00
mlorb
bc06542ed7
refactor project navigation
2018-03-22 11:41:33 +01:00
zmagod
3be3c00574
adds manage columns page [fixes SCI-2218]
2018-03-22 09:35:36 +01:00
zmagod
81df97f008
add library sidebar and create new library button [fixes SCI-2121]
2018-03-21 09:22:55 +01:00
zmagod
62858bc14f
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-03-20 14:46:11 +01:00
zmagod
1ad8c259d1
add blank page for repositories [fixes SCI-2139]
2018-03-20 14:45:57 +01:00
zmagod
c46da5cc67
fixes import protocol bug for guest user [fixes SCI-2197]
2018-03-19 16:10:28 +01:00
Oleksii Kriuchykhin
a105e61d48
Remove tutorial [SCI-1860]
2018-03-18 13:18:05 +01:00
zmagod
fad4001273
fix edit row action
2018-03-16 12:27:19 +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
c2eb6d6900
fixes hound adds specs to repository_list_items controller
2018-03-16 10:53:05 +01:00
zmagod
d69754af04
implement search on list items dropdown, update, create actions [fixes SCI-2070]
2018-03-15 15:43:16 +01:00
Zmago Devetak
f778415321
Merge pull request #1014 from ZmagoD/zd_SCI_2025
...
Fix custom repositories export so it supports "list of values" custom column types [fixes SCI-2025]
2018-03-13 15:20:46 +01:00
Zmago Devetak
d7679dcb99
Merge pull request #1032 from ZmagoD/zd_SCI_2141
...
refactor global activities in separate page [fixes SCI-2141]
2018-03-13 15:20:14 +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
Oleksii Kriuchykhin
21c07371c9
Fix repository export to support file columns [SCI-2079]
2018-03-13 10:40:27 +01:00
zmagod
e218cae453
refactor global activities in separate page [fixes SCI-2141]
2018-03-12 11:01:23 +01:00
mlorb
64e26e1c60
add file custom column type to db
2018-03-09 17:04:54 +01:00
okriuchykhin
707d2a048f
Merge pull request #1024 from okriuchykhin/ok_SCI_2145
...
Fix sample record creation [SCI-2145]
2018-03-09 16:52:38 +01:00
okriuchykhin
7cbfa5936a
Merge pull request #1026 from okriuchykhin/ok_SCI_2148
...
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
2018-03-09 16:42:33 +01:00
Oleksii Kriuchykhin
853e1f7657
Fix nil case [SCI-2145]
2018-03-09 16:41:23 +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
940469e41b
Fix user management on project [SCI-2146]
2018-03-09 12:08:34 +01:00
Oleksii Kriuchykhin
804d313f90
Fix sample record creation [SCI-2145]
2018-03-09 11:52:28 +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
Oleksii Kriuchykhin
1082f7f93c
Fix notification for user removal from a team [SCI-2131]
2018-03-07 13:20:17 +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
Matej Zrimšek
c5b0a6525b
Some additional permission calls fixes, minor refactoring.
2018-03-06 06:56:35 +01:00
Zanz2
c5728c4018
Merge branch 'master' into null_step_crash_sci2043
2018-03-05 16:37:24 +01:00
zmagod
fca01bd54f
refactor repository export [fixes SCI-2025]
2018-03-05 15:54:04 +01:00
mlorb
5e44859ce0
Merge pull request #1010 from mlorb/ml-sci-1826
...
Sign up with linkedIn account [SCI-1826]
2018-03-05 13:24:36 +01:00
mlorb
a19b672a83
change validation again
2018-03-05 13:12:44 +01:00
Matej Zrimšek
61d1f5374d
Additionaly removed some unneeded code, related to the previous commit.
2018-03-04 15:24:43 +01:00
Matej Zrimšek
53f75f3cd6
Minor permissions and their calls refactoring and fixing.
2018-03-04 14:49:41 +01:00
mlorb
d19ca7fbdc
change validation
2018-03-02 16:32:46 +01:00
zmagod
4642d049fa
fix hound
2018-03-02 14:16:31 +01:00
zmagod
2b55cd7090
rename variables
2018-03-02 14:14:27 +01:00
mlorb
f5949e9d10
refactor
2018-03-01 17:52:24 +01:00
mlorb
08439e7f58
sign up with linkedIn account
2018-02-28 18:12:21 +01:00
zmagod
29a1073a50
refactor queries
2018-02-27 16:34:51 +01:00
zmagod
e3ca782996
add info modal for repository items [fixes SCI-2066]
2018-02-27 16:21:46 +01:00
Matej Zrimšek
96a6779d55
Fixed misspelled permission call.
2018-02-22 14:08:12 +01:00
Matej Zrimšek
ff9dff5c10
Fixed reports permissions check calls. Fixed Hound warnings.
2018-02-22 13:51:22 +01:00
Zanz2
29aea1ebd2
refactored according to PR
2018-02-21 16:17:53 +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
mlorb
d2dcb765b4
fix bug with load older activities button not working
2018-02-16 15:42:10 +01:00
Matej Zrimšek
7b07e7b347
Fixed protocol in repository permissions, and refactored it a bit.
2018-02-16 12:04:11 +01:00
Matej Zrimšek
6ba226d514
Added missing '?' to the canaid permission calls that were missing it.
2018-02-16 11:12:30 +01:00
Matej Zrimšek
5bda53eebf
Overall refactoring of all canaid permissions and code related to their calls.
2018-02-16 10:54:06 +01:00
Matej Zrimšek
4fe669ca9a
Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.
2018-02-16 10:53:22 +01:00
Zanz2
c963c948a1
Fixed main issue, bad step structure now gets fixed to empty template
2018-02-15 23:28:20 +01:00
Zanz2
95501eb046
saving work for later
2018-02-15 20:01:36 +01:00
mlorb
9797712561
Merge pull request #997 from mlorb/ml-sci-2045
...
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
2018-02-15 14:51:40 +01:00
Matej Zrimšek
09c5e23adf
Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
d571ab2ed8
Fixed comments permissions for experiment level.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
6b1fee4d30
Added/joined repository record assignment to task with sample assignmment to task.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
4c87fb4a55
Fixed permission error when restoring task.
2018-02-14 14:39:09 +01:00
Matej Zrimšek
946f516171
Fixed permission error when moving a freshly cloned task.
2018-02-14 14:39:09 +01:00
Matej Zrimšek
d55734e501
Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.
2018-02-14 14:39:07 +01:00
Matej Zrimšek
d7108f5a35
Fixed Hound warnings.
2018-02-14 14:39:07 +01:00
Matej Zrimšek
8ef6c8f91f
Refactored remaining experiment level permissions (and everything below it).
2018-02-14 14:39:07 +01:00
Matej Zrimšek
0706d16020
Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
1182ce5da1
Fixed experiment level permission checks in the controllers.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
7938c2e036
Minor code style changes.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
c5b798017e
Minor Hound warning fixes.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
d6e7ef465c
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6
Grouped permissions for experiment with canaid gem (WIP).
2018-02-14 14:19:00 +01:00
Matej Zrimšek
d058c371d4
Readded project archive permission.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
e36ec69ca9
Project level permissions refactoring (mostly names).
2018-02-14 13:16:32 +01:00
Matej Zrimšek
93536afcd5
Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
13e9a2a132
Corrected some project level permissions; minor refactoring.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
a21343a819
Fixing and refactoring project permissions in controllers.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
279da20060
Fixed Hound warnings.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
d423700e84
Used permissions where they were missing.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
321ddc2916
Grouped existing project permissions and used 'canaid' gem.
2018-02-14 13:09:45 +01:00
mlorb
8d0ac93c80
add check to start work on next task notification if recent changes notification is switched off
2018-02-13 11:01:45 +01:00
Zmago Devetak
027297d46a
Merge pull request #985 from ZmagoD/zd_SCI_2008
...
fixes bug with assets upload on task result page,
2018-02-12 11:40:44 +01:00
okriuchykhin
e7fb1bc716
Merge pull request #967 from okriuchykhin/ok_SCI_1966
...
Merge gilson-iot-rails4 to master [SCI-1966]
2018-02-12 11:02:17 +01:00
Zmago Devetak
e400514020
Merge pull request #981 from ZmagoD/zd_SCI_2026
...
fixes bug with step table update [fixes SCI-2026]
2018-02-07 14:35:15 +01:00
Zanz2
ef0733b886
Merge pull request #988 from Zanz2/red_error_msg_sci1993
...
Accidentally deleted this off master, identical to the branch before [SCI-1993]
2018-02-07 13:08:45 +01:00
Zanz2
367eff6401
re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches
2018-02-07 11:17:53 +01:00
mlorb
e151c963e1
fix error on task activity
2018-02-06 16:34:16 +01:00
zmagod
2ad4eb3488
fix bug with checklists
2018-02-06 16:15:10 +01:00
zmagod
75cc9d11df
fix error on checklists
2018-02-06 16:06:15 +01:00
zmagod
bd1345d560
fixes bug with assets upload on task result page,
...
adds ctrl+v listener to upload images from clipboard, adds image preview modal
2018-02-06 15:39:19 +01:00
Zanz2
83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807
...
Images not imported [SCI-1807]
2018-02-06 14:33:35 +01:00
Zanz2
dac59cf4d0
Refactored to PR, deleted unrelated things
2018-02-06 09:06:33 +01:00
zmagod
b48fa3f231
fixes bug with step table update [fixes SCI-2026]
2018-02-05 17:32:38 +01:00
zmagod
25dcfe66ae
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960
2018-02-01 16:04:05 +01:00
Zanz2
e8f6dc0d24
Merge pull request #962 from Zanz2/missing_error_SCI1993
...
A red error messagge is now displayed when not selecting protocol [SCI-1993]
2018-01-26 16:00:15 +01:00
Oleksii Kriuchykhin
7c14800570
Change base class for API controller [SCI-1966]
2018-01-26 13:34:38 +01:00
Zanz2
e041426a09
Merge pull request #964 from Zanz2/steps_order_SCI1816
...
Steps order fix [SCI-1816]
2018-01-26 11:32:28 +01:00
okriuchykhin
94f604ae17
Merge pull request #961 from okriuchykhin/ok_SCI_1994
...
Actually return 404 when requested asset doesn't exist [SCI-1994]
2018-01-26 11:14:59 +01:00
Zanz2
4ee51959eb
fixed hound
2018-01-26 09:56:59 +01:00
Zanz2
346f9feaef
Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html
2018-01-26 09:34:58 +01:00
Zanz2
24e772d7e5
Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816
2018-01-26 08:26:38 +01:00
Zanz2
fc541147c8
A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone
2018-01-25 15:54:38 +01:00
okriuchykhin
0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970
...
Add health check endpoint to API controller [SCI-1970]
2018-01-25 14:33:37 +01:00
Oleksii Kriuchykhin
7dd9121072
Actually return 404 when requested asset doesn't exist [SCI-1994]
2018-01-25 14:30:04 +01:00
mlorb
ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491
...
Add notification for previous task has been completed [SCI-1491]
2018-01-25 11:35:19 +01:00
zmagod
9b836d04fa
fixes per @mlorb 's request
2018-01-24 13:21:53 +01:00
Zanz2
7fe1c20ebe
Finished the protocol reorder functions and implemented them
2018-01-24 09:31:43 +01:00
Mojca Lorber
ac8b1769be
add notification for previous task has been completed
2018-01-23 15:53: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
28be7c4fc4
Add health check endpoint to API controller [SCI-1970]
2018-01-22 16:52:48 +01:00
zmagod
ee7c646b1d
update user settings controllers to new permission system [fixes SCI-1960]
2018-01-22 16:42:26 +01:00
Oleksii Kriuchykhin
91468faaf9
Fix addons display in info modal [SCI-1875]
2018-01-17 18:30:55 +01:00
zmagod
488dba378e
fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
2018-01-17 15:06:43 +01:00
okriuchykhin
38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939
...
Fix repository records import [SCI-1939]
2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin
3c8d8e2fbb
Fix samples import [SCI-1946]
2018-01-16 17:50:33 +01:00
Oleksii Kriuchykhin
a64012237e
Fix repository records import [SCI-1939]
2018-01-15 18:01:35 +01:00
Zmago Devetak
ebd354e4d5
Merge pull request #900 from ZmagoD/zd_SCI_1854
...
adds premissions service to FE
2018-01-12 14:24:28 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor
...
Protocols.io code beautification and refactoring [SCI-1929]
2018-01-12 12:34:00 +01:00
zmagod
371491c259
refactor
2018-01-12 11:38:52 +01:00
mlorb
aba426091c
add render 403 for create team permission
2018-01-10 10:47:45 +01:00
mlorb
6c4514f550
add create_teams permission checks
2018-01-09 15:28:27 +01:00
zmagod
0d7c116de1
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854
2018-01-09 10:03:02 +01:00
zmagod
c5379896c0
fix HOC to recive objects
2018-01-08 16:28:20 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866
...
Wrong date at activity
2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854
2018-01-08 08:38:14 +01:00
zmagod
eb8124ea5a
follow @duco 's suggestions
2018-01-05 17:08:00 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797
...
Permissions - refactor organization & team level permissions (core) [SCI-1797]
2018-01-05 16:03:55 +01:00
mlorb
99185871c4
fix naming things
2018-01-05 15:15:50 +01:00
mlorb
70ae14a9b8
refactor manage repository permissions again because of addons
2018-01-05 11:17:01 +01:00
mlorb
ec851caa80
refactor manage repository column permissions again because of addons
2018-01-05 10:43:59 +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
b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870
...
Fix adding users to a task [SCI-1870]
2018-01-04 14:14:05 +01:00
mlorb
abced181d5
refactor manage repository rows permissions again because of addons
2018-01-04 11:53:58 +01:00
zmagod
e0e3ef9359
fixes flow, and before_action in permissions_controller
2018-01-03 17:23:50 +01:00
mlorb
0c519b8f03
refactor manage sample elements permissions again because of addons
2018-01-03 16:37:02 +01:00
zmagod
1d3881b649
fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]
2018-01-03 13:48:59 +01:00
mlorb
dc68b3068b
fix Rails 5.1 bug with params
2018-01-03 13:19:56 +01:00
mlorb
0774b6f7e6
refactor manage samples permissions again, so that addons permissions can be added
2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin
49ae9bcd55
Fix adding users to a task [SCI-1870]
2017-12-20 13:44:21 +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
mlorb
bd7eda1506
fix failing tests
2017-12-14 14:18:18 +01:00
mlorb
2936770c01
refactor can view team users ATWHO permission
2017-12-14 14:18:18 +01:00
mlorb
5c790287ec
refactor again manage user team permissions
2017-12-14 14:18:18 +01:00
mlorb
7c1ae6bc82
refactor manage repository permissions
2017-12-14 14:18:18 +01:00
mlorb
2918a9833d
refactor manage repository column permissions
2017-12-14 14:18:18 +01:00
mlorb
3f5e9e60b7
refactor view repository permission
2017-12-14 14:18:18 +01:00
mlorb
079ac7a4d3
refactor manage repository row permissions
2017-12-14 14:18:18 +01:00
mlorb
740ecc674b
refactor view repositories permission
2017-12-14 14:18:18 +01:00
mlorb
3ca51f097f
refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions
2017-12-14 14:18:17 +01:00
mlorb
e577b363b2
byTheWay fix of Rails 5.1 bug
2017-12-14 14:18:17 +01:00
mlorb
29f9414839
refactor create project permission
2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe
refactor update/delete sample permissions
2017-12-14 14:18:17 +01:00
mlorb
b09377cd8d
refactor update sample permission
2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6
refactor view/export samples permission
2017-12-14 14:18:16 +01:00
mlorb
0d37f9c85a
refactor clone protocol permission
2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2
refactor update protocol type in repository
2017-12-14 14:18:16 +01:00
mlorb
806fcbce36
refactor update protocol in repository permission
2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e
refactor read protocol in repository permission
2017-12-14 14:18:15 +01:00
mlorb
a3a494c3a2
fix banana: remove dead code which strangely reappeared, probably with some rebasing
2017-12-14 14:18:15 +01:00
mlorb
ccc2451494
refactor create sample permissions
2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1
refactor create protocol permission
2017-12-14 14:18:14 +01:00
mlorb
11a3cd196c
add create, update team permission and refactor 422 respond handling in controllers
2017-12-14 14:18:14 +01:00
mlorb
8893fd668d
add create, update, delete user_team permission
2017-12-14 14:18:14 +01:00
mlorb
a0b2d3f5ef
refactor read_team permission
2017-12-14 14:18:14 +01:00
zmagod
219ef3baf6
setup new pagination for activities
2017-12-14 14:02:40 +01:00
zmagod
249d3d7698
fixes current timezone setup for activities
2017-12-13 16:48:31 +01:00
okriuchykhin
2fa7591f36
Merge pull request #903 from okriuchykhin/ok_SCI_1864
...
Rename notifications settings accessor [SCI-1864]
2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin
baf3151bb0
Fix notification settings accessors [SCI-1864]
2017-12-13 11:59:53 +01:00
zmagod
b106545d31
fixes per @duco 's request
2017-12-13 08:57:50 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
...
Fixes bug with embedded images [SCI-1624]
2017-12-12 09:53:24 +01:00
Oleksii Kriuchykhin
6256acdfea
Rename notifications settings accessor [SCI-1864]
2017-12-07 13:59:33 +01:00
Luka Murn
86ac07c69f
Merge pull request #902 from biosistemika/rails-5.1
...
Merge rails-5.1 into decoupling-settings-page
2017-12-07 09:25:11 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747
...
Improve server side assets validation display for steps [SCI-1747]
2017-12-04 14:12:43 +01:00
zmagod
e01e7bebbf
add permissions endpoint on the API
2017-12-04 13:25:48 +01:00
Zanz2
835ac6910f
Code refactor part 1
2017-12-02 00:29:47 +01:00
zmagod
52b278fe78
adds premissions service to FE
2017-12-01 17:15:15 +01:00
okriuchykhin
16729ccd7d
Merge pull request #898 from okriuchykhin/ok_SCI_1838
...
Fix assignment of users to projects [SCI-1838]
2017-11-30 11:16:07 +01:00
Oleksii Kriuchykhin
194054d973
Fix assignment of users to projects [SCI-1838]
2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin
7bb52191cd
Fix Ajax calls with redirect [SCI-1837]
2017-11-29 16:13:28 +01:00
Zanz2
bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833
...
Fixed validations lengths and added workarounds for bugs [SCI-1833]
2017-11-24 17:55:20 +01:00
zmagod
066c782cd2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step
2017-11-24 16:29:32 +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
Zanz2
dc5904aed9
Fixed this jira issue and added workarounds for bugs
2017-11-24 01:45:40 +01:00
Zanz2
f577bf93b5
Fixed pull request review
2017-11-21 19:20:15 +01:00
zmagod
91fec89cab
adds tiny_mce_assets to protocol export
2017-11-21 16:30:48 +01:00
Oleksii Kriuchykhin
fe8b7d26c1
Improve server side assets validation display for steps [SCI-1747]
2017-11-21 13:48:06 +01:00
Zanz2
d8c809ffd0
Reviewed pull request
2017-11-20 23:19:34 +01:00
Zanz2
cf66d94d45
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
2017-11-20 00:59:32 +01:00
Zanz2
fa25a6785b
Made the propper files and functionality for the text truncation to function
2017-11-17 02:43:32 +01:00
Zanz2
b2e1623cf1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784
2017-11-16 20:04:12 +01:00
Zanz2
c44465817d
Added the functions and put in limitations from my validations files, changed controller name, added some locals
2017-11-16 20:03:44 +01:00
Zanz2
1b540a75a1
Fixed to use .megabytes
2017-11-16 15:17:13 +01:00
Zanz2
41c1193a78
Fixed unit error;Now when comparing file size, both are in bytes
2017-11-16 01:34:38 +01:00
Oleksii Kriuchykhin
84f4aba213
Pull latest master into gilson-iot-rails4
2017-11-15 15:15:26 +01:00
mlorb
288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190
...
Fix bug when removing all keywords in protocol [SCI-1190]
2017-11-15 11:22:18 +01:00
Mojca Lorber
c2a5b52767
fix bug when removing all keywords in protocol
2017-11-14 15:04:37 +01:00
Zanz2
6b9a10ffe4
Made validations for JSON format and .txt and .json files
2017-11-14 12:02:17 +01:00
Zanz2
f35ab78849
Added some code to make the two seperate jira issues work together (protocol info and scinote tables
2017-11-14 00:56:39 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import
...
Protocols io import
2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc
...
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
2017-11-13 10:07:01 +01:00
Zanz2
23d3ffa5a4
Fixed PR
2017-11-12 15:48:45 +01:00
Zanz2
e7384ac38d
Code review fixes, made seperate helper file
2017-11-12 15:31:04 +01:00
Zanz2
fa2c0fe556
merging
2017-11-09 18:55:17 +01:00
Zanz2
812fa3f1d5
Hopefully this will resolve my merge problems
2017-11-09 17:42:17 +01:00
zmagod
9eac014f1a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
2017-11-09 09:05:22 +01:00
zmagod
e2af987b80
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568
2017-11-09 08:35:39 +01:00
zmagod
54e360bb52
fixes team switch
2017-11-06 15:14:17 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
...
Scinote protocols IO base branch
2017-11-06 14:53:01 +01:00
Zanz2
aa03a889c7
Fixed PR review
2017-11-03 16:28:15 +01:00
zmagod
5bc38414d1
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
2017-11-03 09:56:44 +01:00
zmagod
2118b31762
adds about sciNote modal
2017-11-02 13:23:57 +01:00
Zanz2
de9a3a1d0d
Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly
2017-10-28 23:57:29 +02:00
Zanz2
2413dc251a
Added new preview tables code
2017-10-28 02:19:22 +02:00
okriuchykhin
2e0bf91467
Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
2017-10-27 11:14:39 +02:00
Zanz2
a732c8afa7
Code for protocol repository scinote table elements view
2017-10-26 17:28:27 +02:00
zmagod
3d22a5404d
add scenic gem, teams datatables sql view
2017-10-26 16:59:00 +02:00
zmagod
d2ed415a25
Fixes per @okriuchykhin 's request
2017-10-26 10:42:18 +02:00
Zanz2
79e0a11054
Fixed before start and link not displaying in protocol description
2017-10-25 17:39:01 +02:00
zmagod
5e6a4bb69a
adds environment variable that disables/enables the creation of new team when user sign up
2017-10-25 15:29:04 +02:00
zmagod
c36fcb1fa4
fixes user invitation button [fixes SCI-1726]
2017-10-25 11:31:32 +02:00
Zanz2
19b9da2e83
deleted comment
2017-10-24 19:44:34 +02:00
Zanz2
49501b3d3d
Finished review refactor
2017-10-24 19:24:53 +02:00
Luka Murn
c026b60790
Update Profile page to use validation
2017-10-23 18:04:20 +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
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
44733fefda
Merge pull request #839 from okriuchykhin/ok_SCI_1609
...
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 16:26:36 +02:00
Oleksii Kriuchykhin
631b41cdaa
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 11:38:23 +02:00
Zanz2
67b09adaeb
Fixed last few rubocop errors
2017-10-17 19:43:46 +02:00
Zanz2
6cf775a4b1
Refactored code, made html render on preview too
2017-10-17 19:27:20 +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
zmagod
c554bc5c18
fixes accept invitation bug [fixes SCI-1684]
2017-10-17 16:00:26 +02:00
Oleksii Kriuchykhin
cd0aba1896
Change any? to empty? [SCI-1665]
2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin
c8d2ae70fa
Move duplicated code to service [SCI-1665]
2017-10-17 14:46:16 +02:00
Luka Murn
4e06b5c397
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
2017-10-17 13:17:49 +02:00
Luka Murn
4d8f2665d3
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
2017-10-17 13:10:02 +02:00
Luka Murn
2fb2b90da3
Merge pull request #820 from Ducz0r/lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675]
2017-10-16 13:05:43 +02:00
Zanz2
e72c1bebcb
deleted comments
2017-10-12 19:18:22 +02:00
Zanz2
8d0d6f0502
refactored methods
2017-10-12 19:10:16 +02:00
okriuchykhin
db9a031581
Merge pull request #813 from okriuchykhin/ok_SCI_1642
...
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Zanz2
21036a1081
Deleted unnecesarry if's
2017-10-12 17:22:02 +02:00
Zanz2
414a15872c
Made seperate method for steps mapping
2017-10-12 17:15:43 +02:00
gazvoda
88f03a0706
Merge pull request #735 from gazvoda/lg-SCI-1249-v2
...
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
Oleksii Kriuchykhin
56f52ebfa7
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-12 14:43:25 +02:00
Zanz2
5d667f146e
Moved .js form reset and made a standalone description method
2017-10-11 17:59:09 +02:00
Luka Murn
fe89b942e7
Add Add-ons page to User -> Settings -> Account
...
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
Oleksii Kriuchykhin
f8334b3d5b
Add editable field to task in tasks tree API call [GIOT-44]
2017-10-09 14:38:33 +02:00
zmagod
d85233cb2c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566
2017-10-09 09:30:06 +02:00
zmagod
2a64d23a6e
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567
2017-10-09 09:14:58 +02:00
Zanz2
8720222ac2
Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper)
2017-10-07 22:45:01 +02:00
Zanz2
183c93d21b
Refactoring to git review specifications
2017-10-07 22:13:31 +02:00
Zanz2
9655c98566
Github review refactor
2017-10-07 20:47:05 +02:00
Zanz2
f5b2ad0d34
Refactor github code review
2017-10-07 16:07:04 +02:00
Zanz2
66e5004e60
Changed import text to be inside en.yml, as said in the code review, deleted some blank lines
2017-10-07 15:56:43 +02:00
Oleksii Kriuchykhin
6820511ea0
Further canvas optimizations [SCI-1642]
2017-10-06 12:43:27 +02:00
zmagod
5a31df7204
adds @Ducz0r suggestions
2017-10-06 10:45:22 +02:00
zmagod
dea69014d0
fixes bug with password confirmation
2017-10-06 09:54:17 +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
a020e23286
follow suggestions of @Ducz0r
2017-10-05 13:56:56 +02:00
zmagod
754627efe7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-10-05 11:08:31 +02:00
zmagod
524e8bffbf
fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567]
2017-10-05 10:07:50 +02:00
zmagod
3dc3ed906f
fixes bug with embedded images [fixes SCI.1624]
2017-10-02 18:06:42 +02:00
zmagod
edf4443995
added notification alert [fixes SCI-1566]
2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin
6824f9a8bc
Improve memory utulization in PDF report generator [SCI-1482]
2017-10-02 11:29:22 +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
mlorb
c358f8fa0c
write unit tests for invite users
2017-09-28 14:49:33 +02:00
zmagod
26b526d61b
adds getter and setters for user settings
2017-09-27 14:38:52 +02:00
zmagod
66269d68ff
fixed image upload
2017-09-27 09:17:09 +02:00
zmagod
e2aa0d7515
fixes user profile
2017-09-26 17:29:11 +02:00
Zanz2
b23ca33e73
Deleted todo-list comments :D
2017-09-26 16:46:17 +02:00
Zanz2
c72cf6320a
Finished rubocop refactoring
2017-09-26 16:19:09 +02:00
Zanz2
8d961c934a
Rubocop refactored part of the controller code
2017-09-26 13:17:00 +02:00
Zanz2
2bfe8f0b95
Testing why rubocop gives errors
2017-09-25 15:27:24 +02:00
Zanz2
292c1e3c31
Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first
2017-09-25 14:14:27 +02:00
Zanz2
11b2ef3112
Made code nicer, hopefully not unintentionally breaking something
2017-09-25 13:53:32 +02:00
zmagod
1a7f8fc857
added frontend validations
2017-09-22 16:59:38 +02:00
Zanz2
dd4d4072e8
Made code more aesthetic
2017-09-22 16:02:56 +02:00
Zanz2
6ebdea5dce
Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)
2017-09-22 15:12:29 +02:00
Zanz2
4051c0b06b
Deleted old unused files i spotted on github
2017-09-22 13:28:38 +02:00
Zanz2
deef790951
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
2017-09-22 11:56:50 +02:00
mlorb
9d96bf668a
fix error handeling, refactoring
2017-09-21 16:42:56 +02:00
Zanz2
1dbb03e22d
Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer
2017-09-21 16:05:33 +02:00
zmagod
39025769ec
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-09-21 13:45:27 +02:00
zmagod
ed2beefc08
fixed profile info inputs
2017-09-21 13:42:49 +02:00
mlorb
55772a80ab
fix hound and refactor
2017-09-21 10:45:36 +02:00
mlorb
48c8922604
adds invite users modal
2017-09-21 10:45:35 +02:00
Zanz2
f48833c47a
added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();
2017-09-21 08:40:05 +02:00
Luka Murn
e078ae4f77
Merge branch 'rails-5.1' into decoupling-settings-page
2017-09-21 08:36:09 +02:00
Luka Murn
5429f6bbbd
Fix @ZmagoD's remarks
2017-09-21 08:06:11 +02:00
Zanz2
d59234a1e3
minor changes, working on refresh after submit
2017-09-20 16:04:52 +02:00
Zanz2
72c707ae88
protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit
2017-09-20 15:31:10 +02:00
Luka Murn
416ccf905d
Minor fix
2017-09-20 10:53:38 +02:00
Zanz2
7b85d74a23
added jquery code to reset file selector selected file after it is canceled in the preview modal
2017-09-20 09:32:31 +02:00
Zanz2
3812b2e64b
Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore
2017-09-20 08:58:00 +02:00
Zanz2
ea8f3e822d
Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone
2017-09-20 08:38:34 +02:00
Luka Murn
44877a13a5
Refactor services on backend. New team page is now working
2017-09-19 16:32:21 +02:00
Luka Murn
80c05e50ec
Semi-working version of create new team form
2017-09-19 16:30:26 +02:00
Zanz2
7aba782639
optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show
2017-09-19 15:02:16 +02:00
zmagod
d1477179b2
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499
2017-09-18 15:10:52 +02:00
Zanz2
f861b1fc52
Configured the controller,the main task ahead is to figure out how to import all of the data i have available
2017-09-15 15:52:55 +02:00
zmagod
83647d81b4
adds edit team name modal
2017-09-15 14:00:48 +02:00
Zanz2
5d6cc341ed
added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done
2017-09-14 14:42:04 +02:00
Toni Dezman
d38f4343f2
Decupling redux part 1
2017-09-14 11:46:49 +02:00
Zanz2
29b9d50363
Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer
2017-09-14 11:30:53 +02:00
zmagod
705d07f60e
adds remove team action
2017-09-13 17:11:51 +02:00
Zanz2
9fc91aac32
added protocols io upload preview modal
2017-09-13 16:04:16 +02:00
Zanz2
b7432b336a
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
2017-09-13 15:15:08 +02:00
zmagod
1b3b3dfea9
adds team members update role functionality
2017-09-12 17:30:13 +02:00
Žan Žagar
706031dacb
added model and controler, model should go to services while the controller should go to protocols controller
2017-09-12 15:25:22 +02:00
Toni Dezman
67d617deb5
adds hound_bot's and zmagos suggestions
2017-09-07 13:40:53 +02:00
Toni Dezman
185039bc99
adds suggestions from code review
2017-09-04 15:00:26 +02:00
zmagod
9c01ab414c
refactor leave team
2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin
a927c2832d
Improve error logging [GIOT-31]
2017-09-01 16:36:45 +02:00
zmagod
91d2d8a935
adds team details view
2017-08-31 15:56:55 +02:00
Toni Dezman
4034400c42
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-31 11:42:15 +02:00
Toni Dezman
8b61fe563c
user preferences APIs
2017-08-31 11:23:44 +02:00
zmagod
1325732b0c
adds specs for team controller actions
2017-08-30 16:18:21 +02:00
Toni Dezman
2e6a942152
api for timezone
2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin
c3fceb90df
Backport API to Rails-4 [SCI-1579]
2017-08-30 13:30:41 +02:00
zmagod
ee054f91b8
adds bullet gem [fixes SCI-1578]
2017-08-30 09:29:45 +02:00
Toni Dezman
c82dfa502a
adds errors in client_api for users_controller
2017-08-29 13:14:52 +02:00
zmagod
ec86691659
fixed tests
2017-08-29 12:04:00 +02:00
zmagod
c54dd9473e
adds controller spec for leave team [fixes SCI-1497]
2017-08-29 11:56:46 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
zmagod
5ea464b675
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497
2017-08-28 09:36:29 +02:00
Toni Dezman
ea9a195f09
email and password action/redusers work
2017-08-26 14:07:31 +02:00
zmagod
db16da7bd6
adds custom query to fetch teams data
2017-08-25 16:07:37 +02:00
Toni Dezman
ccd14f6b50
adds apis for full_name and initials input fields
2017-08-25 14:45:02 +02:00
Toni Dezman
989be6563f
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-25 09:06:38 +02:00
zmagod
782daabce1
first run
2017-08-25 08:54:32 +02:00
Toni Dezman
e4a704d063
namespaces client_api/users/user_controller.rb
2017-08-25 08:21:52 +02:00
zmagod
685cb42aac
fixes repository, protocols link, adds csfr token to request headers
2017-08-21 15:30:54 +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
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
zmagod
bd352869a3
adds user account dropdown
2017-08-09 09:08:13 +02:00
zmagod
226458a3f0
adds recent notifications
2017-08-08 15:44:28 +02:00
zmagod
be42cd2204
refactor
2017-08-07 13:51:22 +02:00
Luka Murn
13eae287bb
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
2017-08-07 11:54:45 +02:00
Luka Murn
c6448264d0
Revert "Td sci 1492"
2017-08-07 11:47:21 +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
Oleksii Kriuchykhin
35b643f34e
Fix typo in config and code style improvements [SCI-1507]
2017-08-04 10:19:56 +02:00
Oleksii Kriuchykhin
e958410261
Add core API using JWT authentication and tests for it [SCI-1507]
2017-08-03 17:00:14 +02:00
zmagod
c314bae28d
add team switch js/controller
2017-08-03 16:03:15 +02:00
zmagod
2e83322f76
fixes global activities
2017-08-03 11:17:09 +02:00
zmagod
6ef19725f1
adds redux
2017-08-02 17:27:05 +02:00
lenart
e781dfc6a6
Truncate activity taking smart annotations into account fixes [SCI-1249]
2017-08-02 15:51:32 +02:00
zmagod
caae1e2fe8
adds intl, router, bootstrap to npm modules
2017-07-31 10:42:40 +02:00
Toni Dezman
f76512f364
adds hound recomendations for react/settings_controller.rb
2017-07-28 12:53:15 +02:00
Toni Dezman
1673d43993
adds react/settings controller and react/layout
2017-07-27 15:26:03 +02:00
Oleksii Kriuchykhin
6a43483a2f
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:22:26 +02:00
Matej Zrimšek
ad0dce921b
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
2017-07-24 18:12:41 +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
Oleksii Kriuchykhin
036ee390ed
Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]
2017-07-14 16:19:03 +02:00
Mojca Lorber
739f8b5b4e
remove redundant rollback call
2017-07-13 13:49:26 +02:00
Nbernot
2a3e830a3c
Merge pull request #732 from biosistemika/business_users
...
Business users [SCI-1428, SCI-1447]
2017-07-11 13:34:56 +02:00
Luka Murn
16e672b9d8
Add VERSION file where the sciNote Core version is stored
2017-07-10 09:26:35 +02:00
lenart
58e2575c75
Truncate checklist items in activity modal [fixes SCI-1249]
2017-07-07 15:56:16 +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
Nejc Bernot
d917cf3340
Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST
2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d
Changes the host for the download and redirect paths
2017-07-05 10:23:10 +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
zmagod
bc33883c3c
first run fixing addons
2017-06-30 10:23:28 +02:00
Oleksii Kriuchykhin
e474cda03a
Fix activities [SCI-1412]
2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin
21cce4baa0
Fix global search [SCI-1411]
2017-06-28 15:44:18 +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
4060ba2ac3
Code style fixes [SCI-1356]
2017-06-27 13:23:51 +02:00
Matej Zrimšek
f847b44067
Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]
2017-06-26 16:50:40 +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
7367435c6d
refactor
2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19
fix update repository_row
2017-06-22 17:29:17 +02:00
zmagod
590135b9b3
refactor
2017-06-22 17:26:11 +02:00
zmagod
e7328c2e20
fixes row dupplication [fixes SCI-1385]
2017-06-22 16:01:37 +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
Matej Zrimšek
d907819de5
Removed byebug calls. [SCI-1383]
2017-06-21 10:49:00 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c
Removed empty first column of repository export file. [SCI-1383]
2017-06-20 18:40:41 +02:00
mlorb
7cbc8a2f95
Merge pull request #694 from mlorb/ml_sci_1347
...
Fix flash when deleting samples of other users [SCI-1347]
2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b
Merge pull request #693 from mlorb/ml_sci_1351_v3
...
Fix error msg when editing empty cell in repositories [SCI-1351]
2017-06-19 14:19:27 +02:00
zmagod
70fa681519
split the import service
2017-06-19 14:05:37 +02:00
Mojca Lorber
9b941fe374
fix flash when deleting samples of other users
2017-06-16 17:12:04 +02:00
Mojca Lorber
1b683bc70e
fix error msg when editing empty cell in repositories
2017-06-16 15:09:04 +02:00
Mojca Lorber
ea455d3596
fix no repository name in activity bug
2017-06-15 09:43:10 +02:00
Mojca Lorber
e6ec184dba
fix multiple errors handling on fields in repositories tables
2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308
refactor
2017-06-14 10:55:24 +02:00
zmagod
cee052fc19
added service object
2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e
Fixed Hound warning. [SCI-1351]
2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb
Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351]
2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87
fix errors in repo table
2017-06-13 16:56:34 +02:00
mlorb
074a47aae1
Merge pull request #675 from mlorb/ml_sci_1272
...
Fix permissions [SCI-1272]
2017-06-13 10:51:04 +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
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +02:00
Matej Zrimšek
f46d8f6970
Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac
Fixed CSV export of repository records. [SCI-1275]
2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3
Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository
2017-06-09 19:44:28 +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
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
Mojca Lorber
be52af4e4f
fix rename/delete/copy modals not working
2017-06-08 15:13:00 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +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
0aee11d6d8
Hound is love, Hound is life #2
2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d
Hound is love, Hound is life
2017-06-07 18:22:15 +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
Oleksii Kriuchykhin
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +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
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
353c27da15
rename method
2017-06-07 13:51:16 +02:00