Tyler Renelle 77fee06fdb gMerge branch 'challenges' into develop ...

Conflicts:
	migrations/20131028_cleanup_deleted_tags.js
	src/controllers/groups.js
	views/options/groups/group.jade
	views/options/profile.jade

2013-10-29 15:38:47 -07:00

..

controllers

gMerge branch 'challenges' into develop

2013-10-29 15:38:47 -07:00

directives

challenges: better syncing of new, updated, & deleted tasks from

2013-10-28 11:34:07 -07:00

filters

pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs

2013-10-19 19:30:39 -07:00

services

challenges: much better implemntation of ui-router for nested groups. No

2013-10-29 15:25:50 -07:00

app.js

challenges: much better implemntation of ui-router for nested groups. No

2013-10-29 15:25:50 -07:00

static.js

[#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes

2013-09-17 14:10:10 -04:00