Commit Graph

27 Commits

Author SHA1 Message Date
Blade Barringer
94cd0bb852 Use user variable 2015-07-11 11:18:19 -05:00
Blade Barringer
d2e61bf5ef Change string to str 2015-07-11 11:15:04 -05:00
Blade Barringer
cb4b2e43bf Change variable name to itemList 2015-07-11 11:14:50 -05:00
sablecliff
d44a0a1608 Shortened another line using new the object 2015-06-30 17:16:09 +10:00
sablecliff
c8dd666939 Implemented changes as suggested by @crookedneighbour
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
sablecliff
96a3653620 Now includes the refactoring into different files.
Currently there a multiple ways to create the string being shown.
This will be changed upon the decision of which is prefered.
I personally prefer the first method, which uses a function inside the
object being created in content.coffee
2015-06-26 19:33:39 +10:00
sablecliff
459d5bfee3 Fixed small error with ternary statement and assignment of string 2015-06-25 19:45:34 +10:00
sablecliff
ebcfa849a2 implemented the object and checking function to retrieve objects from it.
At the moment it is only one instance in the rootCtrl.js file but once shown to work and in the proper setout the change will be propograted.
2015-06-25 11:46:19 +10:00
Sabe Jones
f5dfa5f015 fix(analytics): Define Analytics on scope 2015-06-22 18:30:47 -05:00
Sabe Jones
2ce1daffb8 feat(analytics): call service from app 2015-06-22 16:35:17 -05:00
Sabe Jones
56a461c513 Revert "feat(analytics): Analytics service"
This reverts commit 9a0e31db40.
2015-06-22 14:14:33 -05:00
Sabe Jones
9a0e31db40 feat(analytics): Analytics service
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
2015-06-22 11:21:02 -05:00
Alys
c6256d7fa1 fix https://github.com/HabitRPG/habitrpg/issues/5439 for the other darned gear types that I freaking forgot about 2015-06-21 17:32:46 +10:00
Alys
fc9f511542 allow Body Accessory equipment to be purchased from Seasonal Shop - fixes https://github.com/HabitRPG/habitrpg/issues/5439 2015-06-21 16:37:56 +10:00
Blade Barringer
3291062b31 Move markdown parsing to notification service 2015-06-01 17:49:27 -05:00
Blade Barringer
39f363ec29 Add tests for castEnd on root controller 2015-06-01 17:38:18 -05:00
TheHollidayInn
a8ca01ba62 Added markdown filter to endCast notification 2015-05-30 22:00:29 -05:00
Sabe Jones
29109051d7 feat(customize): Animal skins and ears
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
Kevin Gisi
d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Alys
ab6d8d0821 Merge pull request #4950 from gisikw/force-latest-bailey
Ensure Bailey always displays the most recent message.
2015-04-04 01:29:32 +10:00
Kevin Gisi
79606736a1 Ensure Bailey always displays the most recent message.
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
  static html file.

* Updated the new-stuff.jade modal template to use a $rootScope property.

* Added a special case to openModal for the newStuff template, by which it
  fetches the flat file, marks it as trusted HTML, and sets it to the
  $rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
kholliday
258da77586 Added sync on mage fireball spell 2015-03-26 00:18:18 -05:00
Blade Barringer
44b9ac7215 Fixed path to audio files. Closes #4704 2015-02-17 13:53:32 -06:00
Blade Barringer
8ac9dc3ced Merge branch 'develop' into common-convert 2015-02-10 16:27:46 -06:00
Blade Barringer
dca2f13dda Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
2015-02-05 11:20:40 -06:00
Blade Barringer
cc767efa20 Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	src/controllers/auth.js
	src/controllers/challenges.js
	src/controllers/groups.js
	src/controllers/members.js
	src/controllers/payments/index.js
	src/controllers/user.js
	src/middleware.js
	src/models/user.js
2015-02-03 21:13:55 -06:00
Blade Barringer
d2eafdd021 Started moving public folder stuff back to website 2015-02-03 14:02:34 -06:00