Tyler Renelle 10e9c205e6 Merge branch 'translations' into develop ...

Conflicts:
	locales/bg/app.json
	locales/nl/app.json

2013-11-13 23:37:29 -08:00

..

adminCtrl.js

contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor

2013-11-06 15:59:56 -08:00

authCtrl.js

authCtrl tests now working, replaced window for $window

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

challengesCtrl.js

[#1781] challenges: select-all / select-none buttons

2013-11-11 19:00:43 -08:00

filtersCtrl.js

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

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

footerCtrl.js

confirm "trigger new day"

2013-11-08 09:18:03 -08:00

groupsCtrl.js

Merge pull request #1795 from Fandekasp/remove_website

2013-11-13 23:09:27 -08:00

headerCtrl.js

[#1710] fix to party-in-header

2013-11-01 20:32:43 -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

notificationCtrl.js

remove console.log

2013-11-08 22:37:40 +01:00

petsCtrl.js

fix hardcoded total pets count

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

rootCtrl.js

translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set

2013-11-13 22:01:02 +01:00

settingsCtrl.js

translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set

2013-11-13 22:01:02 +01:00

tasksCtrl.js

[#1693] make revive available to /options too

2013-10-31 09:34:12 -07:00

userCtrl.js

clean code from websites

2013-11-14 15:20:35 +11:00