Matteo Pagliazzi
804b7b20c7
fix email sending for non registered users
2015-04-08 19:07:36 +02:00
Matteo Pagliazzi
f12f2b201a
typos
2015-04-07 16:07:52 +02:00
Matteo Pagliazzi
d21fb41aef
when signing up, delete previous email preferences
2015-04-07 16:04:33 +02:00
Matteo Pagliazzi
b2ffbf4113
password resets back to nodemailer...
2015-04-07 15:53:26 +02:00
Matteo Pagliazzi
16e67ab7d4
put password resets back to email server, check for non registered users unsubscriptions
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
e6c1a72c39
use callback itself as context
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
9e95f9c17d
pass entire unsubscription url to email server
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
ab1b75b655
finalize unsubscription page
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
a7c789746a
fix error when signing up
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
71108ee935
feat(email): WIP start implementing unsubscription page and related features
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
7d735519ec
feat(email-unsubscription-page): create model to hold unsubscriptions
2015-04-07 14:04:03 +02:00
Alys
32a71bfc74
Merge pull request #4980 from gisikw/sort-dated-todos
...
Sorted dated todos by date.
2015-04-06 18:22:51 +10:00
Kevin Gisi
ac01d9ad8b
Sorted dated todos by date.
2015-04-06 03:47:00 -04:00
Kevin Gisi
6cfdfc5225
Added group type to challenge API, link to guild/party on challenges
2015-04-06 02:44:43 -04:00
Kevin Gisi
145f4c0fa7
Check leader._id, rather than just leader for checking challenge ownership
2015-04-06 02:32:24 -04:00
Kevin Gisi
eef3e293e2
Populate group and challenge leader on challenge GET request
2015-04-06 02:18:29 -04:00
Kevin Gisi
da81241ebe
Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814
2015-04-06 02:18:29 -04:00
Kevin Gisi
6fb95ec27b
Unset .cid for challenge on challenge delete
2015-04-06 02:18:29 -04:00
Kevin Gisi
79fe0b53c5
Added _isMember to APIv2 challenges/:cid endpoint (requires user auth)
2015-04-06 02:18:29 -04:00
Kevin Gisi
3e653c9282
Reimplemented single challenge view code from #3319
2015-04-06 02:18:29 -04:00
Alys
934fd13042
update More Info challenges link to point to wiki instead of old trello card
2015-04-06 15:35:41 +10:00
Alys
5405dbe085
revert b0bf033c54 to see if Travis build then stops failing
2015-04-06 00:43:27 +10:00
Alys
7d579ea08a
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
...
Conflicts:
website/views/shared/modals/members.jade
2015-04-05 23:24:46 +10:00
Alys
b0bf033c54
Merge pull request #4861 from TheHollidayInn/retain-guild-filters-challenges
...
Added previous state tracker and a filter for challenges by a guild if the user has clicked that guilds challenge link.
2015-04-05 23:11:36 +10:00
Alys
def7ff906f
Merge pull request #4866 from TheHollidayInn/edit-plusminus-habit-challenge
...
Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior
2015-04-05 22:47:20 +10:00
Alys
6199e1d843
Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks
...
Conflicts:
website/public/css/tasks.styl
website/views/shared/tasks/task.jade
2015-04-05 22:01:10 +10:00
Alys
efb4773c27
Merge pull request #4958 from TheHollidayInn/groups-clear-notifs-fetch-messages
...
Marked group messages as seen when user syncs new messages
2015-04-05 20:19:51 +10:00
Alys
7aba0475fe
Merge pull request #4967 from Alys/API-wording-changes-2015-04-03
...
API wording adjustments (specify task types, describe when authentication is not required)
2015-04-05 19:01:09 +10:00
Sabe Jones
3c07a8ee6b
fix(frontpage): Wording tweak
2015-04-04 13:03:57 -05:00
Alys
baf38acc07
Merge pull request #4871 from TheHollidayInn/default-group-based-on-filter
...
Made default group for a challenge the selected group filter if there is only one filter selected
2015-04-04 17:01:35 +10:00
Tyler Renelle
e3626f6113
fix(static): use different intro image
2015-04-03 20:08:00 -06:00
Alys
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
Tyler Renelle
7336d5bc23
fix(auth): hacky fix to get around tabset hiding the surrounding
...
authctrl scope (due to isolate scope)
2015-04-03 15:48:32 -06:00
Tyler Renelle
6b52e00b37
Merge pull request #4972 from HabitRPG/lefnire/sugarfiend2
...
Static page redesign
2015-04-03 13:53:59 -06:00
Tyler Renelle
b99ae745c3
fix(static): update login modal to use ui-bootstrap
2015-04-03 12:54:07 -06:00
Tyler Renelle
c56c5ad12b
tmp(static): use s3 & cdn for various resources to prevent rate-limiting homepage
2015-04-03 12:42:03 -06:00
Alys
7a357933dc
Merge pull request #4914 from gisikw/repair_ie_meters
...
Fix broken meters in IE
2015-04-04 01:54:24 +10:00
Alys
0e581444b7
Merge pull request #4887 from TheHollidayInn/focus-textarea-on-pm
...
Added focus directive to focus textarea for a private message model box
2015-04-04 01:45:30 +10:00
Alys
ab6d8d0821
Merge pull request #4950 from gisikw/force-latest-bailey
...
Ensure Bailey always displays the most recent message.
2015-04-04 01:29:32 +10:00
Alys
5f3e57274d
Merge pull request #4938 from ExperimentMonty/clear-after-add-task
...
New tag field correctly clears when new tag added.
2015-04-04 01:16:21 +10:00
Alys
f432bc1f17
Merge pull request #4919 from TheHollidayInn/spells-level-with-exp
...
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
2015-04-04 00:29:41 +10:00
Alys
ec66bfb0cd
Specify which API routes need no authentication. Specify task types for full scoring route. For simple scoring, state that it's only Habits and explain that other tasks can use full scoring.
2015-04-03 21:24:48 +10:00
Tyler Renelle
26f1d6bb39
feat(static): secondary statics reflect front. merge front.old into features
2015-04-02 17:41:38 -06:00
Tyler Renelle
cdaa776978
feat(static): remove pipes, replace static footer with shared/footer
2015-04-02 17:22:36 -06:00
Tyler Renelle
47157a1b52
feat(static): convert front to jade, hack to make work basically
2015-04-02 15:29:38 -06:00
Kevin Gisi
7740f1969b
Fix broken meters in IE
...
Health, XP, and Mana bars were broken in IE, due to the use of {{ }} within
style attributes. Using Angular's string interpolation within style attributes
doesn't work in IE, as IE will actually strip the property immediately upon DOM
render. Using ng-style allows properties to be preserved, and renders
cross-browser correctly.
2015-04-02 15:41:01 -04:00
Matteo Pagliazzi
06ffd4db44
fix(i18n): when no lanaguage is passed in the request
2015-04-02 20:06:17 +02:00
TheHollidayInn
0e2867cce1
Marked group messages as seen when user syncs new messages
2015-04-02 10:58:24 -05:00
Sabe Jones
d4329c7a5a
fix(news): Corrections
2015-04-01 23:37:24 -05:00
Sabe Jones
b263ba3099
fix(seasonal): Sneaky floral
...
Srsly, just don't say it.
2015-04-01 23:19:54 -05:00
