mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-03 21:57:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
1c33ab280f Merge pull request #407 from Growstuff/dev 
Production push: branding, crop and photo display bugfixes
 2014-09-05 11:11:58 +10:00
Skud
56eaea9c06 Merge pull request #405 from Skud/cropmess 
Crop and photo bugfixes
 2014-09-04 21:23:31 +10:00
Skud
3c968ea6be Merge pull request #406 from Skud/branding2 
Branding
 2014-09-04 20:02:16 +10:00
Skud
a3213a99e8 Added apple icon for iOS users 2014-09-04 19:03:07 +10:00
Skud
495f4194e7 Fixed test for branding in navbar 2014-09-04 19:02:38 +10:00
Skud
7543221f73 Added 'skip navigation menu' link for screenreaders 2014-09-04 18:40:51 +10:00
Skud
7184b04397 Added favicon 2014-09-04 18:37:27 +10:00
Skud
0e0a13bbd1 Made sure all headings are sans-serif 2014-09-04 18:31:13 +10:00
Skud
4f4aad7626 Added pear logo to top nav 2014-09-04 18:14:49 +10:00
Skud
baf8b91a4e Removed fairly pointless test for markup 2014-09-04 18:05:10 +10:00
Skud
579f79760b remove bullet points from new photo page 2014-09-04 17:51:13 +10:00
Skud
cdbc4611c9 Fix up crop photo wrapping mess 2014-09-04 17:48:00 +10:00
Skud
823dfe8000 Merge pull request #404 from Growstuff/dev 
Production push: crop popularity, crop suggest, harvest improvements, wrangler improvements, bootstrap 3, and more
 2014-09-03 15:54:26 +10:00
Skud
ea9597ba75 Merge pull request #403 from Skud/readmeupdate 
Readme update
 2014-09-03 09:09:03 +10:00
Skud
591b8e03d6 we don't always work in pairs, just often 2014-09-03 09:08:18 +10:00
Skud
35470acb86 updated CONTRIBUTING.md with more up to date info 2014-09-03 09:06:59 +10:00
Skud
326248797e Updated readme and contributors 2014-09-03 09:00:55 +10:00
Skud
6704b97542 Merge pull request #399 from tygriffin/fix-layout 
Fix layout
 2014-09-03 08:32:43 +10:00
Taylor Griffin
982572d2bd slight change to width of index card 2014-09-03 08:02:53 +10:00
Taylor Griffin
1fc100eca4 update gem and finesse signup widget 2014-09-03 07:52:45 +10:00
Taylor Griffin
1224bd0ebb import original variables into custom 2014-09-03 07:28:27 +10:00
Taylor Griffin
c95619117b Merge branch 'dev' of https://github.com/Growstuff/growstuff into fix-layout 2014-09-02 06:34:38 +10:00
Skud
919cc45d13 Merge pull request #401 from Skud/moreb3 
Quick and dirty fix for layout of settings tabs
 2014-09-01 23:06:55 +10:00
Skud
0687625049 Quick and dirty fix for layout of settings tabs 2014-09-01 22:30:08 +10:00
Skud
551e4cbe6f Merge pull request #400 from tygriffin/fix-styles 
Fix styles
 2014-09-01 21:08:52 +10:00
Taylor Griffin
7518fbec1c add styles for alerts 2014-09-01 20:58:48 +10:00
Taylor Griffin
703de07647 add crop image class to prevent smooshing again neighboring div 2014-09-01 20:55:54 +10:00
Taylor Griffin
c9cd82d7fd increase z-index of autosuggest dropdown 2014-09-01 20:53:48 +10:00
Taylor Griffin
0af550b6e7 make top nav collapse threshold larger to prevent it from becoming too big at some browser sizes 2014-09-01 20:45:45 +10:00
Taylor Griffin
c4bd4c178d add a little offset on crop index card to prevent info from smooshing against pic 2014-09-01 20:40:16 +10:00
Skud
b242e0fb99 Merge pull request #398 from Skud/devisetoken 
Additional fixes for devise login stuff
 2014-08-31 18:37:34 +10:00
Skud
a8a34d8dc8 s/user/member/g in crop wrangler tests 
We don't use the term "user" in Growstuff -- this should ideally have
been caught in code review but I missed it :-/
 2014-08-31 18:28:50 +10:00
Skud
965a3bf2a1 Modernise redirection after signup to use devise's stored_location_for 2014-08-31 18:28:26 +10:00
Skud
07fcdf9bb7 Merge pull request #397 from Skud/devisetoken 
Updated devise tokens in emails for devise 3.2
 2014-08-31 17:56:15 +10:00
Skud
474b56cf6b Updated devise tokens in emails for devise 3.2 2014-08-31 17:54:07 +10:00
Skud
99ffa3775e Remove puts used for debugging 2014-08-30 18:38:16 +10:00
Skud
ecbeb986c3 Merge pull request #396 from Skud/moreb3 
b3ify 'sort by' dropdown on crops page
 2014-08-30 18:19:51 +10:00
Skud
e7d9ebe37a b3ify 'sort by' dropdown on crops page 2014-08-30 18:05:11 +10:00
Skud
db7729920b Merge pull request #386 from Skud/coverage 
Coverage
 2014-08-30 17:50:49 +10:00
Skud
2be199abbc Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/devise/registrations/edit.html.haml
 2014-08-30 17:45:19 +10:00
Skud
597e878413 Removed spurious seeds tests (moved to subdir) 2014-08-30 17:40:16 +10:00
Skud
29f83b8c18 Merge branch 'coverage' of github.com:Skud/growstuff into coverage 
Conflicts:
	Gemfile.lock
	app/views/gardens/_form.html.haml
	spec/spec_helper.rb
 2014-08-30 17:32:50 +10:00
Skud
b0378fab69 Cleaned up tests a little bit 2014-08-30 17:30:24 +10:00
Skud
d35639d7cb Add page content test suggested by tygriffin 2014-08-30 17:10:36 +10:00
Skud
d991765edb Fixed up label with link to field it relates to 2014-08-30 17:10:36 +10:00
Skud
d55d2c6409 Ongoing coverage improvements 2014-08-30 17:09:47 +10:00
Skud
082663c885 Show coverage locally and send to coveralls 2014-08-30 17:09:47 +10:00
Skud
0c89413f92 Merge pull request #395 from tygriffin/crop-suggest 
Fix edit bug
 2014-08-30 17:04:59 +10:00
Taylor Griffin
1cd2fd9b07 Merge branch 'dev' of https://github.com/Growstuff/growstuff into crop-suggest 2014-08-30 12:15:02 +10:00
Taylor Griffin
3fbae6a5ee write regression spec for resource id bug when editing resource 2014-08-30 12:14:36 +10:00