c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
b26d5ee732
Merge pull request #4540 from crookedneighbor/add-ngsanitize
...
Added ng-sanitize
2015-01-19 21:37:43 +01:00
753cac236b
Added ng-sanitize
2015-01-19 14:17:43 -06:00
f93e0ba6b9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
...
Conflicts:
views/shared/tasks/task.jade
2015-01-19 17:06:19 +00:00
2c88be85cf
fix(tasks): vertically align habit buttons
...
* When a task has + and - buttons, display the buttons vertically and
expand them to fill the full height of the task.
* Use glyphicons for + and - icons
2015-01-19 16:41:01 +00:00
57637d4271
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
ally if it merges an updated upstream into a topic branch.
2015-01-19 17:52:54 +10:00
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
7c10d27c04
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-18 15:56:11 -06:00
13e89f1947
Added sync after changing username so username would update
2015-01-18 15:55:39 -06:00
a44e0f7c31
fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at
...
the router level anyway. Besides, avatar sharing hasn't worked via
addthis for a while, so we don't need this
2015-01-18 14:53:18 -07:00
a053486fcd
fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x
...
bug. Also, anon wasn't able to view avatar shares!
2015-01-18 14:51:40 -07:00
503fd9ff51
refactor(services): remove un-used authService, cleanup authCtrl
2015-01-17 18:59:28 -07:00
2306b7c572
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:43:37 -07:00
f5e9568cef
Consolidated calcTriadBingo function
2015-01-16 21:33:58 -06:00
90c7142da5
refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js.
2015-01-16 16:48:53 -07:00
e25472759a
Added triad bingo achievment
2015-01-16 16:43:48 -06:00
e5b6e64a98
Added preliminary logic for opening triadBingo modal
2015-01-16 11:47:07 -06:00
10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
35e8097b0c
refactor(challenges): wrap group.challenges as $resources, so they're
...
convenience functions $join/$leave/etc can be called directly
2015-01-15 15:24:02 -07:00
385fe36a0a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-12 21:50:14 -06:00
a72ae097d6
Corrected how count is calculated
2015-01-11 18:23:27 -06:00
f6885427a8
Corrected Beast Master and Mount Master count so it would be accurate.
2015-01-11 17:24:01 -06:00
7660141365
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
Conflicts:
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2015-01-11 14:15:55 +10:00
1e11947c9e
Removed unnecessary comment
2015-01-10 09:52:51 -06:00
819ab0b6e1
Added updated mountCount to releaseBoth function
2015-01-10 09:52:09 -06:00
0f2adcad14
highlight spell item when it has class of 'active'
2015-01-10 10:35:27 -05:00
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -06:00
0f3d6bc751
Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh)
2015-01-10 09:24:30 -06:00
a5d6c9de3f
Force update of mountCount after feedling
2015-01-10 09:22:53 -06:00
c6ef4b52ab
The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts)
2015-01-10 09:03:59 -06:00
689b13ecb6
fix(world-boss): Justin not stressed yet
2015-01-09 10:00:16 -06:00
cda16d5bc0
Merge pull request #4494 from SabreCat/stressbeast
...
World boss for Winter Wonderland 2015
2015-01-08 15:51:04 -06:00
ee339fba4a
feat(event): World boss
...
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:22:42 -06:00
cba232ef83
feat(presskit): add presskit page cc @lemoness
2015-01-08 13:41:23 -07:00
0807e7856c
Merge remote-tracking branch 'upstream/develop' into mountmaster
2015-01-08 11:31:45 -06:00
eca252a269
Corrected moment code to use new format instead of depreciating format
2015-01-07 10:28:46 -06:00
ff3d942696
Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try
2015-01-04 16:11:22 -06:00
fe1672e82d
Merge pull request #4441 from crookedneighbor/stripe-name-error
...
Stripe name error
2015-01-03 15:25:29 -07:00
6441888d3f
Moved mountMaster watch to feeding function
2015-01-02 19:09:50 -06:00
9b82da064f
Moved the beastMaster modal alert from notifications to inside the hatching function
2015-01-02 18:52:25 -06:00
e1494b3860
Added Shared as one of the injections
2015-01-02 18:51:51 -06:00
b69182f777
Added mountCount variable for easy access
2015-01-02 14:10:52 -06:00
406edcb761
Added releaseBoth script and refactored keys to the kennel modal
2015-01-02 13:33:41 -06:00
7f2648eafb
Renamed release scripts
2015-01-02 12:43:40 -06:00
33abd30217
Adjusted look of gem wallet in modal
2015-01-01 23:22:40 -06:00
6807368c5c
Removed comment
2015-01-01 21:29:27 -06:00
71a2ef91ca
Fixed modals from not popping up when beastMaster and mountMaster
...
achieved
2015-01-01 20:52:55 -06:00
9d6d375663
Salt spell d
...
oesn't check to see if you have enough Gold #4454 adjusting check
2015-01-01 14:31:11 -06:00
cf40ef8a72
Salt spell doesn't check to see if you have enough Gold #4454 check if spell uses gold
2014-12-31 20:37:54 -06:00
37a6091638
Salt spell doesn't check to see if you have enough Gold #4454
2014-12-31 19:29:08 -06:00
Blade Barringer