scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
7425 commits 70 branches 179 tags 165 MiB
Commit graph

1739 commits

Author SHA1 Message Date
Urban Rotnik 508a9b4e3e RepositoryRows controller refactor 2019-12-10 14:29:35 +01:00
Urban Rotnik 0c990ef8cf Add functions for creating new cells with values 2019-12-10 14:29:34 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
aignatov-bio 09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik 7661a24a44 Remove scope for before_action 2019-12-06 11:15:17 +01:00
Urban Rotnik 2c0a6ed085 Remove current_user vars 2019-12-06 11:12:07 +01:00
Oleksii Kriuchykhin 03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Urban Rotnik ee5c2ac93d Add edit renderer for Assets 2019-12-04 14:52:52 +01:00
aignatov-bio d5f9604e1c Fix file post process method 2019-12-03 10:17:47 +01:00
Urban Rotnik 3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Alex Kriuchykhin fbf1a5b6e2
Merge pull request #2239 from okriuchykhin/ok_SCI_4098 
Refactor Azure configuration  and connected accounts [SCI-4098]
 2019-11-29 11:30:33 +01:00
Urban Rotnik 5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik 65d8d0e35b DateTime HTML and JS simplified 2019-11-29 10:19:57 +01:00
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