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

3307 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Stenta fcb3dda0fa Remove redundant quantity term permissions. 2018-12-27 10:42:37 -05:00
Michael Stenta ef55a893f1 If this role has 'config' access, allow them to administer users. 2018-12-27 10:42:37 -05:00
Michael Stenta b8b75ff864 Refactor taxonomy_farm_access_perms() to use high-level access rules. 2018-12-27 10:42:37 -05:00
Michael Stenta 0f6373c1e4 Change farm_access_entity_perms() to look for 'taxonomy_term' instead of 'taxonomy'. 2018-12-27 10:42:37 -05:00
Michael Stenta 6a905028e1 Allow all roles to view user profiles. 2018-12-27 10:42:37 -05:00
Michael Stenta f933727321 Allow all roles with high-level config access to delegate user roles. 2018-12-27 10:42:37 -05:00
Michael Stenta bb34395d3e Add a helper function for generating entity bundle permissions lists for high-level access rules, and use it for assets, plans, and logs. 2018-12-27 10:42:37 -05:00
Michael Stenta e9f399d178 Add ability to define high-level access rules in hook_farm_access_roles(). 2018-12-27 10:42:37 -05:00
Michael Stenta 93dfc7214a Simplify farm_access.api.php documentation. 2018-12-27 10:42:37 -05:00
Michael Stenta 3e03174c61 Create an internal machine name for farm access roles. 2018-12-27 10:42:37 -05:00
Michael Stenta cdbd82dd15 Rename columns in plan consideration table to avoid reserved SQL words. 2018-12-27 09:50:10 -05:00
Michael Stenta 14f22b44d2 Add sponsors: USFS-IP and NFA. 2018-12-20 10:12:10 -05:00
Michael Stenta f7d76c25c3 Display area description in area details popup. 2018-12-19 14:13:19 -05:00
Michael Stenta 93539d056d Fix water module installation, enable it by default on new sites, and enable it on existing sites. 2018-12-18 17:31:32 -05:00
Michael Stenta a3f8958f99 Remove deprecated 'links' from docker-compose.yml. 2018-12-18 14:51:34 -05:00
Michael Stenta b4ae127a8b Merge branch 'planting_form' into 7.x-1.x 2018-12-18 14:40:47 -05:00
Michael Stenta f22ad02b22 Add the ability to record a harvest log. 2018-12-18 14:31:36 -05:00
Michael Stenta 06b0f58a45 Add quantity field to logs. 2018-12-18 14:31:36 -05:00
Michael Stenta 3bf9050131 Generalize logic from farm_quantity_log_create() into new helper function: farm_quantity_log_add_measurements(). 2018-12-18 14:31:36 -05:00
Michael Stenta 9b4de6a7f9 Collapse log notes field. 2018-12-18 14:31:36 -05:00
Michael Stenta 32da3fc09f Remove old "Plan" fieldset from the planting asset form and add a link to the quick form. 2018-12-18 14:31:36 -05:00
Michael Stenta fd41604b1f Add seeding and transplanting log fields and processing. 2018-12-18 14:31:36 -05:00
Michael Stenta af994b7e56 Create separate explicit fields for each crop/variety. 2018-12-18 14:31:36 -05:00
Michael Stenta 54ee4723f6 Planting submit function: create planting with name, season, and crops. 2018-12-18 14:31:36 -05:00
Michael Stenta 708f05ca00 Add fields for defining the planting's season and crop(s), and remember the last-entered season. 2018-12-18 14:31:36 -05:00
Michael Stenta b8af7f1fe9 Initial planting quick form (skeleton). 2018-12-18 14:31:36 -05:00
Michael Stenta 407ac14870 Fix rounding issue in soil amendment quick form's rate of application calculation. 2018-12-18 13:38:02 -05:00
Michael Stenta 0cd849167e Allow API access to taxonomy vocabulary list. 2018-12-10 10:24:57 -05:00
Michael Stenta b1f02fb284 Merge branch 'area_types' into 7.x-1.x 2018-12-10 10:24:29 -05:00
Michael Stenta 999e9dfdb5 Fix weight sorting for area type options. 2018-12-04 15:19:43 -05:00
Michael Stenta 3165d1cc5f Update farm_area_generate and farm_area_import default area types logic. 2018-12-04 15:19:43 -05:00
Michael Stenta e7a781a714 Move default livestock area types to new farm_livestock_area_types module. 2018-12-04 15:19:43 -05:00
Michael Stenta 026e90e3a6 Move default crop area types to new farm_crop_area_types module. 2018-12-04 15:19:43 -05:00
Michael Stenta 74c99b0479 Move all default area types (except 'other') to new farm_area_types module. 2018-12-04 15:18:07 -05:00
Michael Stenta 1e69b31bd1 Move water area type to the farm_water module. 2018-12-04 15:18:07 -05:00
Michael Stenta ea93903b61 Add missing @file to farm_area.farm_area.inc. 2018-12-04 15:12:50 -05:00
Michael Stenta 21c5b4d06e Add an 'other' area type. 2018-12-04 15:12:34 -05:00
Michael Stenta 330afb9771 Allow specifying default area type in KML area importer. 2018-12-04 11:47:47 -05:00
Michael Stenta 08bf55ab07 Fix API access to field collections. 2018-12-01 15:34:49 -05:00
Michael Stenta 4f9fbf6a06 Move Birth and Milk quick forms to separate include files (requires menu rebuild). 2018-11-30 11:51:08 -05:00
Michael Stenta a26012ab18 Merge branch 'dependencies' into 7.x-1.x 2018-11-29 15:05:55 -05:00
Michael Stenta f8b2a72da8 Add dependency to farm_calendar: log. 2018-11-29 15:05:45 -05:00
Michael Stenta 41ab19cbe0 Add dependency to farm_log: log. 2018-11-29 15:05:45 -05:00
Michael Stenta 14546999a0 Add farm_area_import to optional install modules. 2018-11-29 15:05:45 -05:00
Michael Stenta ee815c3dee Issue #3016731: Make more modules optional during install 2018-11-29 15:05:45 -05:00
Michael Stenta e5f31da8b1 Add dependency to farm_group: farm_movement. 2018-11-29 15:05:45 -05:00
Michael Stenta a7e6b3afac Move farm_theme_preprocess_menu_link() to where it belongs. 2018-11-29 15:05:35 -05:00
Michael Stenta 326e2095c4 Revert "farmOS 7.x-1.0-rc1." 
This reverts commit 1642b84653.
 2018-11-14 12:48:30 -05:00
Michael Stenta 1642b84653 farmOS 7.x-1.0-rc1. 2018-11-14 12:48:04 -05:00
Michael Stenta 91f05b0f38 Prepare for release of farmOS 7.x-1.0-rc1. 2018-11-14 12:47:08 -05:00