Commit Graph

8321 Commits

Author SHA1 Message Date
Alice Harris 66aebf2e80 make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996 2014-11-25 05:16:36 +10:00
Blade Barringer 801521df98 Added message sent note string 2014-11-23 21:39:36 -06:00
Blade Barringer aafc1131ad Made message sent notification a translatable string 2014-11-23 21:39:14 -06:00
Blade Barringer 66e68a5814 Added additional strings for pm modal 2014-11-23 21:33:41 -06:00
Blade Barringer 7ea8ff70ae Added additional env.t declarations for pm modal 2014-11-23 21:33:14 -06:00
Blade Barringer 6b859fa11b Added additional translation strings for pms 2014-11-23 21:20:27 -06:00
Blade Barringer d8c30fc885 Added env.t for member modal to allow for translations 2014-11-23 21:19:40 -06:00
Blade Barringer bf586cbc17 Added env.t declarations for translations 2014-11-23 21:16:32 -06:00
Blade Barringer 85c7f80f14 Added string for quick reply 2014-11-23 20:41:52 -06:00
Blade Barringer 8c1adb7fa9 Adjusted quick reply function so it actually passes in the uuid
correctly
2014-11-23 20:36:00 -06:00
Blade Barringer f16d9d609e Added quick reply button (doesn't load in the correct parameters for
sending a msg)
2014-11-23 20:29:27 -06:00
Matteo Pagliazzi d01b4291af chore(i18n): update locales 2014-11-23 20:53:44 +01:00
Alice Harris 19fb81aafd Merge pull request #4248 from crookedneighbor/add-uuid-to-user-data-link
Added uuid parameter to data link
2014-11-22 12:08:51 +10:00
Alice Harris ec1056c07f Merge pull request #367 from taldin/update-tavern-tier-descs
tavern-tier-rewards-update(en)
2014-11-22 07:51:39 +10:00
Tyler Renelle ecef457d2b fix(private-messages): glyphicon-ban-circle (@Alys @crookedneighbor) 2014-11-21 10:40:57 -07:00
Tyler Renelle 743df194c7 feat(private-messages): add a "clear all" button 2014-11-21 08:42:24 -07:00
Tyler Renelle 03f47cd0aa feat(private-messages): add a "clear all" fn 2014-11-21 08:42:08 -07:00
Tyler Renelle 1539c35d29 fix(private-messages): clear newMessages both when leaving and entering inbox 2014-11-21 08:34:08 -07:00
Tyler Renelle a429dce5dd fix(private-messages): blocker can't message blockee 2014-11-21 08:25:35 -07:00
Tyler Renelle 31fdc866c3 fix(members): add a callback so members modal doesn't popup until after
member is fetched
2014-11-21 08:15:19 -07:00
Tyler Renelle 697694c69d refactor(private-messages): cleanup block-user 2014-11-20 20:14:52 -07:00
Tyler Renelle 7bf54f569b Merge pull request #4260 from HabitRPG/PMs
Private Messaging
2014-11-20 19:21:28 -07:00
Tyler Renelle 1bca160eb6 feat(private-messages): add features for private-messaging (deletePM, blockUser) 2014-11-20 19:06:00 -07:00
Tyler Renelle f5415ac6c5 feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays 2014-11-20 19:03:01 -07:00
Tyler Renelle b36c9c0fb0 fix(bootstrap): upgrade angular-ui-bootstrap 2014-11-20 19:02:46 -07:00
Taldin 9a434476c4 tavern-tier-rewards-update(en)
Updated to show the correct gem awards for tiers in the tavern (en
corrected only)
2014-11-20 15:33:33 -08:00
Tyler Renelle f68f884525 refactor(reflist): helper fn for reflist.push (not used now, but might
need soon)
2014-11-20 16:22:42 -07:00
Blade Barringer 58df93fad4 Corrected ordering of moment().add and moment().subtract to remove
deprecation warnings in tests
2014-11-19 20:37:10 -06:00
Tyler Renelle ebebcea34b fix(webhooks): sort webhooks by created, use angular-filter for sorting object 2014-11-19 15:42:14 -08:00
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