Commit graph

731 commits

Author SHA1 Message Date
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
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
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
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
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
Blade Barringer
4d08bb9206 Added uuid parameter to data link 2014-11-16 16:05:32 -06:00
Matteo Pagliazzi
45845228d0 fix(invite-friends): generate correct link on the client 2014-11-16 11:39:56 +01: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
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
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
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
Tyler Renelle
15f318ccc2 feat(sharing): screw it, social links + img + text aint working, just
redirect to homepage + show member modal
2014-11-11 19:12:02 -07:00
Tyler Renelle
3e21e1f448 feat(sharing): implement caching of avatar img. img as image/png instead
of octet/stream
2014-11-11 19:12:02 -07:00
Tyler Renelle
69da58503a feat(sharing): move avatar-sharing to herobox, use addthis instead of
custom solution. refactor from pages/* to export/*
2014-11-11 19:11:49 -07:00
ShilohT
54c913a5a8 Update menu.jade
Added 'Data' menu item
2014-11-10 02:21:49 -05:00
Tyler Renelle
c08ad60200 bailey: community guidelines, facebook login 2014-11-09 15:17:29 -07:00
Alice Harris
1f9cb90d2d Merge pull request #4225 from Alys/beeminderDeleteWarning-2014-11-06
add warning text for Beeminder users about deleting To-Dos
2014-11-07 19:29:43 +10:00
Tyler Renelle
a8d4a7545c bailey(costumes) 2014-11-06 16:24:48 -07:00
Alice Harris
551e5d4e83 add warning text for Beeminder users about deleting To-Dos 2014-11-06 12:24:57 +10:00
Tyler Renelle
94a813fc6b bailey: backgrounds, beeminder 2014-11-04 19:50:56 -07:00
Tyler Renelle
51a850c766 fix(bailey) 2014-11-01 13:32:50 -06:00
Tyler Renelle
5e0f4e7823 bailey(mystery) 2014-11-01 13:31:08 -06:00
Tyler Renelle
d9cfe3c370 bailey(halloween) 2014-10-31 13:05:33 -06:00
Tyler Renelle
8423de287e Merge pull request #4142 from gjoyner/tasks
Popovers now disappear when clicking Save & Close
2014-10-29 14:22:21 -06:00
Tyler Renelle
edc9382e99 bailey(communityGuidelines): -breadstrings x1 2014-10-27 17:43:36 -06:00
Tyler Renelle
a394a1bc42 baily(communityGuidelines) 2014-10-27 16:51:42 -06:00
Tyler Renelle
b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Alice Harris
3d0f9c09bd Merge pull request #4167 from Alys/task-column-Habits-Rewards-tabs
new tabs for Habits and Rewards columns on task page
2014-10-27 18:46:08 +10:00
Tyler Renelle
fd18232187 bailey(): mystery, costume challenge 2014-10-24 20:33:51 -06:00
Tyler Renelle
87273ec680 bailey(quests): moonstone chain quest 2014-10-23 10:57:09 -06:00
Alice Harris
5e89d07e07 add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills) 2014-10-21 15:39:46 +10:00
Alice Harris
9c6e303fe4 move Daily and To-Do tabs to mixin and put at top and bottom 2014-10-19 15:03:24 +10:00
Blade Barringer
1ca6d7a55b Removed second binding 2014-10-17 13:02:26 -05:00
Blade Barringer
8f6dc64b10 Corrected html not showing up correctly in quest modal 2014-10-17 12:45:16 -05:00
Tyler Renelle
fb68f70adf feat(halloween): updated bailey @lemoness 2014-10-14 20:30:05 -06:00
Tyler Renelle
3b769a1407 Merge branch 'spider' into develop 2014-10-14 16:54:56 -06:00
gjoyner
4ab19ac225 Popovers now disappear when clicking Save and Close 2014-10-13 14:10:59 -07:00
Tyler Renelle
32cab260a2 bailey(spider) 2014-10-12 20:04:18 -06:00
Tyler Renelle
56e2ec1bc4 Merge pull request #4140 from gjoyner/checklists
Adding checklist item drag and drop feature
2014-10-12 18:27:06 -06:00
Negue
67b341760e stop spell casting on rewards 2014-10-12 22:01:12 +02:00
gjoyner
36bf09d984 Adding checklist item drag and drop feature 2014-10-12 01:48:51 -07:00
Alice Harris
d7c8d48078 Merge pull request #4129 from Alys/Gaelan-hide_completed_dailies
Add ability to hide completed dailies (Gaelan's changes with fixes for merge conflicts etc)
2014-10-10 22:07:30 +10:00
Alice Harris
264b16f76b move Dailies "All" tab to the first position, to make it the default (I hope) 2014-10-09 21:08:46 +10:00