Commit Graph

9193 Commits

Author SHA1 Message Date
Tyler Renelle 1e5b7e6f2d fix(#4282): refactor for DRY unlock/hide paths 2014-11-26 10:49:49 -07:00
Tyler Renelle 0278caca76 fix(#4282): fix $parse errors in avatar customize screens 2014-11-26 10:49:49 -07:00
Matteo Pagliazzi f5d0b79573 fix(loading bar): possible fix 2014-11-26 12:38:02 +01:00
Matteo Pagliazzi c0a3fc887a fix(costume): better fix for #4274 2014-11-26 12:26:41 +01:00
Matteo Pagliazzi 43fa461a67 fix(costume): fixes #4274 2014-11-26 12:19:33 +01:00
Matteo Pagliazzi afbd2199e8 fix(datepicker): fixes #4273 2014-11-26 11:51:44 +01:00
Tyler Renelle d24ece973b fix(food): popover-placement='top' in foodtray, fixes #4278 2014-11-25 15:26:42 -07:00
Tyler Renelle 89b1242e53 fix(emoji): move back to main jsemoji repo, fixes #4265 2014-11-25 10:22:57 -07:00
Alice Harris 2d7d3063b8 Merge pull request #4271 from Alys/like-button-fix-2014-11-25
re-enable +1 "like" button, add spaces before delete button, add "quick reply" to chat
2014-11-25 15:51:21 +10:00
Alice Harris f0b3da295c re-enable +1 button, add spaces before delete button, add "quick reply" to Tavern/guilds/party chat 2014-11-25 14:50:01 +10:00
Tyler Renelle 7de70fb5b1 fix(chat): fix missing like button 2014-11-24 21:28:47 -07:00
Tyler Renelle c5c096013e refactor(private): use cpus-1 on prod, max(2) cpus on beta (and
incidentally localhost)
2014-11-24 19:47:19 -07:00
Tyler Renelle 0f7f30aa12 bailey: private messages & november mysteries 2014-11-24 19:36:44 -07:00
Tyler Renelle 22cddb1086 feat(mystery): mystery 201411 2014-11-24 19:34:47 -07:00
Tyler Renelle 5f654c4dad fix(private-messages): move PM buttons to bottom-left of modal 2014-11-24 19:11:49 -07:00
Tyler Renelle 478cba9a5a feat(members): add options: $modal.open({size, windowClass}). Use those
to make avatar modal wider, and "100% window height" (see code, it's kinda hacky)
2014-11-24 18:59:27 -07:00
Tyler Renelle 36ffd8a8b2 fix(quick-reply): only show quick-reply in inbox (cc @crookedneighbor) 2014-11-24 18:14:17 -07:00
Tyler Renelle c309cb2342 Merge pull request #4267 from crookedneighbor/quick-reply
Quick reply
2014-11-24 18:11:43 -07:00
Tyler Renelle 04b8e889f3 Merge branch 'crookedneighbor-add-quick-reply-string' into develop
Conflicts:
	locales/en/groups.json
2014-11-24 18:11:18 -07:00
Matteo Pagliazzi e3f126c3db Merge pull request #369 from crookedneighbor/add-translation-strings
Added additional translation strings for pms
2014-11-24 20:20:46 +01:00
Matteo Pagliazzi a6d7594dc1 Merge pull request #4268 from crookedneighbor/missing-env.ts
Changed text to be translatable in inbox and character modal
2014-11-24 20:20:41 +01:00
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