sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9192 commits 3 branches 0 tags 1.6 GiB
Commit graph

440 commits

Author SHA1 Message Date
Blade Barringer
cc674f57cd Revert "Sorted dated todos by date." 2015-04-07 19:51:27 -05:00
TheHollidayInn
9619c46df2 Removed extra console.log 2015-04-07 18:49:25 -05:00
TheHollidayInn
09761c5c53 Corrected ordering that tasks appear in when user enters multiple tasks 2015-04-07 14:51:26 -05:00
TheHollidayInn
8826ae8c41 Removed axis resrtiction to ease reordering of large number of tags 2015-04-07 09:47:52 -05: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
Sabe Jones
66d5b38dad fix(news): Move pic 2015-04-06 19:26:14 -05:00
Sabe Jones
38bbf63a22 fix(news): Add heading 2015-04-06 19:24:48 -05:00
Sabe Jones
616a7d9650 feat(backgrounds): April BGs 2015-04-06 19:03:24 -05: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
43fdf939cc add text to the Market for eggs, hatching potions, and food to explain to new users that the items will also drop 2015-04-03 23:00:15 +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
Sabe Jones
f0e7f0464c fix(seasonal): NO FLOWERS 
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
 2015-04-01 23:07:36 -05:00
Sabe Jones
b6a4d65d8c feat(seasonal): Shiny Seed 2015-04-01 22:36:07 -05:00
Tyler Renelle
e64499658b Add 'website/public/front/' from commit 'fb87f009292bfb08bd308dbf7f63bc5ef094838f' 
git-subtree-dir: website/public/front
git-subtree-mainline: 507c1dd69a
git-subtree-split: fb87f00929
 2015-04-01 20:12:32 -06:00
Matteo Pagliazzi
507c1dd69a feat(i18n): add support for different chinese versions 2015-04-01 18:43:21 +02:00
John Montgomery
5163ee466b Fixes more bad git-fu. New tag creation works now. 2015-03-31 23:23:24 -04:00
Sabe Jones
6e1024d8ed fix(flowers): FLOWERS ON FLOWERS 2015-03-31 20:17:01 -05:00
Kevin Gisi
79606736a1 Ensure Bailey always displays the most recent message. 
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
  static html file.

* Updated the new-stuff.jade modal template to use a $rootScope property.

* Added a special case to openModal for the newStuff template, by which it
  fetches the flat file, marks it as trusted HTML, and sets it to the
  $rootScope property before rendering the modal.
 2015-03-31 20:38:15 -04:00
Sabe Jones
740ddefd76 fix(flowers): AND FIXES 2015-03-31 18:55:07 -05:00
Sabe Jones
1cc3c5539f feat(flowers): AND SLIMES 
AND BACKGROUNDS
 2015-03-31 18:41:50 -05:00
Sabe Jones
2acef4d42b feat(flowers): FLOWERS 2015-03-31 18:30:22 -05:00
John Montgomery
e35c753bdc Fixed errors caused by poor git-fu. 
Forgot I was on a detached head, made a commit, and failed hard at
cherry-picking the commit back to the correct branch.
 2015-03-31 08:55:16 -04:00
John Montgomery
c22acb81a8 Updates new tag code and test spec for new tags. 2015-03-30 22:07:02 -04:00
Tyler Renelle
edb50f7081 feat(analytics): a/b on tour (counter, finish button) 2015-03-30 16:57:17 -06:00
Tyler Renelle
e0dae01dda fix(analytics): remove a/b on play button, fixes #4947 2015-03-30 16:43:49 -06:00
John Montgomery
f95f892491 Changed new tag code to be more angular-idiomatic. 2015-03-30 08:32:45 -04:00
Sabe Jones
7d9728f2ff Merge pull request #4939 from SabreCat/spring-customize 
Spring customizations
 2015-03-29 16:52:09 -05:00
Matteo Pagliazzi
40bd38af53 add spring 2015 emails images 2015-03-29 22:32:52 +02:00
John Montgomery
99aad96688 New tag field correctly clears when new tag added. 2015-03-29 15:10:24 -04:00
Sabe Jones
9722af679d feat(customize): Spring Colors 2015-03-28 16:22:52 -05:00
Daniel Hammond
cea97e4da8 Documenting the (Bootstrap recommended!) wrapper workaround for tooltips 
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
 2015-03-28 01:21:39 -04:00
Alice Harris
61e8b65f14 fix drop notification images for hatching potions 2015-03-28 11:24:58 +10:00
Tyler Renelle
0638e36492 feat(analytics): new "play" variants 2015-03-27 12:52:38 -06:00
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys
f16ef869a3 Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges 
Added hide and error message when a user tries to create a challenge for...
 2015-03-27 19:21:51 +10:00
Alys
a3a1a92388 Merge pull request #4849 from TheHollidayInn/add-link-to-challenge-creator 
Added link to challenge creator on challenges.
 2015-03-27 18:13:33 +10:00
Kevin Gisi
ca87a46b04 Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement 2015-03-26 18:30:56 -04:00
Kevin Gisi
334393d33b Make Key to the Kennels free for Triad Bingoers. 
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
  achievement in lieu of gems.

* Removed Gem cost on inventory page if user has achievement.

* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
  achievement.

* Removed Gem costs from buttons if user has achievement.

* Added new copy for Key to the Kennels modal that omits gem prices if the user
  has the achievement.
 2015-03-26 18:30:56 -04:00
Tyler Renelle
f3e48093fb feat(analytics): track tour step 2015-03-26 17:11:46 -04:00
Tyler Renelle
e46789c303 feat(analytics): track cron count 2015-03-26 17:11:33 -04:00
Alys
e9baafcbc8 Revert "Added Conditional Semantics to group member query to always include the user." 2015-03-26 19:54:51 +10:00
Alys
ecaa1d31ac Merge pull request #4908 from TheHollidayInn/join-button-fix 
Added Conditional Semantics to group member query to always include the user.
 2015-03-26 18:53:01 +10:00
Alys
cb88862f6f Merge pull request #4911 from TheHollidayInn/drops-add-item-icons 
Added icons to Notification for the item that is dropped.
 2015-03-26 18:06:55 +10:00
Alys
e9062c31a2 Merge pull request #4913 from galarant/apply-level-cap-to-stats-display 
front end reflects level cap for stats bonus
 2015-03-26 17:49:45 +10:00
kholliday
258da77586 Added sync on mage fireball spell 2015-03-26 00:18:18 -05:00
Sabe Jones
63d6a43702 fix(pets): Eggy eggy progress bar 2015-03-25 22:03:46 -05:00
Sabe Jones
77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones
54778a5d0c fix(debug): Eggy eggy break 2015-03-25 21:42:06 -05:00
Sabe Jones
354872decb feat(March): Eggy eggy cont'd 2015-03-25 20:46:27 -05:00
Sabe Jones
b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Matteo Pagliazzi
de972eebc0 change email priority 2015-03-25 21:24:09 +01:00
Matteo Pagliazzi
488cd8852b move invites to quest to batch mode 2015-03-25 18:11:21 +01:00
Matteo Pagliazzi
ab0c5106a1 move quest-started email to batch mode 2015-03-25 17:52:15 +01:00
Matteo Pagliazzi
f470bcd1e1 add support for personal merge vars and move RECIPIENT_NAME to use them 2015-03-25 17:39:28 +01:00
kholliday
1a6b828e05 Moved dropClass to correct scope. 2015-03-25 07:49:49 -05:00
Alys
0fc158be2e Merge pull request #4893 from TheHollidayInn/checklist-removed-backspace-delete 
Removed delete function when user hits backspace/delete
 2015-03-25 18:00:31 +10:00
Alys
e7c0c370ee Merge pull request #4909 from TheHollidayInn/notify-user-empty-task 
Added tooltip for when a task is empty
 2015-03-25 17:59:20 +10:00
Jeff
a40a374eb5 front end reflects level cap for stats bonus 2015-03-24 19:53:13 -04:00
Tyler Renelle
d3ebc03865 feat(tour): add tour counter 2015-03-24 15:41:44 -06:00
Tyler Renelle
560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking 
justin head brings tour back.
 2015-03-24 15:41:44 -06:00
kholliday
a7873a41a1 Added icons to Notification for the item that is dropped. 2015-03-24 16:28:24 -05:00
kholliday
23e7a8e258 Added check for user object to prevent errors 2015-03-24 08:54:45 -05:00
Daniel Hammond
d537a7fee4 Tweaked copy on "enter a message" text for private message button popup. 
Added placeholder text for empty private message box.
 2015-03-24 00:10:44 -04:00
kholliday
e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
kholliday
9a157eea8c Added tooltip for when a task is empty 2015-03-23 19:36:37 -05:00
kholliday
1a725c0515 Added Conditional Semantics to group member query to always include the user 2015-03-23 15:17:21 -05:00
Matteo Pagliazzi
98220ed0e5 Merge pull request #4906 from gkjt/guildJoinRedirectFix 
Changed guild notification redirect to guilds/public instead of /guilds.
 2015-03-23 21:07:06 +01:00
George Tucker
84b2e39b0b Changed notification redirect to guilds/public instead of /guilds. Fixes #4902. 2015-03-23 17:59:38 +00:00
Tyler Renelle
7c102c577b tmp(robots.txt): temporarily remove robots.txt, not working in current state 2015-03-23 11:45:55 -06:00
Daniel Hammond
d3b92a0a6c Added a tooltip to make it clear to the user to type something in! 2015-03-22 12:37:32 -04:00
Alys
849ef6d862 Merge pull request #4822 from benschenker/fix-stats-rounding 
Fix Mana rounding on the stats page. Fixes #4820
 2015-03-22 17:42:07 +10:00
Daniel Hammond
5f726eadbf Adding an extra check to disable "send" for private messages when textbox 
is empty.
 2015-03-21 22:54:28 -04:00
Alice Harris
5c2818e68a remove message about when the survey achievements badges will be awarded 2015-03-21 19:28:29 +10:00
Tyler Renelle
5de42b03c9 fix(analytics): remove testing code 2015-03-20 17:03:01 -06:00
Sabe Jones
fbcf8e9a6f Merge pull request #4895 from SabreCat/spring2015 
Spring Fling 2015
 2015-03-20 17:29:02 -05:00
Sabe Jones
3f4bddc57d fix(tour): Try k 2015-03-20 17:22:12 -05:00
Sabe Jones
18649144a8 feat(tour): Early quit classes tour 2015-03-20 17:18:48 -05:00
Tyler Renelle
009b582f25 feat(analytics): add A/B testing on play button using GA's Experiments 
API. Revert this after the experiment
 2015-03-20 14:44:47 -06:00
Sabe Jones
ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones
e2b1083088 fix(spring): Tweaks 2015-03-20 15:19:37 -05:00
Sabe Jones
dac292114c fix(shop): Open Shop 2015-03-20 15:15:27 -05:00
Sabe Jones
bd0d4c8b21 fix(shop): Remove br 2015-03-20 15:09:55 -05:00
Sabe Jones
621e5ba7d7 fix(shop): Indent +1 2015-03-20 15:07:12 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
kholliday
824561bb57 Removed delete function when user hits backspace/delete 2015-03-20 14:03:20 -05:00
Sabe Jones
7065b400bc feat(surveys): Close out survey 2015-03-19 21:44:42 -05:00
Tyler Renelle
1e8265a9f1 feat(tour): add the other tour entries @lemoness 2015-03-19 15:53:12 -06:00
Alys
5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource 
Instant party source
 2015-03-20 06:46:38 +10:00
Tyler Renelle
cca2d81bc3 feat(tour): ESC to perma-close #4886 @lemoness @alys 2015-03-19 14:41:04 -06:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06:00
kholliday
ceb2639f81 Added focus directive to focus textarea for a private message model box 2015-03-19 11:49:46 -05:00
Brian Chen
9bab79790c Change task's bo-id to id with angular's {{::}}. Fixes #4430 2015-03-19 10:16:53 +08:00
kholliday
67b38f71f9 Removed styles and sorting ability for locked tasks (Challenge tasks) 2015-03-18 14:39:23 -05:00
Matteo Pagliazzi
92a6af72cf fix(emails): send emails to new fb users 2015-03-18 20:11:16 +01:00
Matteo Pagliazzi
75d1a766e5 chore(i18n): update locales 2015-03-18 19:37:26 +01:00
Matteo Pagliazzi
9e540e86af add email with optional message when kicking user from group 2015-03-18 19:12:53 +01:00
Matteo Pagliazzi
0722a17897 start working on kick from group email & message 2015-03-18 17:31:07 +01:00
Alice Harris
833ba9ec4a change Gully3 to Gully as requested by Gully in the Tavern and as confirmed by Lemoness 2015-03-18 19:13:39 +10:00
Sabe Jones
c8db070b12 fix(quests): Reference string correctly 2015-03-17 21:51:28 -05:00
Sabe Jones
4c5f4377ff fix(quests): Alternate unlock strings 2015-03-17 21:48:22 -05:00
Sabe Jones
efdf591eae fix(quest): Different string format 2015-03-17 21:38:22 -05:00
Sabe Jones
7422fe3865 fix(quest): Correct unlock string 2015-03-17 21:33:13 -05:00
Sabe Jones
4cb6783544 feat(quest): Bunny quest 2015-03-17 21:24:46 -05:00
Horacious
ef6445d6ec Blocks API from POSTing empty msgs to group chat 
Returns 204 on empty or undefined message
 2015-03-17 21:36:44 -04:00
kholliday
6e7aea991e Made default group for a challenge the selected group filter if there is only one filter selected. 2015-03-17 09:34:12 -05:00
Alice Harris
c47606c5b2 remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment 2015-03-17 07:49:37 +10:00
kholliday
4c141f8918 Removed css style hack for IE6 and IE7 that was interfering with habit plus/minus button behavior 2015-03-16 12:28:23 -05:00
Alys
8e4ef76e23 Merge pull request #4855 from Alys/icon-fix-2015-03-15 
replace ☰ with glyphicon-align-justify for visibility on Android browsers
 2015-03-16 19:53:34 +10:00
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
R. Daniel Hammond
5ac73aca9e Adding a couple of watch statements should make the party order auto-update on changes. 2015-03-15 20:49:13 -04:00
kholliday
c54794fd2a Added previous state tracker and a filter for challenges by a guild if the user has clicked that guild's challenge link. 2015-03-15 12:29:45 -05:00
Tyler Renelle
2cf98daec4 feat(auth): temporarily back to nodemailer #4789 (cc @paglias) 2015-03-14 18:30:46 -06:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
Alice Harris
3fcb74bc80 replace ☰ with glyphicon-align-justify for visibility on Android browsers 2015-03-15 00:57:30 +10:00
Alice Harris
21a7e6193f add whitespace between delete and opt-out 2015-03-14 23:27:26 +10:00
Alice Harris
f82469eba7 remove trailing whitespace 2015-03-14 22:40:26 +10:00
Alys
94f9cff279 Merge pull request #4850 from stillsnowedin/develop 
Added confirmation before deleting messages and moved buttons to top of ...
 2015-03-14 22:32:46 +10:00
Alys
59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button 
Added dequip ability per ticket: 3730
 2015-03-14 21:36:57 +10:00
Matteo Pagliazzi
5752f75c46 always allow reset password emails 2015-03-13 18:42:23 +01:00
Tyler Renelle
f993a5868f fix(robots): fix robots.txt per 
http://stackoverflow.com/a/7609187/362790 #4746
 2015-03-13 09:01:04 -06:00
Kathryn Norris
9d92bd384c Removed popover from delete messages button. (for #4848) 2015-03-13 05:05:54 -07:00
Kathryn Norris
47a05338e5 Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848) 2015-03-13 04:11:35 -07:00
Alys
881f70997b Merge pull request #4815 from Alys/debug-options-2015-03-07 
new local install Debug options in footer: +2 Missed days, +MP
 2015-03-13 14:06:12 +10:00
Alice Harris
cd8c0956f8 add debug button to footer for increasing mana points (MP) 2015-03-13 13:53:21 +10:00
kholliday
dd49b12bdb Added link to challenge creator on challenges. 2015-03-12 20:19:03 -05:00
Tyler Renelle
1687d9aeda feat(auth): 404 on "can't find email" 2015-03-11 18:12:30 -06:00
Alice Harris
9ac0ef0202 explain when survey participants will get their badge 2015-03-12 07:34:01 +10:00
kholliday
8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Tyler Renelle
de67f44e1f Merge pull request #4713 from HabitRPG/lefnire/interactive-tour 
Interactive Tour
 2015-03-10 19:23:01 -06:00
Sabe Jones
3a9e2a5123 fix(surveys): Visibility tweaks 2015-03-10 19:08:10 -05:00
Sabe Jones
53df85e01b fix(surveys): Fix malformed Angular 2015-03-10 18:47:21 -05:00
Sabe Jones
9cfa27f089 feat(surveys): Survey achievement 
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
 2015-03-10 18:39:00 -05:00
Tyler Renelle
962bb65608 tmp(interactive-tour): temporarily remove Hide button 2015-03-10 15:40:19 -06:00
Tyler Renelle
bbbec78bff tmp(interactive-tour): hide "Show Tour" temporarily #4726 2015-03-10 15:40:19 -06:00
Tyler Renelle
63a6af6e0a fix(interactive-tour): small updates per 
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
 2015-03-10 15:40:19 -06:00
Tyler Renelle
98f50374c9 fix(interactive-tour): "hide" on the left, nav on the right 2015-03-10 15:40:19 -06:00
Tyler Renelle
a7232b5abe fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart() 2015-03-10 15:40:19 -06:00
Tyler Renelle
232224c497 fix(interactive-tour): don't automatically show guide when on mobile devices 2015-03-10 15:40:19 -06:00
Tyler Renelle
62739346c7 tmp(interactive-tour): add "ok" to each step, see #4726 2015-03-10 15:40:18 -06:00
Tyler Renelle
d84549e239 feat(interactive-tour): disable ads till lvl 2 2015-03-10 15:40:18 -06:00
Tyler Renelle
812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Tyler Renelle
c5240da81f perf(robots): add robots.txt, see #4746 2015-03-10 14:31:00 -06:00
Blade Barringer
3830a39804 Removed invite button on challenges page. Closes #4796 2015-03-09 16:39:20 -05:00
Benjamin Schenker
bfd16dd7ec Fix rounding of gold on stats page to round down 2015-03-08 19:21:04 -05:00
Benjamin Schenker
5bdf1564e6 Remove rounding of gold to match the menu 2015-03-08 19:13:48 -05:00
Benjamin Schenker
963ddd7694 Fix Health and EXP rounding on stats page to match header 2015-03-08 19:11:08 -05:00
Benjamin Schenker
25427fcf4c Fix Mana rounding on the stats page. Fixes #4820 2015-03-08 16:37:51 -05:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
Matteo Pagliazzi
1b53aeaee8 increase timeout when usubscribing from email 2015-03-08 16:25:19 +01:00
Alice Harris
044930b7d3 add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it 2015-03-07 18:39:43 +10:00
kholliday
cfaedb3ebd Added bootstrap styles to button. 2015-03-05 12:11:42 -06:00
kholliday
11f61c2732 Add functionality to dequip all Battle Gear or Cosutme. 2015-03-05 09:40:37 -06:00
Blade Barringer
cdc8ff6000 Changed quest egg behavior closes #4792 2015-03-04 23:46:27 -06:00
Blade Barringer
f44c3b84ab Revert "Changed requirement to only need to complete one quest instead of two to" 
This reverts commit f8bdaf4c99.
 2015-03-04 23:43:27 -06:00