Commit Graph

9193 Commits

Author SHA1 Message Date
Tyler Renelle 5f3eef770f chore(modules): add angular-filter 2014-11-19 14:32:45 -08:00
Tyler Renelle 2023cf852e chore(bower): upgrade angular to 1.3.3. Remove
bindonce (incompatible). Note, bindonce="..." attrs still need to be
converted to their {{::}} equiv for better performance, but this is
functional for now
2014-11-19 14:32:45 -08:00
Tyler Renelle f922a0337f bailey(owl) 2014-11-18 23:18:53 -08:00
Tyler Renelle b88a48ebd3 grunt(owl) 2014-11-18 23:06:13 -08:00
Tyler Renelle 677242b3e1 Merge pull request #4255 from SabreCat/owl
feat(quest): Add owl to purchasable quest eggs
2014-11-18 23:02:32 -08:00
Tyler Renelle b3d26d0b05 Merge pull request #364 from SabreCat/owl
Implement Owl quest for November event
2014-11-18 23:02:24 -08:00
Sabe Jones 9e8947ca75 fix(quest): HTML line breaks 2014-11-18 21:47:18 -06:00
Sabe Jones 3ef40626a6 fix(quest): Rogue line breaks 2014-11-18 21:36:52 -06:00
Sabe Jones 587aec1836 fix(quest): Not so smart quotes 2014-11-18 21:27:53 -06:00
Sabe Jones 9ececc9565 feat(quest): Implement Owl quest 2014-11-18 20:23:27 -06:00
Sabe Jones 000eefc695 feat(quest): add owl to egg types 2014-11-18 19:49:33 -06:00
Sabe Jones bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06:00
Tyler Renelle dacaf41d63 fix(MMM): typo 2014-11-18 16:39:42 -08:00
Tyler Renelle 2cecce5eec Merge pull request #4253 from HabitRPG/obfuscated-invite
feat(invite-friends): obfuscated invite
2014-11-18 16:39:05 -08:00
Tyler Renelle cb3ebccbbf feat(invite-friends): obfuscated invite 2014-11-18 16:38:43 -08:00
Tyler Renelle a38c8761a2 feat(premium): add premium features 2014-11-18 16:21:16 -08:00
Tyler Renelle 487f8afe30 feat(help): add tour to help menu 2014-11-18 12:00:33 -08:00
Tyler Renelle f7f4473590 fix(payments): allow resubscription after unsubscribe 2014-11-17 19:51:03 -08:00
Tyler Renelle 619c8f6f17 Merge pull request #361 from taldin/adjust_golden_knight
Adjust golden knight (shouldn't get Jean Chalard's Tunic)
2014-11-17 18:42:35 -08:00
Taldin e477f6482d Shouldn't get Noble Tunic from Knight Quest
Fixed getting both Jean Chalard's Noble Tunic and Mustelaine's Offhand
Morning Star.   Removed the line awarding the Tunic (armor_special2).
2014-11-17 17:50:22 -08:00
Taldin bc59db2c4d Fix rebuying Mustelaine's Morningstar after death
Modifies script\content.coffee.
2014-11-17 16:53:09 -08:00
Tyler Renelle 10fb931bf2 fix(hall): remove global vars 2014-11-17 16:08:10 -08:00
Tyler Renelle e1ff9610d0 fix(paypal): charge "immediately" for on subscription setup 2014-11-17 12:38:35 -08:00
Tyler Renelle d74f9d7a47 fix(goldenknight): add shop img for shield_special_goldenknight and fix
translation issues, fixes https://github.com/HabitRPG/habitrpg/issues/4249
2014-11-17 12:14:14 -08:00
Tyler Renelle 6ef838cf1a feat(webhooks): move webhooks from array to object (everything should
really be stored as objects). Add to API routes (see
HabitRPG/habitrpg-shared#83a22b8). Note, sorting doesn't work. Meh.
2014-11-16 20:03:56 -08:00
Tyler Renelle 83a22b8133 feat(webhooks): add webhooks operations 2014-11-16 20:03:20 -08:00
Tyler Renelle 21d6b71d37 Merge branch 'webhooks' into develop
Conflicts:
	src/controllers/user.js
2014-11-16 15:24:15 -08:00
Blade Barringer 4d08bb9206 Added uuid parameter to data link 2014-11-16 16:05:32 -06:00
Tyler Renelle d078654f41 chore(logo): 512x & 1024x logos 2014-11-16 13:57:50 -08:00
Tyler Renelle 45e67f0a7a refactor(payments): cleanup into directory, separate paypal & stripe files 2014-11-16 10:32:01 -08:00
Tyler Renelle 47cd11b76f refactor(paypal): move billing plan setup to a one-time file. It needn't
be called every server-run (see #4246)
2014-11-16 10:31:58 -08:00
Tyler Renelle 7a121b4273 fix(paypal): don't crash server when no paypal plan.id (see #4246) 2014-11-16 08:03:57 -07:00
Matteo Pagliazzi 45845228d0 fix(invite-friends): generate correct link on the client 2014-11-16 11:39:56 +01:00
Matteo Pagliazzi 727c96e5da fix(config): switch to new config style for emails, cc @lefnire 2014-11-16 10:56:18 +01:00
Tyler Renelle f2ee452a33 Merge pull request #4244 from HabitRPG/paypal2
fix(paypal): move from classic paypal APIs to paypal REST SDK
2014-11-15 16:09:24 -07:00
Tyler Renelle 25a5bf92a6 fix(paypal): move from classic paypal APIs to paypal REST SDK 2014-11-15 16:01:29 -07:00
Matteo Pagliazzi 63d700aa5a chore(i18n): update locales 2014-11-15 18:06:45 +01:00
Tyler Renelle 64fd6c02f7 fix(mods): restricted projected fields for mods-listing. Also,
static-bind for perf
2014-11-13 23:00:22 -07:00
Tyler Renelle cbd436a867 fix(invite-friends): canbuy->canBuy typo 2014-11-13 17:53:09 -07:00
Tyler Renelle 1d85bcd14e bailey(invite-friends) 2014-11-13 16:38:32 -07:00
Tyler Renelle 5fab3881a2 feat(invite-friends): allow specifying inveter's name (#4238 @lemoness) 2014-11-13 16:33:09 -07:00
Tyler Renelle d1ff1337e6 Merge pull request #4238 from HabitRPG/invite-friends
Invite friends
2014-11-13 13:04:20 -07:00
Tyler Renelle 524e0514a1 feat(invite-friends): update wording on invitations. Add commented-out
sample code on copy-link (it's not working)
2014-11-13 12:57:04 -07:00
Matteo Pagliazzi 02328fcf58 fix(invite-friend): change variables 2014-11-13 20:11:43 +01:00
Matteo Pagliazzi beea956d77 feat(emails): allow variables to be passed to emails 2014-11-13 19:52:16 +01:00
Tyler Renelle 0da391df59 fix(intive-friends): only invite set invitation if user hasn't already
been invited to a party
2014-11-13 11:42:56 -07:00
Sabe Jones 1aa7f6ca91 feat(quest): Begin implementing owl
Initial/test commit for building out the Owl quest.
2014-11-12 20:57:19 -06:00
Tyler Renelle 2166321572 feat(invite-friends): add inviting friends via email. URL parsed, session holds invitation. If user joins party (new user or existing), the inviter is rewarded 2014-11-12 19:24:47 -07:00
Tyler Renelle 9bb40d6a96 feat(invite-friends): add basilist quest 2014-11-12 19:23:43 -07:00
Tyler Renelle 114cbe2760 Merge pull request #4236 from HabitRPG/share-avatar
Share avatar
2014-11-12 14:42:48 -07:00