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

..

authCtrl.js

authCtrl tests now working, replaced window for $window

2013-10-12 22:46:13 -03:00

challengesCtrl.js

challenges: switch from ngRoute to ui-router

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

filtersCtrl.js

Subdocs & script templates. Migrate the API from User.tasks =>

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

footerCtrl.js

migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean

2013-10-22 18:50:50 -07:00

groupsCtrl.js

gMerge branch 'challenges' into develop

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

inventoryCtrl.js

drops: description on combining eggs/potions, selling to

2013-10-19 23:44:03 -07:00

marketCtrl.js

paypal: conslidate buy gems modals

2013-10-12 16:51:01 -07:00

menuCtrl.js

fix small error on startup

2013-10-23 18:49:14 +02:00

notificationCtrl.js

hotfix for streak bonus being given when selling item for gold

2013-10-27 13:44:04 +01:00

petsCtrl.js

fix hardcoded total pets count

2013-09-18 11:07:23 -03:00

rootCtrl.js

gMerge branch 'challenges' into develop

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

settingsCtrl.js

[#1540] add restore option for streak achievement

2013-10-24 11:04:35 -07:00

statsCtrl.js

initial grunt support, gzip enabled

2013-09-06 19:19:43 +02:00

tasksCtrl.js

challenges: sync score to challenge, lotsa bug fixes

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

userCtrl.js

fix to editing profile: "TypeError: Cannot call method 'toString' of undefined"

2013-10-23 10:25:43 -07:00