OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity
3906 commits 3 branches 67 tags 47 MiB
Commit graph

1187 commits

Author SHA1 Message Date
Michael Stenta 9c392b93e8 Convert sensor data denominator to a signed int because PostgreSQL does not support unsigned. #213 2020-04-09 10:59:59 -04:00
Paul Weidner 0bbec04d09 Check for optional client_secret before enabling oauth client. 2020-03-31 11:43:49 -04:00
Michael Stenta a491a84cd7 Issue #3122259: Remove Farm Tours and dependencies 2020-03-28 11:30:37 -04:00
Michael Stenta 7da2be9b82 Disable farmOS OAuth2 clients when modules that provide them are disabled. 2020-03-25 11:28:45 -04:00
Michael Stenta 2fe098445d Refactor to remove the 'farm_api_enabled_clients' variable. 2020-03-25 11:23:51 -04:00
Michael Stenta 3826a57959 Automatically enable farmOS OAuth2 clients when the module that provides them is enabled. 2020-03-25 11:23:50 -04:00
Michael Stenta 77f0257157 Create a farm_api_enable_oauth_client() helper function. 2020-03-25 09:46:19 -04:00
Michael Stenta 16ba371638 Re-export farm_api Feature. 2020-03-25 09:15:46 -04:00
Michael Stenta 556e2283cf Fix comment. 2020-03-24 11:56:54 -04:00
Michael Stenta a44290677d Document farm_api_check_scope() return value. 2020-03-24 11:56:54 -04:00
Michael Stenta e5ef44f2fc Specify that admin/config/farm/oauth is farmOS-specific in the title and description. 2020-03-24 11:56:54 -04:00
Michael Stenta 6043edaf07 Remove unnecessary 'file path' from hook_menu(). 2020-03-24 11:56:54 -04:00
Michael Stenta aa4192c28e Rename 'administer oauth clients' permission to 'administer farm api oauth clients'. 2020-03-24 11:56:54 -04:00
Michael Stenta 00d4b789b2 Delete the farm_api_enabled_clients when farm_api is uninstalled. 2020-03-24 11:56:54 -04:00
Michael Stenta 3d62e83f0e Install oauth2_server and restws_oauth2_server in farm_api_update_7001(). 2020-03-24 11:56:54 -04:00
Michael Stenta bb2767fe5a Do not call farm_api_install() from update hook, in case it changes in the future. 2020-03-24 11:56:54 -04:00
Michael Stenta 44aa8eeed6 Move hook_install() and hook_uninstall() to top. 2020-03-24 11:56:54 -04:00
Michael Stenta a13c25ec36 Capitalize "URI". 2020-03-24 11:56:54 -04:00
Michael Stenta 54317e2743 Whitespace. 2020-03-24 11:56:54 -04:00
paul121 b93247f4c8 Refactor authorized_callback.js to Drupal JS conventions. 2020-03-24 11:56:39 -04:00
paul121 37ebfcad3a Create separate farm_api_development module for development with OAuth. 2020-03-24 11:56:39 -04:00
paul121 6637611bf2 Enable the farmOS OAuth2 server on existing sites. 2020-03-24 11:56:39 -04:00
paul121 999d26b4ed Refactor to use hook_install and hook_uninstall not disable and enable. 2020-03-24 11:56:39 -04:00
paul121 e8455708f0 Remove unnecessary variable. 2020-03-24 11:56:39 -04:00
paul121 8a097a0e32 Remove redundant variable defining oauth2_server_name. 2020-03-24 11:56:39 -04:00
paul121 c2a6d1f537 Document hook_farm_api_oauth2_client. 2020-03-24 11:56:39 -04:00
paul121 332b576fa6 Allow modules to provide an option oauth2 client_secret. 2020-03-24 11:56:39 -04:00
paul121 be4d7a53c5 Rename hook_farm_oauth_client to hook_farm_api_oauth2_client. 2020-03-24 11:56:39 -04:00
paul121 a64de67dda Merge farm_api_oauth into farm_api. 2020-03-24 11:56:39 -04:00
paul121 1ed4e32f52 Remove default OAuth client. 2020-03-24 11:56:39 -04:00
paul121 5210948c64 Refactor to allow modules to add oauth clients via hook_api 2020-03-24 10:02:19 -04:00
paul121 8ecda18c34 Refactor to allow adding oauth clients via hook_farm_oauth_client, and enable via system settings form. 2020-03-24 10:02:19 -04:00
paul121 89ae497fe0 Disable the implicit OAuth flow by default. OAuth standards no longer recommend the implicit flow. 2020-03-24 07:21:08 -04:00
paul121 7a9535c74e Do not enable the client_credentials grant, client secret by default. This value cannot be made public. 2020-03-24 07:21:08 -04:00
paul121 d3f622af55 Fix deletion of oauth2_server_client and oauth2_server_scope entities. 2020-03-24 07:21:08 -04:00
Paul Weidner 986d87d33f Update farm_api_farm_info to require the farm_info scope for basic info. 2020-03-24 07:21:08 -04:00
Paul Weidner 532c5cfddf Update hook_farm_info api example. 2020-03-24 07:21:08 -04:00
Paul Weidner ae37a1a71c Update the farm.json endpoint to check for OAuth Scopes. 2020-03-24 07:21:08 -04:00
Paul Weidner 08bfb23fd4 Add farm_api_oauth as a submodule of farm_api. 2020-03-24 07:21:08 -04:00
Michael Stenta 09411cbb31 Remove old zoom_levels property from bed area type. 2020-03-18 13:15:29 -04:00
Michael Stenta fde4542b9a Put the farm_l10n module in the farmOS (beta) package. 2020-03-18 10:18:11 -04:00
Michael Stenta 19cab336a8 Export default localization config to new farm_l10n module. 2020-03-18 10:17:47 -04:00
botlfarm ec128c1c28 Changed default configuration from force single to allow multiple. 2020-03-14 20:41:14 -04:00
Michael Stenta a3b7600047 Fix Error: call to undefined function bcscale() #258 2020-02-28 14:20:20 -05:00
Michael Stenta 11dc980beb Move metrics into farm.json. Remove farm_metrics.json. 2020-02-26 11:17:59 -05:00
Michael Stenta 6b20ba1a04 Create a farm_metrics() helper function for loading metrics. 2020-02-26 11:10:44 -05:00
Michael Stenta 209cb5e48a Only show metrics dashboard pane if the user has access to metrics. 2020-02-26 10:40:27 -05:00
Michael Stenta 14b72d7930 Remove unused variable. 2020-02-26 10:40:27 -05:00
Michael Stenta 41758a29d2 Allow all farm roles to access metrics. 2020-02-26 10:40:27 -05:00
Michael Stenta 1db1671256 Move hook_farm_access_perms() to module file for consistency. 2020-02-26 10:40:27 -05:00
Paul Weidner b7cb769191 Refactor hook_farm_metrics to use a 'key' to identify arrays of metrics. 
Without this, the 'farm_metrics.json' endpoint returns an array indexed by element ID, which would be more difficult for consumers of the 'farm_metrics.json' API to parse.
 2020-02-26 10:40:27 -05:00
Paul Weidner ec82d5d9d6 Create farm_metrics.json endpoint to expose metrics over API. 2020-02-26 10:40:27 -05:00
Paul Weidner 6a114b7fc8 Refactor farm_ui.farm_dashboard.inc to farm_ui.farm_metrics.inc. 2020-02-26 10:40:27 -05:00
Paul Weidner 0833072bf5 Refactor farm_area.farm_dashboard.inc to farm_area.farm_metrics.inc. 2020-02-26 10:40:27 -05:00
Paul Weidner de788dfd89 Remove 'farm_dashboard_metrics' from farm_dashboard hook_hook_info. 2020-02-26 10:39:40 -05:00
Paul Weidner 7ee3c604a4 Init farm_metrics modules from existing farm_dashboard code. 2020-02-26 10:39:40 -05:00
Michael Stenta 27c83e92d5 Make sure farmOS.map.behaviors.geofield runs after farmOS.map.behaviors.wkt. 2020-02-20 23:30:56 -05:00
Michael Stenta 0656c75550 Fix PHP Notice: Undefined index: default_value in farm_ui_farm_info() 2020-02-20 14:25:18 -05:00
Michael Stenta 76bedcb779 Make the Mapbox Satellite layer visible by default. 2020-02-17 13:41:22 -05:00
Michael Stenta 19579e91df When the map popup is closed, return focus to the map. 2020-02-17 12:50:24 -05:00
Michael Stenta 797a8c4428 Swap the Mapbox layers so that Satellite appears on top. 2020-02-17 12:50:24 -05:00
Michael Stenta 7fe30ec0ab Fix Movement Geometry field settings on existing sites. 2020-02-10 14:53:28 -05:00
Michael Stenta c2da059acf Remove "Calculated area" from area details. 2020-02-10 14:27:50 -05:00
Michael Stenta cd87da08f4 Display polygon/linestring measurement in map popups. 2020-02-10 14:27:50 -05:00
Michael Stenta 388ce9faa8 Remove "Calculated area" from area term page. It is shown in the map now. 2020-02-10 14:27:50 -05:00
Michael Stenta b1a961ae86 Remove Openlayers modules, patches, dependencies, configuration, and related code. 2020-02-10 14:27:50 -05:00
Michael Stenta 9f6bbb8253 Update farmOS-map library to v0.9.1 and add weights to behaviors. 2020-02-10 14:27:50 -05:00
Michael Stenta dd717a1f5c Fix zoom to all areas when WKT is empty. 2020-02-10 14:27:50 -05:00
Michael Stenta 6d8d070198 Fix duplicate measure behavior on editable maps. 2020-02-10 14:27:50 -05:00
Michael Stenta 3984b8d8dd When AJAX reloads a geofield map, look for new WKT in $form_state['input']. 2020-02-10 14:27:50 -05:00
Michael Stenta c3ca0cc041 Destroy farmOS-map instances when Drupal behaviors are detached. 2020-02-10 14:27:50 -05:00
Michael Stenta 18e86f9550 Refactor Drupal.behaviors.farm_map so that Drupal.settings.farm_map.maps is not needed. 2020-02-10 14:27:50 -05:00
Michael Stenta 7034539eed Update Tours. 2020-02-10 14:27:49 -05:00
Michael Stenta 9b5eb5a1d9 Remove old farm_map_show variable. 2020-02-10 14:27:49 -05:00
Michael Stenta ae60c5f9c2 Display asset cluster maps in the farm map header block. 2020-02-10 14:27:49 -05:00
Michael Stenta d792512680 Add behaviors for asset cluster maps. 2020-02-10 14:27:49 -05:00
Michael Stenta 164709c169 Add cluster support to the popup behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 59abbb1304 Remove dashboard map pane. 2020-02-10 14:27:49 -05:00
Michael Stenta 0f121776f6 Provide a Farm Map block. 2020-02-10 14:27:49 -05:00
Michael Stenta e9e48590b5 Mapbox module: add Mapbox API key to farm map settings form and add the Mapbox Satellite layer to maps. 2020-02-10 14:27:49 -05:00
Michael Stenta 0d3a71e7f9 Refactor Google Maps integration to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 4f30833bed Use farm_map_geofield widget in all geofields. 2020-02-10 14:27:49 -05:00
Michael Stenta 2ea421a4a6 Add Geocoder integration. 2020-02-10 14:27:49 -05:00
Michael Stenta e93040e9ab Provide a farm_map_geofield field widget that uses farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 7d3ad27ae9 Show a combined "All areas" layer in geofields. 2020-02-10 14:27:49 -05:00
Michael Stenta 42ef0068a4 Use farm_map_geofield formatter in all geofield displays. 2020-02-10 14:27:49 -05:00
Michael Stenta bfe8f9114e Provide a farm_map_geofield field formatter that uses farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta a51da53fce Initial commit of Farm Map Geofield module. 2020-02-10 14:27:49 -05:00
Michael Stenta a9a712952b Add the measure behavior to WKT layers. 2020-02-10 14:27:49 -05:00
Michael Stenta 8baceff31f If #edit is TRUE on a map element, enable the edit behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta cd800b73f4 If WKT was provided in the element, show it in the map. 2020-02-10 14:27:49 -05:00
Michael Stenta c8c89d195e Set onFocusOnly: true when initializing maps, so that the user must click on the map before scroll zoom works. 2020-02-10 14:27:49 -05:00
Michael Stenta cc5664473c Pass system of measurement into farmOS-map. 2020-02-10 14:27:49 -05:00
Michael Stenta 942993d0d5 Remove default base layer setting (defer to farmOS-map layer memory). 2020-02-10 14:27:49 -05:00
Michael Stenta d67fb1c796 Refactor MapKnitter module to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta d7fd542069 Refactor farm_plan_map to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 0eea90dec0 Refactor NRCS Soil Survey to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 608eb047cf @todo This assumes that there is only one map on the page. 2020-02-10 14:27:49 -05:00
Michael Stenta c1ac402087 Refactor farm area generator to use a farmOS-map behavior. 2020-02-10 14:27:49 -05:00
Michael Stenta 2fb2adeb42 Display a popup when area features are clicked, and load area details via AJAX. 2020-02-10 14:27:49 -05:00