Urban Rotnik
|
5ae29d549e
|
Add manage modal for DateTime values
|
2019-11-29 10:19:55 +01:00 |
|
Urban Rotnik
|
fe4aa12ced
|
Add DateTime columns CRUD endpoints
|
2019-11-29 10:19:14 +01:00 |
|
Urban Rotnik
|
dc6cc3bc62
|
Show after create flash messages
|
2019-11-29 10:19:12 +01:00 |
|
Urban Rotnik
|
b2ce600820
|
Add delimiter column for repository_column
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
b2b6296cb5
|
Improve update items action, JS and views
|
2019-11-29 10:19:10 +01:00 |
|
Urban Rotnik
|
24acf1f84b
|
Fix edit mode for File and Text
|
2019-11-29 10:19:08 +01:00 |
|
Urban Rotnik
|
1e8261ac2a
|
Update InventoryColumns API for new Status Type
|
2019-11-29 10:19:07 +01:00 |
|
Urban Rotnik
|
7ab12baef9
|
Add API endpoint for StatusItems
|
2019-11-29 10:19:07 +01:00 |
|
Mojca Lorber
|
bcb8cc1840
|
Remove byebug
|
2019-11-29 10:17:54 +01:00 |
|
Mojca Lorber
|
305104f639
|
Refactor text inventory type
|
2019-11-29 10:17:53 +01:00 |
|
Urban Rotnik
|
37b7d5aa64
|
Use values from extends
|
2019-11-29 10:17:52 +01:00 |
|
Urban Rotnik
|
f645ff52ab
|
Refactor ColumnServices
|
2019-11-29 10:17:52 +01:00 |
|
Urban Rotnik
|
28d7a4f284
|
Refactor FileColumnController
|
2019-11-29 10:17:51 +01:00 |
|
Urban Rotnik
|
1720623665
|
Refactor RepositoryListColumn controller
|
2019-11-29 10:17:50 +01:00 |
|
Mojca Lorber
|
482deafdd3
|
Rename partial
|
2019-11-29 10:17:49 +01:00 |
|
Mojca Lorber
|
fe8829b592
|
Fix multiple load of modal
|
2019-11-29 10:17:49 +01:00 |
|
Urban Rotnik
|
5923e8897a
|
Remove commented code
|
2019-11-29 10:16:46 +01:00 |
|
Urban Rotnik
|
4cb3d1b6f0
|
Add BaseColumnsController for column_types controllers
|
2019-11-29 10:16:45 +01:00 |
|
Urban Rotnik
|
14b43d516e
|
Add UpdateStatusColumnService service
|
2019-11-29 10:16:45 +01:00 |
|
Urban Rotnik
|
5930bdd794
|
Add StatusColumnsController
|
2019-11-29 10:16:44 +01:00 |
|
Oleksii Kriuchykhin
|
6c7f45fc20
|
Add simplified view for sign-in form [SCI-4098]
|
2019-11-28 17:00:43 +01:00 |
|
Miha Mencin
|
13191f1a72
|
Merge pull request #2223 from biosistemika/SCI-4058-disable-inventory-delition-for-normal-user
Sci 4058 disable inventory delition for normal user
|
2019-11-28 14:31:32 +01:00 |
|
Oleksii Kriuchykhin
|
f5abb7c767
|
Add connected accounts section to settings [SCI-4106]
|
2019-11-27 23:16:25 +01:00 |
|
aignatov-bio
|
68284c10da
|
Add task description and task protocol description activities
|
2019-11-27 14:37:53 +01:00 |
|
Oleksii Kriuchykhin
|
6b20a10473
|
Refactor Azure configuration [SCI-4098]
|
2019-11-26 15:09:40 +01:00 |
|
Alex Kriuchykhin
|
111056a032
|
Merge pull request #2224 from okriuchykhin/ok_SCI_4112
Fix adding experiment contents to report [SCI-4112]
|
2019-11-26 09:50:28 +01:00 |
|
Miha Mencin
|
a328c4ad56
|
fix CR comments
|
2019-11-25 17:40:29 +01:00 |
|
aignatov-bio
|
d732b2f1a6
|
Merge pull request #2228 from aignatov-bio/ai-sci-4090-fix-task-tags
Add strict order to module tags in modal [SCI-4090]
|
2019-11-25 13:55:33 +01:00 |
|
Miha Mencin
|
e65e344c39
|
fix styling
|
2019-11-25 10:45:21 +01:00 |
|
aignatov-bio
|
5100ab4d08
|
Add strict order to module tags in modal
|
2019-11-25 10:15:06 +01:00 |
|
Miha Mencin
|
bd34435b39
|
fixing style issues
|
2019-11-25 08:44:33 +01:00 |
|
aignatov-bio
|
7fa753ca81
|
Fix name update and path to team
|
2019-11-23 23:20:38 +01:00 |
|
Oleksii Kriuchykhin
|
8f94c85b7a
|
Fix adding experimaent contents to report [SCI-4112]
|
2019-11-22 14:57:59 +01:00 |
|
Miha Mencin
|
1bf6663196
|
check the permissions in before action
|
2019-11-22 13:23:02 +01:00 |
|
aignatov-bio
|
2e30f50ae8
|
Merge pull request #2221 from aignatov-bio/ai-sci-3976-add-autosave-other-fields
Add autosave for protocol keywords, user preferences and due date [SCI-3976]
|
2019-11-21 13:13:10 +01:00 |
|
aignatov-bio
|
0b04ca4012
|
Fix markup
|
2019-11-21 12:19:47 +01:00 |
|
Miha Mencin
|
04a6645cfc
|
Separate view/edit/modify permissions SCI-4058
|
2019-11-20 17:12:47 +01:00 |
|
aignatov-bio
|
56ae32323c
|
Add autosave for protocol keywords and user preferences
|
2019-11-20 14:57:53 +01:00 |
|
Oleksii Kriuchykhin
|
46ee43ea8b
|
Improve handling of file links for local storage [SCI-4071]
|
2019-11-19 15:35:31 +01:00 |
|
aignatov-bio
|
264493a322
|
Finish removing Select2 library
|
2019-11-18 13:59:55 +01:00 |
|
aignatov-bio
|
e7ad7ae969
|
New tags drop down
|
2019-11-18 13:59:55 +01:00 |
|
Anton Ignatov
|
17e457c686
|
Finished global activities refactoring
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
fc70ce24f8
|
Refactor side filters for global activities
|
2019-11-18 13:59:54 +01:00 |
|
Anton Ignatov
|
7b855f54ac
|
Finish main part of selectors
|
2019-11-18 13:59:54 +01:00 |
|
Urban Rotnik
|
5e97116c5a
|
Update results params
|
2019-11-18 11:11:39 +01:00 |
|
Urban Rotnik
|
8b5e346770
|
Remove file deletion manually
|
2019-11-18 11:11:39 +01:00 |
|
Urban Rotnik
|
cc9d987321
|
Add update result(file) and create result(file) API endpoint
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
060125a1c4
|
Add file size validation
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
1be88baab1
|
Add API endpoint for Attachments resource
|
2019-11-18 11:11:38 +01:00 |
|
Urban Rotnik
|
e7083e188c
|
Add API endpoint for Step resource
[SCI-3835]
|
2019-11-18 11:11:37 +01:00 |
|
Urban Rotnik
|
24033bec7a
|
Add API endpoint for Task creation
|
2019-11-18 11:11:37 +01:00 |
|
aignatov-bio
|
3eb6f5695b
|
Merge pull request #2207 from aignatov-bio/mlorb-ml-sci-4004
Add auto-save feature to text fields [SCI-4004]
|
2019-11-18 09:11:10 +01:00 |
|
aignatov-bio
|
1488f75e26
|
Add activities
|
2019-11-13 13:57:04 +01:00 |
|
aignatov-bio
|
a9690482d1
|
Add autosave feature to text fields
|
2019-11-12 11:26:18 +01:00 |
|
Oleksii Kriuchykhin
|
b646295698
|
Fix service_url for local storage [SCI-4057]
|
2019-11-06 15:21:56 +01:00 |
|
Oleksii Kriuchykhin
|
ab691efdb2
|
Fix LinkedIn sign-up [SCI-4047]
|
2019-10-29 16:20:19 +01:00 |
|
Alex Kriuchykhin
|
5524598d53
|
Merge pull request #2172 from biosistemika/release_1_17_3
Merge release 1.17.3 to master
|
2019-10-22 12:45:02 +02:00 |
|
Oleksii Kriuchykhin
|
53402c9ce1
|
Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
|
2019-10-17 13:30:14 +02:00 |
|
Oleksii Kriuchykhin
|
f3a6c18a84
|
Improve permission checking for reports [SCI-3991]
|
2019-10-14 14:50:05 +02:00 |
|
aignatov-bio
|
54627faeb3
|
Fix tests
|
2019-10-11 11:46:51 +02:00 |
|
aignatov-bio
|
521a367960
|
Add predefined avatars
|
2019-10-11 11:46:51 +02:00 |
|
Alex Kriuchykhin
|
f6da6814b8
|
Merge pull request #2154 from okriuchykhin/ok_SCI_3977
Generate previews for newly created office files once asset is saved [SCI-3977]
|
2019-10-10 15:43:02 +02:00 |
|
Oleksii Kriuchykhin
|
07b037f05b
|
Generate previews for newly created office files once asset is saved [SCI-3977]
|
2019-10-10 15:40:50 +02:00 |
|
Alex Kriuchykhin
|
48171f7e02
|
Merge pull request #2153 from okriuchykhin/ok_SCI_3977
Fix previews for newly created office files [SCI-3977]
|
2019-10-10 15:11:24 +02:00 |
|
Oleksii Kriuchykhin
|
0b4f72e517
|
Fix previews for newly created office files [SCI-3977]
|
2019-10-10 14:25:19 +02:00 |
|
aignatov-bio
|
9d59d56818
|
Generate all preview for assets at same time
|
2019-10-10 14:17:02 +02:00 |
|
Miha Mencin
|
e2b5989c14
|
Revert "Handle missing experiment previews [SCI-3949]"
|
2019-10-09 16:42:15 +02:00 |
|
Alex Kriuchykhin
|
71aa8e646e
|
Merge pull request #2147 from okriuchykhin/ok_SCI_3949
Handle missing experiment previews [SCI-3949]
|
2019-10-09 16:27:16 +02:00 |
|
Oleksii Kriuchykhin
|
00921a5f6a
|
Hadle missing experiment previews [SCI-3949]
|
2019-10-09 16:24:21 +02:00 |
|
Oleksii Kriuchykhin
|
3d9c2282f3
|
Implement JPEG quality extraction for ActiveStorage [SCI-3959]
|
2019-10-08 10:42:55 +02:00 |
|
Urban Rotnik
|
c296760be8
|
Merge pull request #2125 from urbanrotnik/ur-sci-3962-step-is-not-saved-after-removing-file
Add team_id when asset is creating [SCI-3962]
|
2019-10-04 14:46:18 +02:00 |
|
Alex Kriuchykhin
|
076d61d4d0
|
Merge pull request #2116 from okriuchykhin/ok_SCI_3908
Remove Paperclip from the codebase [SCI-3908]
|
2019-10-04 14:45:42 +02:00 |
|
Urban Rotnik
|
8f0c3bd2ce
|
Add team_id when asset is creating
|
2019-10-04 14:24:19 +02:00 |
|
Oleksii Kriuchykhin
|
9d2ac4179e
|
Fix failing tests [SCI-3908]
|
2019-10-04 13:02:18 +02:00 |
|
Urban Rotnik
|
09e6545f30
|
Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage
Fix for disk storage [SCI-3947]
|
2019-10-03 16:28:09 +02:00 |
|
aignatov-bio
|
a31c5ea1f5
|
Fix marvin JS preview
|
2019-10-03 11:54:26 +02:00 |
|
Urban Rotnik
|
9c88327a16
|
Rename ActiveStorage base controller
|
2019-10-03 11:00:59 +02:00 |
|
Urban Rotnik
|
e2a779ccfe
|
Activestorage fix for disk storage
[SCI-3947]
|
2019-10-02 14:01:38 +02:00 |
|
Oleksii Kriuchykhin
|
dd7f2fe095
|
Fix large preview for documents [SCI-3938]
|
2019-10-01 16:14:28 +02:00 |
|
Oleksii Kriuchykhin
|
584f2d07c0
|
Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934]
|
2019-10-01 13:06:01 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Alex Kriuchykhin
|
53caaf647b
|
Merge pull request #2080 from okriuchykhin/ok_SCI_3891
Move file preview generation to delayed job [SCI-3891]
|
2019-09-27 10:50:21 +02:00 |
|
Anton Ignatov
|
93363da4e5
|
Fix preview for result
|
2019-09-26 16:49:56 +02:00 |
|
Oleksii Kriuchykhin
|
aabeeec95a
|
Move file preview generation to delayed job [SCI-3891]
|
2019-09-23 21:07:03 +02:00 |
|
Anton Ignatov
|
09e3b7c80b
|
Fix repository row import/export
|
2019-09-23 13:33:02 +02:00 |
|
Jure Grabnar
|
8780e5183b
|
Remove CSRF check in WopiController
|
2019-09-19 15:55:29 +02:00 |
|
Jure Grabnar
|
cc561d8ee5
|
Change wopi_controller using Paperclip for reading
|
2019-09-19 15:03:13 +02:00 |
|
aignatov-bio
|
11f6517d0a
|
Fix duplicate marvinjs save (#2057)
|
2019-09-18 11:18:44 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +02:00 |
|
mlorb
|
cf8c98dfa3
|
Merge pull request #2042 from biosistemika/hotfix-september
Hotfix september
|
2019-09-10 13:53:28 +02:00 |
|
Mojca Lorber
|
e8f24b18e2
|
Fix missing icon on shared inventories in global search
|
2019-09-10 11:20:18 +02:00 |
|
Oleksii Kriuchykhin
|
265047caf3
|
Improve behaviour of inventory items export modal [SCI-3815]
|
2019-09-09 10:38:47 +02:00 |
|
Miha Mencin
|
d522b3807a
|
codestyle improvements
|
2019-09-06 14:59:30 +02:00 |
|
Miha Mencin
|
7fc5035d2d
|
PR fixes, codestyle fixes
|
2019-09-06 13:47:06 +02:00 |
|
Miha Mencin
|
2486bd0077
|
SCI3818-unshared-inventory-screen
|
2019-09-05 14:03:08 +02:00 |
|
Mojca Lorber
|
a312c0c4b8
|
fix bug on api endpoint when creating result
|
2019-09-04 13:41:06 +02:00 |
|
mlorb
|
ba5bebedb2
|
change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022)
|
2019-09-02 10:30:29 +02:00 |
|
Oleksii Kriuchykhin
|
267c53c2d2
|
Refactor inventory sharing logic [SCI-3803]
|
2019-08-29 17:21:49 +02:00 |
|
aignatov-bio
|
d3ccdbd83e
|
Create copy permission (#2017)
|
2019-08-29 13:39:22 +02:00 |
|
aignatov-bio
|
96e132c62e
|
Hide share button for users with one team (#2005)
|
2019-08-23 11:29:03 +02:00 |
|
aignatov-bio
|
5515bac773
|
Add assigned items from shared inventories to report (#2002)
|
2019-08-23 11:28:09 +02:00 |
|
Luka Murn
|
5d3a0d7eea
|
Merge pull request #2003 from Ducz0r/lm-remove-legacy-projects-views
Remove legacy projects archive HTML views
|
2019-08-21 17:08:27 +02:00 |
|
Luka Murn
|
701bdbd294
|
Remove archive controller action
|
2019-08-21 16:01:12 +02:00 |
|
aignatov-bio
|
d70b7e2272
|
Make share status icon dynamic (#2007)
|
2019-08-21 15:32:57 +02:00 |
|
aignatov-bio
|
5e3f1d59f5
|
Fix inventory rows import (#1997)
|
2019-08-21 15:32:45 +02:00 |
|
Oleksii Kriuchykhin
|
3918c893db
|
Fix new office file creation [SCI-3778]
|
2019-08-21 13:26:11 +02:00 |
|
Luka Murn
|
084cdcdd6b
|
Remove old archive endpoint, controller logic
|
2019-08-21 13:17:19 +02:00 |
|
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 |
|
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 |
|