Tyler Renelle 928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop ...

Conflicts:
	src/models/user.js
	views/shared/modals/index.jade

2013-12-31 08:04:51 -07:00

..

adminCtrl.js

APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested

2013-12-15 17:54:34 -07:00

authCtrl.js

APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested

2013-12-15 17:54:34 -07:00

challengesCtrl.js

[#1994] fix "can't add task to challenge"

2013-12-16 15:38:40 -07:00

filtersCtrl.js

apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops)

2013-12-15 14:16:04 -07:00

footerCtrl.js

classes: very simple "buffs applied" icon next to level, add chat message

2013-12-17 19:16:31 -07:00

groupsCtrl.js

bosses: add extra notes about losing quest scroll on abort

2013-12-25 11:20:38 -07:00

headerCtrl.js

party.order set and cases added

2013-11-23 21:18:33 +11:00

inventoryCtrl.js

bosses: misc small bugs

2013-12-25 00:55:38 -07:00

notificationCtrl.js

Merge remote-tracking branch 'origin/sabe/rebirth' into develop

2013-12-31 08:04:51 -07:00

rootCtrl.js

Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency

2013-12-23 01:19:18 -07:00

settingsCtrl.js

Implement Rebirth in controllers and API, revise modal per @wc8 feedback

2013-12-24 18:09:32 -06:00

tasksCtrl.js

checklists: add CL up/down keyboard nav

2013-12-30 13:42:19 -07:00

userCtrl.js

Merge pull request #1986 from Magnilucent/develop

2013-12-28 21:15:32 -08:00