mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 13:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,311 Commits 63 Branches 82 Tags
67ed1e2170e7e7ee252c6510e85f475360466a20
Commit Graph

64 Commits

Author SHA1 Message Date
Miles Gould
67ed1e2170 Set map height in CSS; smaller for phones. 
In future we should consider making classes for different sizes of maps.
 2013-09-05 12:25:45 +01:00
Skud
af3d6a50a3 Fixed CSS problem with popup tip 
The little triangle underneath the popup was looking weird.  Turns out
it was mostly because of some of the leaflet_ie.css stuff, so we made
sure that the non-IE CSS took precedence, and wrote in a little override
for an unwanted border as well.
 2013-08-26 11:06:21 +10:00
Miles Gould
7857bfd0df Merge branch 'dev' into places2 
Fix up broken indentation on navbar.
Conflicts:
	app/views/layouts/_header.html.haml
 2013-08-23 13:29:37 +01:00
Skud
960d3064f5 don't like this line-height 2013-08-22 00:35:14 +10:00
Skud
cc97fd8f49 think we've FINALLY really fixed the member layout 2013-08-22 00:30:02 +10:00
Skud
57fe663675 Merge branch 'dev' of https://github.com/Growstuff/growstuff into places2 
Conflicts:
	app/controllers/members_controller.rb
	app/models/member.rb
	app/views/members/_popover.html.haml
	spec/models/member_spec.rb
 2013-08-21 17:35:31 +10:00
Skud
91cce3e360 fixed weird spacing on member index 2013-08-19 22:07:44 +10:00
Skud
d30f8e443e added popovers, added map on places/show page 2013-08-12 12:36:09 +10:00
Skud
32f2830df5 changed located scope to ignore blank lat/long 2013-08-12 10:46:35 +10:00
Skud
e1d6c6bf70 fixed member thumbnails on homepage and changed member index to match 2013-08-09 14:58:36 +10:00
Skud
1a764877a7 added signin link to green call to action box 2013-08-09 14:36:51 +10:00
Skud
12c9ee67d8 Made h3 smaller (so it's smaller than h2) 2013-08-09 12:58:34 +10:00
Amy
547476e8fd Remove a border and extra padding that looked out of place in the mobile view. 2013-08-07 21:46:52 -04:00
Skud
7ebdfd5692 fixed some weird formatting fo members 2013-08-07 16:26:33 +10:00
Skud
0c3c9c7694 fixed up some bootstrap formatting (rows/spans) 2013-08-07 15:51:49 +10:00
Skud
18405de849 tweaked hero unit/blurb/etc on homepage 2013-08-07 13:58:48 +10:00
Skud
c4e9683fe1 CSS tweaks and some tests 2013-08-07 13:21:27 +10:00
Skud
ed0b48bf7d style tweaking 2013-08-07 13:21:26 +10:00
Skud
d306aea1ca Added blog and email icons 
Both are free/unrestricted use:

Blog icon from http://theblogicon.com/
Email icon from http://commons.wikimedia.org/wiki/File:Email_social_icon.svg
 2013-08-07 13:21:26 +10:00
Ryan Clark
23f8848773 Added markers for member locations 2013-08-06 19:52:29 -07:00
Ryan Clark
fe00146f22 Added map to places/index 2013-08-06 19:38:11 -07:00
Skud
adceb61679 fixed javascript datepicker for seeds 2013-07-23 20:55:54 +10:00
Skud
91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +10:00
Skud
b9a3dec6cc fixed broken CSS that was hiding headings 2013-07-15 10:27:54 +10:00
Skud
a70a19871a Use github version of twitter-bootstrap-rails to fix firefox new tab problem 2013-06-12 09:07:41 +10:00
Skud
629020237b Merge branch 'dev' into payments-new 2013-06-04 21:20:24 +10:00
Skud
89a5a777e6 Merge branch 'dev' into payments-new 
Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb
 2013-06-04 19:42:00 +10:00
Skud
43798231dd added crop photos and a new placeholder image 2013-06-04 12:22:31 +10:00
Miles Gould
20eeec43ca Merge branch 'dev' into photos 
Conflicts:
	db/schema.rb
 2013-05-31 11:24:19 +01:00
Skud
cbca8c19a5 added admin controller and index view 2013-05-31 10:23:06 +10:00
Skud
7a1eaeffee added admin controller and index view 2013-05-29 14:37:42 +10:00
Skud
f138c99846 Merge branch 'dev' into payments-new 
Conflicts:
	db/schema.rb
 2013-05-22 10:21:43 +10:00
Skud
3aaf344951 rename account details to just account 2013-05-18 10:50:36 +10:00
Skud
c595b2181d added account_types, fixed a bunch of tests 2013-05-17 16:07:46 +10:00
Skud
0157229936 added account_details table, set up abilities 
also tweaked some order/order_item related abilities
 2013-05-17 13:05:46 +10:00
Skud
7d74203735 rails g scaffold OrderItem... 2013-05-15 13:47:16 +10:00
Skud
c227c11794 Added flickr icon, updated twitter icon 2013-05-14 22:33:55 +10:00
Skud
5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +10:00
Skud
245115fd7f rails g scaffold Order... 2013-05-07 21:14:08 +10:00
Skud
af38f8574e rails g scaffold Product... 2013-05-07 21:13:23 +10:00
Skud
7b065a0092 fixed pozorvlak's date-picker branch 
- tweaked javascript to specify date format (this fixed the javascript
    problems)
- converted planted_at to a date field, rather than datetime
- made tests pass even in non-UTC timezones
 2013-03-26 20:54:12 +11:00
Miles Gould
7430dfc25e Tried to use Bootstrap datepicker. Failed! 
We get the Javascript error "datepicker is not a function".
 2013-03-26 19:27:45 +11:00
Skud
c0ccbf2a0d georgia with lora headings 2013-03-11 14:30:26 +11:00
Skud
5bb0926a88 Rockin' it 70s style 2013-03-08 17:17:31 +11:00
Skud
0aef781d3d Merge pull request #120 from flov/dev 
fixed-to-top and padding for nicer design
 2013-03-05 02:16:06 -08:00
Florian Vallen
0b178f765d fixed-to-top and padding for nicer design 2013-02-28 20:36:47 +11:00
Miles Gould
3c13be2c0a Left-align comment links in posts. 2013-02-27 11:56:13 +00:00
Miles Gould
16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Joseph Caudle
a257c7037c Upgrade bootstrap by running rails g bootstrap:install 2013-02-21 20:55:58 -05:00
Skud
0bc2ff25fe Added roles, but haven't yet hooked them up to CanCan 2013-02-19 12:29:22 +11:00