3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Commit graph

2877 commits

Author SHA1 Message Date
Michael Stenta
17f4fd2d07 Implement hook_farm_area_link_alter() to add a count of group members. 2018-01-29 15:24:45 -05:00
Michael Stenta
06438909fc Provide an alter hook for the area links generated by the Farm UI module. 2018-01-29 15:24:38 -05:00
Michael Stenta
79332abad6 Update Bootstrap theme to 3.18 and remove patches that were merged in. 2018-01-25 13:23:56 -05:00
Michael Stenta
2a1118d776 Update Entity Reference View Widget to 2.1, remove old patch, and implement new hook_entityreference_view_widget_rows_alter() to fix "Checkbox titles missing with boostrap theme" issue. 2018-01-25 12:58:18 -05:00
Michael Stenta
3be8ea9bd6 Restore the unzip program in the Dockerfile for use by Drush Make. 2018-01-19 08:28:07 -05:00
Michael Stenta
3919482f4d Issue #2935314: Make farm_group_circular_membership_validate() more defensive with parameter inputs. 2018-01-10 16:24:57 -05:00
Michael Stenta
9ba12c607a Add exposed filters for "Season" and "Crop/variety" to Seeding and Transplanting Views. 2018-01-05 15:07:14 -05:00
Michael Stenta
13f6407c8c Revert "Revert "Revert "farmOS 7.x-1.0-beta16."" (for Docker Hub image fix)" (back on track)
This reverts commit 05b74f04d6.
2018-01-05 08:43:50 -05:00
Michael Stenta
05b74f04d6 Revert "Revert "farmOS 7.x-1.0-beta16."" (for Docker Hub image fix)
This reverts commit 8140f90cbf.
2018-01-05 08:41:40 -05:00
Michael Stenta
56d2e24acf Use libgeos-dev instead of php5-geos package in Dockerfile. Remove phpunit and unzip packages. 2018-01-02 13:10:57 -05:00
Michael Stenta
8140f90cbf Revert "farmOS 7.x-1.0-beta16."
This reverts commit 890b4329cf084962761b3c514b0564853b4fbe9d.
2017-12-31 11:13:11 -05:00
Michael Stenta
39cc25671d farmOS 7.x-1.0-beta16. 2017-12-31 11:13:11 -05:00
Michael Stenta
4be185f5b5 Prepare for release of farmOS 7.x-1.0-beta16. 2017-12-31 11:13:11 -05:00
Michael Stenta
0c1db68b7b Make "Movement to" field not required. 2017-12-31 11:13:11 -05:00
Michael Stenta
3e908ede51 Fix PHP Notice: Undefined index: group in farm_group_asset_form_submit(). 2017-12-31 11:13:11 -05:00
Michael Stenta
b6722da8fb Fix asset field weights so that name is always at top. 2017-12-30 16:50:50 -05:00
Michael Stenta
13f70c6aee Add dependencies on farm_asset_views. 2017-12-30 16:39:07 -05:00
Michael Stenta
52af43b8a7 Add Group filter to all asset Views. 2017-12-30 13:13:51 -05:00
Michael Stenta
ac2a7e19a3 Add location relationship, field, and filter to farm_asset View. 2017-12-30 13:12:18 -05:00
Michael Stenta
4536c210cd Disable AJAX and auto-submit on farm_asset View. 2017-12-30 13:08:15 -05:00
Michael Stenta
a709941cd7 Move farm_asset_entityreference_view to farm_asset_views. 2017-12-30 13:07:50 -05:00
Michael Stenta
218917eb65 Split new farm_asset_views module out of farm_asset. 2017-12-30 12:53:03 -05:00
Michael Stenta
2af1505ea0 Add inline quantity field labels, and padding between collection items. 2017-12-29 17:46:19 -05:00
Michael Stenta
cd8965a577 Fix log field weights so that timestamp is always at top under name. 2017-12-29 17:00:16 -05:00
Michael Stenta
a6b4c96af3 Update Feeds Tamper to 1.2. 2017-12-29 16:28:17 -05:00
Michael Stenta
2bba08cdc1 Swap asset cluster and full geometry layers, so that clusters are on top. This is necessary because of commit d266d3df2f. 2017-12-29 16:20:36 -05:00
Michael Stenta
09f0031900 Use new boolean_default tamper plugin for all boolean import columns. 2017-12-29 16:05:20 -05:00
Michael Stenta
21bb2f0bff Add a Feeds Tamper plugin that will convert a text value to a boolean (from a list of multiple allowed values), with a default value. 2017-12-29 16:04:21 -05:00
Michael Stenta
02685fa3c2 Add importer columns for quantity measure and label fields. 2017-12-29 14:58:14 -05:00
Michael Stenta
2e3c959826 Patch Feeds to allow importing list field values by label. 2017-12-29 14:57:47 -05:00
Michael Stenta
96efe03401 Validate that the "Group membership" field in asset edit forms can't create circular memberships. 2017-12-28 14:03:57 -05:00
Michael Stenta
c525bf8c08 Be specific with the Openlayers revision. 2017-12-28 12:35:07 -05:00
Michael Stenta
1c8439d9f2 Change to a drupal.org repo + patch approach with Openlayers (again, to appease the drupal.org gods). 2017-12-28 12:28:58 -05:00
Michael Stenta
63a767498a Change to ZIP download of Openlayers to appease drupal.org. 2017-12-28 12:11:27 -05:00
Michael Stenta
a7969c8017 Add Openlayers branch to appease drupal.org. 2017-12-28 12:06:37 -05:00
Michael Stenta
284b6dedc6 Rename asset "owner" to "author" in the UI. 2017-12-28 11:22:53 -05:00
Michael Stenta
bdb5562f09 Move farm_asset ctools, feeds, and views code into includes directory (for consistency with log module). 2017-12-28 11:19:42 -05:00
Michael Stenta
64bdb4701d More misc Views updates (remove old translations). 2017-12-28 11:12:05 -05:00
Michael Stenta
e385792096 Remove secondary log ID sorts (this is done automatically in Log module now). 2017-12-28 11:10:11 -05:00
Michael Stenta
f1d775f6bb Update Log module to 1.10. 2017-12-28 11:09:39 -05:00
Michael Stenta
5a5194af05 Change "Name" to "Log name" in log importers. 2017-12-28 11:03:18 -05:00
Michael Stenta
5d2dd3c17e Misc Views export updates. 2017-12-27 17:37:38 -05:00
Michael Stenta
5aa8a8858e Add "Movement to" exposed filters to Seedings and Transplantings lists. 2017-12-27 17:36:58 -05:00
Michael Stenta
c3a6c9c556 Change "Name/Search" column to "Log name" and add exposed "Log name" and "Log type" filters and sorts to log Views. 2017-12-27 17:34:43 -05:00
Michael Stenta
97350bb708 Fix argument type in docblock. 2017-12-16 10:42:27 -05:00
Michael Stenta
da0030f4ee Limit farm_group_members() to active assets by default. 2017-12-16 09:35:57 -05:00
Michael Stenta
e14a748d53 Issue #2929661: Fatal error reducing multiple GeometryCollections 2017-12-09 16:16:46 -05:00
Michael Stenta
29c1eda881 Fix farm_group_members() and farm_group_members_query() so that they only return assets currently in the group. Previously they were loading ALL logs assigning assets to the group, so an asset would appear in the group even if it was moved to a different group. 2017-12-07 17:38:53 -05:00
Michael Stenta
6536414772 Make $asset_id parameter optional in farm_log_asset_query(). 2017-12-07 17:38:53 -05:00
Michael Stenta
1af21d48b9 Use innerJoin()s where possible. 2017-12-07 17:38:52 -05:00