mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-06 08:27:47 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,541 Commits 57 Branches 76 Tags
feature-use-test-queue
Commit Graph

66 Commits

Author SHA1 Message Date
Daniel O'Connor
196ca1ba49 Merge pull request #3896 from Growstuff/CloCkWeRX-patch-2 
Update _form.html.haml
 2024-10-13 23:53:28 +10:30
Daniel O'Connor
66f3a712ea Update _form.html.haml 2024-10-13 23:32:19 +10:30
Daniel O'Connor
8459bc2fdf Swap to HTML5 date field 2024-10-13 23:29:17 +10:30
Daniel O'Connor
7d63234841 Upgrade to bootstrap 5 (#3605) 
* Upgrade boostrap

* Remove deprecated bootstrap toggles

* Migrate other details

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Fix spec

* Fix spec, where the size of the screen has gone to a partial breakpoint/you can't click on your own name in tablet view

* Fix spec

* Cleanup

* Cleanup
 2024-03-10 11:49:22 +10:30
Daniel O'Connor
81fdfbdc0b DEPRECATION WARNING: Date#to_s(:ymd) is deprecated. Please use Date#to_fs(:ymd) instead. 2022-11-07 22:25:34 +10:30
Daniel O'Connor
5621666383 DEPRECATION WARNING: Date#to_s(:ymd) is deprecated. Please use Date#to_fs(:ymd) instead. 2022-11-07 22:05:39 +10:30
Brenda Wallace
0a327cba67 Tidier sign-in/sign-up links 2019-11-30 21:53:23 +13:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13:00
Brenda Wallace
b1b459f9d8 link to markdown docs using https 2019-07-10 09:03:05 +00:00
Brenda Wallace
1c50d9e50d rename blog_icon to post_icon 2019-07-08 09:42:06 +12:00
Brenda Wallace
528e4c2c85 button to get to timeline 2019-07-07 22:08:42 +12:00
Brenda Wallace
952c1b9a2a styled and moved the signin/signup prompts 2019-06-27 22:04:54 +12:00
Brenda Wallace
5cedea9da8 removing trailing whitespace 2019-06-14 16:23:31 +12:00
Brenda Wallace
e801a1d7c6 Removing unused views 2019-06-13 21:06:10 +12:00
Brenda Wallace
0d3bdc09ab Tool tips on actions 2019-05-25 17:17:25 +12:00
Brenda Wallace
4caa30b2f5 button horizontal again 2019-05-25 10:22:57 +12:00
Brenda Wallace
b07f5526f1 Vertical buttons 2019-05-24 20:50:17 +12:00
Brenda Wallace
a8f1740584 Re-instate the buttons 2019-05-21 13:39:56 +12:00
Brenda Wallace
f47b22505c Comment out global actions until it is prettier 2019-05-13 07:53:08 +12:00
Brenda Wallace
0c81f962aa homepage tidy 2019-04-29 18:16:14 +12:00
Brenda Wallace
d400e73ff6 Move global actions 2019-04-29 15:31:47 +12:00
Brenda Wallace
6d8a9c3579 Move global actions 2019-04-26 17:54:52 +12:00
Brenda Wallace
4196ce9e6b Fix search 2019-04-26 17:35:22 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
27d12bf07e Isotope making nice layout on plantings#show 2019-04-20 09:09:07 +12:00
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Brenda Wallace
3d3d1407cd Fixed link in global actions 2019-01-27 18:28:42 +13:00
Brenda Wallace
e912211cee DRY the icons 2019-01-24 12:17:40 +13:00
Brenda Wallace
2a98cefedb Copy finish planting from view to helper 2019-01-24 12:17:40 +13:00
Brenda Wallace
424866b733 Add "something" to global action labels 2019-01-24 12:17:40 +13:00
Brenda Wallace
761a0b4142 Always use the helper for add_photo buttons 2019-01-24 12:17:40 +13:00
Brenda Wallace
8270611f0c Removed un-used viewss 2019-01-24 12:17:40 +13:00
Brenda Wallace
e2a0278e40 Use same t() for the button for writing blog posts 2019-01-24 12:17:40 +13:00
Brenda Wallace
67e58fe901 Moving buttons to the right of page (with translations) 2019-01-24 12:17:40 +13:00
Brenda Wallace
d1c367e3d9 Fixed glyphicons 2019-01-24 12:17:40 +13:00
Brenda Wallace
fcfe7f196e Button for planting stuff 2019-01-24 12:17:40 +13:00
Brenda Wallace
614eff06b9 Bigger buttons 2019-01-24 12:17:40 +13:00
Brenda Wallace
6c16dca9b4 Dry the gglypicons 2019-01-24 12:17:40 +13:00
Brenda Wallace
30255a24d2 Use buttons.* translations for glyphicons titles 2019-01-24 12:17:40 +13:00
Brenda Wallace
e886929af5 Put buttons translations under buttons namespace 2019-01-24 12:17:40 +13:00
Brenda Wallace
7169b624b0 Move the action buttons to EVERY page 2019-01-24 12:17:40 +13:00
Brenda Wallace
a3f32aba9b Call t() on button labels 2019-01-24 12:17:40 +13:00
Brenda Wallace
fc46685ab9 Renamed should_be_finshed? to late? 2018-04-23 13:44:53 +12:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
92c3976f0a Haml clean up for shared views 2017-02-13 07:32:43 +13:00
Brenda Wallace
f214f608ff Rename member.is_paid? to paid? 2017-01-14 20:51:22 +13:00
Mackenzie Morgan
32b98a7e40 Add support for Bootstrap alert types 
* All alerts are currently shoved into either red (error) or green (success)
* Add support for yellow (warning) and blue (info) alert types

Solution from this Stack Overflow: http://stackoverflow.com/questions/31094771/rails-bootstrap-haml-how-to-convert-this-code-to-display-flash-messages-to
 2016-05-30 21:48:11 -04:00
Mackenzie Morgan
13dc87f368 Optional field improvements 
* Added custom matcher `have_optional(field id name goes here)`
* Fix partial
* Add tests
 2016-05-27 11:26:36 -04:00
Savant Krishna
0adb24fa4d Add quick member link help to markdown help 2015-09-06 09:10:18 +10:00