Commit Graph

26 Commits

Author SHA1 Message Date
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
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
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
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
Miles Gould
16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Skud
0bc2ff25fe Added roles, but haven't yet hooked them up to CanCan 2013-02-19 12:29:22 +11:00
gnattery
e10ea7f180 rails g scaffold Forum 2013-02-13 12:55:17 +11:00
Miles Gould
42d9034fc6 rails g scaffold notifications. 2013-02-12 13:17:14 +00:00
gnattery
3cff543184 rails g scaffold Comment 2013-02-06 14:49:49 +11:00
Skud
0af986021e Generated scaffold for plantings 2012-12-19 13:30:40 +11:00
Skud
760cf03b2c Fixed tests by getting rid of valid_session 2012-11-26 19:04:43 +11:00
Norman Ancajas
f89815b6b3 added gardens table 2012-11-05 11:45:56 +08:00
Miles Gould
1d9c1b14fc Generate scaffold for Crops; refactor tests
Add link to Crops page from index
Refactored index/application tests to better reflect where things are.
2012-10-02 11:32:56 +01:00
Skud
aeb9b5619b ran compass install to get foundation JS 2012-09-15 11:12:05 +01:00
Skud
ef9bf992d8 still trying to get zurb foundation working 2012-09-15 11:11:11 +01:00
Skud
6e0c7cf02c installed zurb, ran various rails g scripts from http://foundation.zurb.com/docs/gem-install.php#simple2 2012-09-15 11:11:11 +01:00
Cesy Avon
72b16c10cf Adding a home page 2012-08-23 12:56:37 -07:00
Cesy Avon
95145f2869 Moving development to top level directory 2012-08-23 10:41:00 -07:00