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
