Commit Graph

5631 Commits

Author SHA1 Message Date
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 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
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
Blade Barringer aafc1131ad Made message sent notification a translatable string 2014-11-23 21:39:14 -06:00
Blade Barringer 7ea8ff70ae Added additional env.t declarations for pm modal 2014-11-23 21:33:14 -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 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
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
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 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 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
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 677242b3e1 Merge pull request #4255 from SabreCat/owl
feat(quest): Add owl to purchasable quest eggs
2014-11-18 23:02:32 -08:00
Sabe Jones bf8882e8f5 feat(quest): Add owl to purchasable quest eggs 2014-11-18 19:37:57 -06: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 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 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 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 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 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