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
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
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
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
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
114cbe2760
Merge pull request #4236 from HabitRPG/share-avatar
...
Share avatar
2014-11-12 14:42:48 -07:00
Tyler Renelle
de509c83be
fix(sharing): add bucket to nconf
2014-11-12 14:40:33 -07:00
Tyler Renelle
8f633e81db
fix(sharing): add phantomjs buildpack to heroku (for pageres), proper use of nested nconf keys
2014-11-12 14:30:17 -07:00
Alice Harris
65ec6bcf2c
Merge pull request #4230 from ShilohT/develop
...
create 'Data' menu item
2014-11-12 20:15:04 +10:00
Tyler Renelle
cf66383a94
bailey(goldenknight)
2014-11-11 21:05:06 -07:00
