Commit Graph

4805 Commits

Author SHA1 Message Date
Michael Stenta 571ffbe733 Update mapbox layers to use 512x512 tile size. 2020-07-29 12:32:32 -04:00
paul121 52e369824e Update mapbox layers to use new studio style format. 2020-07-29 12:22:07 -04:00
Michael Stenta 76748f1e1a Update farmOS-map library to v1.2.0. 2020-07-29 12:20:18 -04:00
Michael Stenta 331a88fb6a Move CORS headers logic to a helper function and expand comments. 2020-07-28 17:22:50 -04:00
Michael Stenta 9f63c4f80b Expose sensor_type and sensor_settings fields to sensor assets REST API #329 2020-07-27 11:02:50 -04:00
paul121 1addc94cae Add sensor_type and sensor_settings fields to sensor asset properties. 2020-07-27 10:58:52 -04:00
paul121 214483c18f Patch restws to fix Issue #3161113: Support fields with unknown data type. 2020-07-27 10:58:52 -04:00
Michael Stenta 3ae4692e8e Use hook_sensor_view to add graphs to listener sensor asset views #328 2020-07-27 10:57:02 -04:00
paul121 233af6d2c7 Implement hook_farm_sensor_view instead of hook_entity_view_alter. 2020-07-27 10:56:45 -04:00
paul121 338f103444 Recursive merge the build arrays to avoid overriding the views index.
Because farm_sensor_listener_farm_sensor_view returns a build array with
the 'views' index set, this causes other views already in the build
array to be overwritten.
2020-07-27 10:44:14 -04:00
Michael Stenta d5e0d089d1 Issue #3156713: Improvements to quick form for livestock grazing moves 2020-07-24 11:05:48 -04:00
Michael Stenta cb879f94b7 Add measure behavior to the "current location" also. 2020-07-24 10:57:26 -04:00
Michael Stenta cc8105dfbe Declare log form element type as 'value' and use $form_state['values'] in submit. 2020-07-24 10:57:26 -04:00
Michael Stenta dad3d3560e Whitespace for coding standards. 2020-07-24 10:57:26 -04:00
paul121 48b292bfd4 Update default done value to match form state. 2020-07-24 10:57:26 -04:00
Michael Stenta f4ecb23098 Add description to photo fields that explains how to attach multiple photos. 2020-07-24 10:57:26 -04:00
Michael Stenta 61d16ab2c9 Translate "Planned for" text. 2020-07-24 10:57:26 -04:00
Michael Stenta 6dcccac4f2 Use entity_label() and check_plain() with entity labels. 2020-07-24 10:57:26 -04:00
Michael Stenta 08921b9af6 Filter to pending activity logs in the query itself. 2020-07-24 10:57:26 -04:00
Paul Weidner efaaf4468c Add measure behavior to movement layer. 2020-07-24 10:57:26 -04:00
Paul Weidner 9996e83c13 Add hours and minutes to movement date field. 2020-07-24 10:57:26 -04:00
Paul Weidner 1d5df1ddc5 Save assets previous location geometry in post grazing logs. 2020-07-24 10:57:26 -04:00
Paul Weidner 2a6033cb65 Display assets current location geometry on map. 2020-07-24 10:57:26 -04:00
Paul Weidner 21818a6004 Create movement logs for multiple assets. 2020-07-24 10:57:26 -04:00
Paul Weidner b4f457cf15 Save custom geometry to pre-grazing logs. 2020-07-24 10:57:26 -04:00
Paul Weidner 96a9dd8231 Uncollapse the geometry fieldset default geometry is provided. 2020-07-24 10:57:26 -04:00
Paul Weidner 4d5041367e Update map layers when selecting a planned movement log. 2020-07-24 10:57:26 -04:00
Paul Weidner 71882433af Add helper functions to build ajax commands. 2020-07-24 10:57:26 -04:00
Paul Weidner 34b413f6d2 Edit planned movement logs. 2020-07-24 10:57:26 -04:00
Paul Weidner 425a7534da Only create observation logs if movement is marked as completed. 2020-07-24 10:57:26 -04:00
Paul Weidner 210268a74e Add checkbox to set the movement log status. 2020-07-24 10:57:26 -04:00
Paul Weidner f06cb357bc Save photos with pre and post grazing observation logs. 2020-07-24 10:57:26 -04:00
Michael Stenta ce457d88d0 Add fields for photo attachments (not processed yet). 2020-07-24 10:57:26 -04:00
Michael Stenta 04d5280a14 Merge branch 'field_modules' into 7.x-1.x
See related discussion in the farmOS-client project: https://github.com/farmOS/farmOS-client/issues/217
2020-07-24 10:52:41 -04:00
Michael Stenta 9ca51f4c9a Serve client module JS files through Drupal. 2020-07-24 10:52:31 -04:00
paul121 5d17f01bca Rename hook_farm_client_modules() to hook_farm_client_module_info(). 2020-07-24 10:52:31 -04:00
Michael Stenta 1102f26ae9 Provide a hook that allows modules to declare Field Modules they provide. 2020-07-24 10:52:31 -04:00
Michael Stenta a0ca94bd6e Allow multiple origins for Access-Control-Allow-Origin #271 2020-07-24 10:45:14 -04:00
Michael Stenta 864ff079c0
Add press: Free Software Foundation: People everywhere are standing up for free software 2020-07-24 10:04:58 -04:00
Michael Stenta b8159138d9 If getallheaders() is not available, implement it ourselves. 2020-07-24 09:40:32 -04:00
Julian Foad 06821c5b12 Update Matrix chat links
Use generic Matrix links instead of "riot.im" for the chat rooms.

The Matrix app "Riot" has recently been re-branded to "Element" and following a "riot.im" link prompts the user to move to "element.io". Let's be client-agnostic instead, using "matrix.to" links.

(The "matrix.to" site is currently undisputedly ugly. However, (a) work is under way to improve it, and (b) some Matrix apps recognize matrix.to URLs and directly open the room in their already installed app bypassing that page.)
2020-07-23 17:06:01 -04:00
Michael Stenta 7424cb9a54 Add Vary: Origin header when Access-Control-Allow-Origin is added. 2020-07-21 11:08:19 -04:00
Michael Stenta 282ac7fa71 Trim whitespace from allowed origins before checking them. 2020-07-21 11:08:03 -04:00
Michael Stenta 0b59497344 Allow multiple origins to be accepted for Access-Control-Allow-Origin header. 2020-07-21 11:07:38 -04:00
Jamie Gaehring 374f70edb4 Add clean URL's to FK server requirements. 2020-07-21 08:41:41 -04:00
Michael Stenta 96c46ce4ff
Add farm: Rancho Moretto (Emilianópolis, SP, Brazil) 2020-07-21 08:40:28 -04:00
Michael Stenta 6289b37848 Fix "Done" filter in Calendar View only showing pending logs by default. 2020-07-21 07:54:43 -04:00
Michael Stenta e5423ac615 Add "Done" filter to Calendar View. 2020-07-20 08:21:47 -04:00
Michael Stenta 8a58fa7360 Allow OPTIONS requests to return 200 code on certain paths needed by Field Kit (right now just /farm/areas/geojson). 2020-07-20 08:21:47 -04:00
paul121 e40270ea48 Use isset to check for measurement values including 0. 2020-07-17 11:04:06 -04:00