1761752240
use email server for reset-password
2014-12-11 16:51:39 +01:00
324077566b
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster
...
Conflicts:
script/content.coffee
2014-12-11 08:31:19 -06:00
cea2879539
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster
2014-12-11 08:15:18 -06:00
af01065da6
Merge pull request #385 from SabreCat/rebalancing
...
MP gain revisions
2014-12-11 14:06:06 +10:00
11ec69674c
chore(grunt): grunt
2014-12-10 21:49:40 -06:00
2fc0cb8fa1
fix(scoring): move gainMP into score
2014-12-10 21:45:51 -06:00
7b22244f01
feat(scoring): MP gain from Habits and Dailies
...
Turns MP gain from tasks into a function, and calls the function with varying inputs from Habits (1/4 gain), Dailies (normal gain), and To-Dos (normal gain multiplied by checklist completion).
2014-12-10 21:21:09 -06:00
e79126bf59
Merge pull request #4372 from thehindenburg/optoutspace
...
added space in Jade to the arrow and opt out text in the inbox
2014-12-10 15:51:38 -06:00
f9cc2adda5
fix(iap): iap verification fixes
2014-12-10 14:25:00 -07:00
bb37c163cf
fix spacing
2014-12-10 14:21:03 -07:00
d92832bfb2
Hopefully a working IOS Verification
2014-12-10 14:21:03 -07:00
ecf20f423c
IAP Verification for Android
2014-12-10 14:21:03 -07:00
b59a70f128
more dummy controller, just for iap data
2014-12-10 14:21:02 -07:00
cc4812712a
dummy iap verify routes
2014-12-10 14:21:02 -07:00
2ea12d5c71
Add in-app-purchase Package
2014-12-10 14:21:02 -07:00
799934c31b
added space in Jade to the arrow and opt out text in the inbox
2014-12-10 12:31:09 -08:00
7fb1e69927
Changed inbox text to use an env.t var
2014-12-10 10:47:05 -06:00
d2e5f60dd4
Added inbox as a env.t var
2014-12-10 10:46:36 -06:00
4af70a2a0f
Made invite button for guild invitations part of an input-group
2014-12-10 09:47:58 -06:00
842289ffdf
Merge pull request #384 from SabreCat/penguin
...
Penguin quest
2014-12-09 21:23:19 -06:00
fdf25611fb
Merge pull request #4370 from SabreCat/penguin
...
Penguin quest
2014-12-09 21:22:45 -06:00
ac2ce59873
chore(grunt): grunt
2014-12-09 21:16:00 -06:00
c6d3d72e00
fix(sprites): Move penguins 3px
2014-12-09 21:08:13 -06:00
5cd6c02e8a
fix(quest): Dapper to perspicacious
2014-12-09 20:56:38 -06:00
dc034e4ab5
fix(quest): Add penguin to shop
2014-12-09 20:48:08 -06:00
7fd4cebbdc
fix(quest): Penguin corrections
...
Fix missing egg item and line breaks in quest text
2014-12-09 20:44:10 -06:00
d25455fa5a
feat(quest): Implement Penguin pet quest
2014-12-09 20:21:20 -06:00
2d9d8fe209
chore(Bailey): Announce Penguin
2014-12-09 20:20:17 -06:00
935dc2cd2e
Merge pull request #383 from betaveros/cap-crit-multiplier-cp
...
Diminish critical hit bonus towards 450% (rebalancing-2014-12 copy)
2014-12-10 12:06:39 +10:00
af130a701c
Diminish critical hit bonus towards 450%
2014-12-10 07:03:32 +08:00
ce73a75133
feat(email): add new image for subscription email
2014-12-09 17:34:28 +01:00
1511002a08
Fixed styling of invitation to guild page
2014-12-08 17:03:11 -06:00
5230883015
Adjusted styling of select box used for ordering party
2014-12-08 16:57:37 -06:00
2a3bd8a9cb
No longer displays an extra popover that says true. Closes #4362
2014-12-08 12:44:37 -06:00
3d2c7e8854
Fixed a grammar error in the Golden Knight 2 quest
...
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
2014-12-08 12:19:08 -06:00
5ac7f479d3
Added some spacing between icons and text on challenge/guild buttons
2014-12-07 21:03:09 -06:00
05c01ebd3c
Made glyphicons white on for challenge/guild join/leave buttons
2014-12-07 21:01:40 -06:00
72fbe6a8a7
Removed yellow background from join public guild page
2014-12-07 20:58:42 -06:00
bd21c93b36
Fixed weirdness on create guild page. Elements were overflowing out of
...
their boxes
2014-12-07 20:52:49 -06:00
46cb38660e
Fixed padding on challenges filter box
2014-12-07 20:20:42 -06:00
9a60fc7ca8
Accidentally a dash
2014-12-08 01:02:14 +01:00
d27dc29607
Spells now mention which attribute they affect
...
https://github.com/HabitRPG/habitrpg-shared/issues/380
2014-12-08 01:01:06 +01:00
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
e49e8f5765
Added note for paglias
2014-12-07 13:50:47 +01:00
5acde1e609
Added todo for paglias
2014-12-07 13:50:47 +01:00
aafda2dad1
Added text of message to make sure user clicked the right flag
2014-12-07 13:50:47 +01:00
8537c96eb6
Converted heading to paragraph
2014-12-07 13:50:47 +01:00
7a7c13ff6d
Prevent modal from popping up if already reported
2014-12-07 13:50:47 +01:00
2f506ce0e0
Give flag text danger class and already reported message if already
...
reproted
2014-12-07 13:50:47 +01:00
e9cffe6206
Error handling for if message already flagged
2014-12-07 13:50:46 +01:00
Matteo Pagliazzi