Commit graph

8513 commits

Author SHA1 Message Date
Benjamin Schenker
bfd16dd7ec Fix rounding of gold on stats page to round down 2015-03-08 19:21:04 -05:00
Benjamin Schenker
5bdf1564e6 Remove rounding of gold to match the menu 2015-03-08 19:13:48 -05:00
Benjamin Schenker
963ddd7694 Fix Health and EXP rounding on stats page to match header 2015-03-08 19:11:08 -05:00
Benjamin Schenker
25427fcf4c Fix Mana rounding on the stats page. Fixes #4820 2015-03-08 16:37:51 -05:00
Matteo Pagliazzi
1b53aeaee8 increase timeout when usubscribing from email 2015-03-08 16:25:19 +01:00
Blade Barringer
cdc8ff6000 Changed quest egg behavior closes #4792 2015-03-04 23:46:27 -06:00
Blade Barringer
f44c3b84ab Revert "Changed requirement to only need to complete one quest instead of two to"
This reverts commit f8bdaf4c99.
2015-03-04 23:43:27 -06:00
Blade Barringer
f8bdaf4c99 Changed requirement to only need to complete one quest instead of two to
buy eggs
2015-03-04 23:39:29 -06:00
Blade Barringer
bee77ab34c Revereted one time binding 2015-03-04 17:30:05 -06:00
Blade Barringer
90fe516562 Join button was showing even if user was already part of the group 2015-03-04 16:24:37 -06:00
Sabe Jones
f5f55c95c5 Merge pull request #4793 from SabreCat/backgrounds
March Backgrounds
2015-03-03 21:54:20 -06:00
Sabe Jones
27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones
21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Matteo Pagliazzi
85b547196e chore(i18n): update locales 2015-02-28 18:23:17 +01:00
Alys
35fea2101a Merge pull request #4743 from Alys/develop
migration script to force active users to be resting in the inn
2015-02-28 14:44:10 +10:00
Blade Barringer
cbc49829c8 Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray 2015-02-26 14:08:17 -06:00
K. Belardinelli
194aac1656 use more specific class for selector 2015-02-26 15:02:58 -05:00
Blade Barringer
7432b6fd57 Removed test string 2015-02-26 13:24:04 -06:00
Blade Barringer
d0e1f25c0b Added one time binding 2015-02-26 13:23:30 -06:00
Blade Barringer
fa31023830 Changed ng-show to an ng-if so that table striping would be correct 2015-02-26 13:22:24 -06:00
Blade Barringer
13c7804f64 Merge pull request #4757 from crookedneighbor/guild-button
Guild button
2015-02-25 17:28:39 -06:00
Blade Barringer
1629ca037b Did the _.isMember stuff the right way 2015-02-25 15:28:14 -06:00
Blade Barringer
a905f481e8 Added join button to top. Closes #3408 2015-02-25 15:07:54 -06:00
Blade Barringer
cb2af51faa Corrected ng-click to join 2015-02-25 14:45:04 -06:00
Blade Barringer
0d7b6b445e Added buttons for joining and leaving group. 2015-02-25 14:34:24 -06:00
Blade Barringer
30e158de48 Add _isMember attribute to groupSchema 2015-02-25 11:51:32 -06:00
Sabe Jones
b4b56e87f0 Merge pull request #4751 from SabreCat/mystery
Mystery Feb 2015
2015-02-24 21:01:52 -06:00
Sabe Jones
3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Sabe Jones
7d943d9007 fix(mystery): Last missing sprite 2015-02-24 20:40:32 -06:00
Sabe Jones
f5f21718ae fix(mystery): Missing sprites 2015-02-24 20:33:02 -06:00
Sabe Jones
55066480fb feat(mystery): Migration 2015-02-24 20:19:20 -06:00
Sabe Jones
d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer
33bd640bdb Fixes #3054 won't show pets as able to be fed if egg has noMount propery 2015-02-24 19:10:45 -06:00
Blade Barringer
016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer
6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -06:00
Matteo Pagliazzi
6d637e89a2 new bailey 2015-02-24 19:29:00 +01:00
Matteo Pagliazzi
45f2453a62 typo 2015-02-24 16:51:09 +01:00
Alice Harris
84018a7739 create script that forces all recent users to be resting in the inn - useful when we have massive server problems 2015-02-24 20:59:51 +10:00
Tyler Renelle
02901e52fd perf(auth): small register perf improvement. use $or in $regex query,
intead of two queries, so if first operand true we short-circuit second operand
2015-02-23 23:48:46 -07:00
Tyler Renelle
16c4c420bb chore(server): small updates to better support recent nodejs buildpack 2015-02-23 23:48:46 -07:00
Blade Barringer
e9b72ad40d Merge pull request #4721 from crookedneighbor/fix-challenge-select-ios
Fixes #4719. Guild select for challenges pre-populates with first group
2015-02-23 22:09:17 -06:00
Matteo Pagliazzi
14d6a59e96 chore(i18n): update locales 2015-02-23 21:53:50 +01:00
Matteo Pagliazzi
4da8eb1d58 fix(typo) 2015-02-23 21:51:15 +01:00
Matteo Pagliazzi
4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer
b010a53bed Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-02-23 11:11:38 -06:00
Blade Barringer
067f32a4ae Corrected paths in karma conf 2015-02-23 11:11:19 -06:00
Tyler Renelle
a819f68fdf minor migration update 2015-02-23 09:50:28 -07:00
Blade Barringer
21ef62481d Removed step attribue from contributor input 2015-02-23 09:41:27 -06:00
Blade Barringer
a2eda6c91a Merge pull request #4733 from remmz0r/gemDisplay
Gem Display Text in Modals (new) - Fixes #4645
2015-02-22 13:17:47 -05:00
Blade Barringer
5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00