mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-04 15:08:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,774 Commits 59 Branches 76 Tags
982572d2bdf01a11cb81333eb6312764f00aec26
Commit Graph

1774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Taylor Griffin
480e67bf2f add default id to hidden input in auto suggest view helper to make edit work 2014-08-30 10:20:29 +10:00
Skud
40c7124769 Merge pull request #379 from tygriffin/crop-suggest 
Crop suggest
 2014-08-29 11:35:25 +10:00
Skud
19a0a914c5 Merge pull request #393 from Skud/moreb3 
A few bootstrap3 tweaks
 2014-08-29 10:44:55 +10:00
Skud
8a5d1f2e5e Fixed crop wrangler tests to not be order dependent 2014-08-29 10:38:35 +10:00
Skud
30d436cb5d Fixed inline form on places page to make it b3-ish 2014-08-29 10:19:37 +10:00
Skud
e3627f6dcd Fixed devise forms to make them b3ish and pretty 2014-08-29 10:02:56 +10:00
Taylor Griffin
3beae6f500 add request crop link to seeds 2014-08-29 08:43:02 +10:00
Taylor Griffin
83d3c369c2 style noscript warning 2014-08-29 08:42:43 +10:00
Taylor Griffin
7fa05d81e9 fix tests to match new implementation of of auto_suggest 2014-08-29 07:38:55 +10:00
Taylor Griffin
d8c7aba725 pass options hash into auto_suggest helper to allow setting class 2014-08-29 07:31:32 +10:00
Taylor Griffin
6bb74039a7 fix slug bug 2014-08-29 07:31:02 +10:00
Taylor Griffin
2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Taylor Griffin
550cb4b265 put validation in the correct place this time 2014-08-29 06:56:02 +10:00
Taylor Griffin
62e1c3bb93 add server side validation 2014-08-29 06:45:37 +10:00
Taylor Griffin
cd6fc7e804 add noscript tag 2014-08-29 06:45:11 +10:00
Taylor Griffin
4e0d62b28d remove client side validation 2014-08-29 06:44:48 +10:00
Skud
028e1194e5 Merge pull request #392 from Skud/moreb3 
changed layout of planting list on homepage
 2014-08-28 12:10:42 +10:00
Skud
55c2fceffb changed layout of planting list on homepage 
... as b3 seems to have more gutter space between columns
 2014-08-28 12:09:43 +10:00
Skud
698a13ef70 Merge pull request #391 from Skud/moreb3 
Tweak formatting of images with popovers (used mostly on homepage)
 2014-08-28 12:01:24 +10:00
Skud
848b583d94 Tweak formatting of images with popovers (used mostly on homepage) 2014-08-28 11:46:36 +10:00