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
3626 commits 3 branches 67 tags 47 MiB
Commit graph

3626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Stenta
a5c5dc75a8 Build farmOS directly into the container image. Mount /var/www/html/sites. 2019-04-20 17:36:56 -04:00
Michael Stenta
bb877d7484 Add and document an example production docker-compose.yml file. 2019-04-20 14:49:27 -04:00
Michael Stenta
ff2a738f32 Add a docker/README.md file explaining how to run farmOS with Docker, and pointing to the official docs. 2019-04-20 14:41:15 -04:00
Michael Stenta
c1a98a814e Move docker-compose.postgis.yml to docker-compose.override.postgis.yml to be clear that it is an override config. 2019-04-20 14:36:07 -04:00
Michael Stenta
c874df6808 Move docker-compose.yml to docker-compose.development.yml to be clear that it is a development config. 2019-04-20 12:06:56 -04:00
Michael Stenta
a732629c09 Move all Docker files to a subdirectory. 2019-04-20 11:59:11 -04:00
Michael Stenta
5873bbb88f Revert "farmOS 7.x-1.1." 
This reverts commit ef58cc9c89.
 2019-04-18 16:33:51 -04:00
Michael Stenta
ef58cc9c89 farmOS 7.x-1.1. 2019-04-18 16:33:35 -04:00
Michael Stenta
583358891f Prepare for release of farmOS 7.x-1.1. 2019-04-18 16:32:42 -04:00
Michael Stenta
30bc81f0ea Issue #2887779: Add equipment use logs to equipment view page. 2019-04-18 16:23:55 -04:00
Michael Stenta
e4f9f5764b Add equipment use logs to equipment page. 2019-04-18 16:23:34 -04:00
Michael Stenta
a3b86164ed View of Equipment use logs, with an required contextual filter for the equipment asset. 2019-04-18 16:23:34 -04:00
Michael Stenta
49eb8f1938 Reformat group/inventory/movement log view titles: "[type] logs" (instead of "Logs of [type]"). 2019-04-18 16:23:03 -04:00
Michael Stenta
814ea92e36 Add mysql-client in Docker www container for Drush #41 2019-04-17 17:54:56 -04:00
Michael Stenta
d192d14aa8 Update Drupal core to 7.66. 2019-04-17 17:14:32 -04:00
Michael Stenta
dcc8ea8ffd Remove extraneous argument from farm_api_farm_info(). 2019-04-15 12:49:09 -04:00
Michael Stenta
42d284330d Minor comment fix. 2019-04-12 14:42:17 -04:00
Michael Stenta
294292511a Fix error submitting soil amendment quick form (inputs accept multiple materials). 2019-04-12 14:41:47 -04:00
Michael Stenta
c4df766ed7 Issue #2887779: Equipment used field 2019-04-11 00:00:47 -04:00
Michael Stenta
7457cd8261 Show farm_asset_entityreference_view header with no results. 2019-04-11 00:00:39 -04:00
Michael Stenta
68b540cf61 Add a farm_equipment_entityreference_view. 2019-04-11 00:00:39 -04:00
Michael Stenta
5c89340268 Adjust field group weights for consistency. 2019-04-11 00:00:39 -04:00
Michael Stenta
5083faa63d Create an Equipment field group for the Equipment used field. 2019-04-11 00:00:39 -04:00
Michael Stenta
d1bd600d4b remove features 2019-04-11 00:00:39 -04:00
Michael Stenta
611de73ee0 Refactor farm_equipment_field to use farm_dynamic_fields. 2019-04-11 00:00:39 -04:00
Michael Stenta
d5324e9222 Move "Equipment used" field to its own module: farm_equipment_field. 2019-04-11 00:00:39 -04:00
Michael Stenta
e561c22497 Alter field_group info to add the "Equipment used" field to Assets/General group. 2019-04-11 00:00:39 -04:00
Michael Stenta
edb67fb77a Add "equipment used" field to logs on existing sites. 2019-04-11 00:00:39 -04:00
Michael Stenta
e33e152f7a Add "Equipment used" field instance to all log types. 2019-04-11 00:00:39 -04:00
Michael Stenta
04e65772a3 Add a field_farm_equipment field base definition. 2019-04-11 00:00:39 -04:00
Michael Stenta
b0cac436a4 Move implementations of hook_form_FORM_ID_alter() to farm_data_field.module. 2019-04-10 23:59:19 -04:00
Michael Stenta
d53d67d047 Use farm_fields_dynamic to create the data field (in a new module). 2019-04-10 15:16:39 -04:00
Michael Stenta
749ac0458f Add a new farm_fields_dynamic module to standardize the creation of dynamic fields. 2019-04-10 15:09:43 -04:00
Michael Stenta
c49cc37173 Remove "Quantity" label from Views definitions (Features were overridden with it). 2019-04-10 12:29:02 -04:00
Michael Stenta
e5de64d21d Issue #3046929: Arbitrary data field on assets and logs 2019-04-09 14:44:53 -04:00
Michael Stenta
32c9ad9290 Add data field to assets. 2019-04-09 14:38:56 -04:00
Michael Stenta
8a2ed36d3b Hide the data field in log forms. 2019-04-09 14:38:56 -04:00
Michael Stenta
ab871b8d2b Add data field instances via update.php. 2019-04-09 14:38:56 -04:00
Michael Stenta
5d60859e1b Add data field instance to all log types. 2019-04-09 14:38:56 -04:00
Michael Stenta
9961334fe7 Add a field_farm_data field base definition. 2019-04-09 14:38:56 -04:00
Michael Stenta
5fab821aa3 Add timestamp to log name patterns. 2019-04-09 14:38:55 -04:00
Michael Stenta
66c926f37b Fix sensor Views Features export. 2019-04-09 14:38:55 -04:00
Michael Stenta
97e5022ff7 Add label to location and assets properties to fix PHP notice. 2019-04-09 14:35:52 -04:00
Michael Stenta
ec94f32f7d Add "rate" to the list of quantity measures. 2019-04-08 15:49:27 -04:00
Michael Stenta
f469e6d607 Add vocabulary ID to taxonomy_term resource bundles in farm.json (instead of duplicating as taxonomy_vocabulary resource). 2019-04-08 14:00:43 -04:00
Michael Stenta
ec02c334e0 Describe missing taxonomies with hook_farm_ui_entities(): log categories, input materials, quantity units, season, and soil names. 2019-04-08 13:59:41 -04:00
Michael Stenta
c2fd93bfca Update Views module to 3.22. 2019-04-08 13:46:45 -04:00
Michael Stenta
bbd45fe0a1 Issue #3043560: Add a computed assets property to areas. 2019-04-01 15:56:53 -04:00
Michael Stenta
886de46530 Add functions for getting the list of assets in an area (cloned from group membership functions). 2019-04-01 15:56:53 -04:00
Michael Stenta
4af676cc8b farm_group depends on farm_log. 2019-04-01 15:56:53 -04:00