fc01104a0d
change habitrpg to habitica for PayPal subscription config
2016-01-14 03:08:16 +10:00
f83b271b30
rever new history preening
2016-01-13 11:07:52 +01:00
dba620ee7a
Merge pull request #6417 from GeorgeSG/reverse-chat-option
...
Add option to reverse chat order
2016-01-11 12:55:28 -06:00
7e8f0d24c5
Merge remote-tracking branch 'origin/pr/6307' into develop
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2016-01-11 13:48:01 -05:00
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01:00
0362977dbd
Merge branch 'develop' into static-page-merch
2016-01-06 22:38:19 +01:00
874f319d95
fix: Corrects logic where it was possible to customize avatar
...
with gem purchasable items without purchasing them.
Closes #6427
Closes #6448
lint(common): Add unnecessary quotes to make object look less weird
2016-01-03 10:41:44 -06:00
beaf0b83bb
Add option to reverse order of chat messages
2015-12-30 23:47:03 +02:00
b3050e5a67
chore(dependency): Upgrade lodash from v2 to v3
2015-12-29 07:45:03 -06:00
1c261056fe
clear local storage page added
...
changed submit bug to clear browser data
feat(views): Style clear local storage button
2015-12-26 19:00:42 -06:00
3c7ddf8df1
Merge branch 'develop' into static-page-merch
2015-12-14 21:27:50 +01:00
cf01376f7d
adjust forgot password text to specify that you must use the website - fixes https://github.com/HabitRPG/habitrpg-android/issues/170
2015-12-11 06:39:03 +10:00
c5b7873406
add support for habitica-android in x-client header
2015-12-09 11:02:26 +01:00
b337efb01a
raise android gem purchase: 21 instead 20
2015-12-02 20:13:33 +01:00
a42c671f1f
fix(model): Remove common.inviteParty
...
Per @vIiRuS
2015-11-30 15:48:46 -05:00
e881ba37e7
added static merch page
...
added lang en .json
modified pages.js with the extra merch page
2015-11-27 10:07:12 +01:00
846b6597ab
Merge pull request #6280 from vIiRuS/patch-6
...
Store inviteParty coachmark for iOS app
2015-11-26 11:45:33 -06:00
431eaec71a
add a missing full stop to a message and to the associated test
2015-11-24 14:11:01 +10:00
743e7cbebd
store inviteParty coachmark for iOS app
2015-11-23 16:24:46 +01:00
8b7f50bfcf
Adjust memory leak message to be meaningful.
...
Got this message in the heroku logs:
2015-11-17T04:28:18.549451+00:00 app[web.1]: '[Memory Leak] Memory=' + parseFloat(memory).toFixed(3) + ' Time=' + moment()
Converted the line into a variable and threw that instead.
2015-11-16 22:34:06 -06:00
e73c7be47a
fix(achievement): Make Costume Contest repeatable
2015-11-16 16:07:16 -05:00
a127bb8711
Switch to babel-core form babel.
...
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
ddeb0e7b23
Add babel register in the server file
2015-11-15 08:16:11 -06:00
0a99361953
Adjust i18n script to actually display zh_TW language.
2015-11-13 15:52:52 -06:00
ada97c1f91
Add invite party to ios tutorial
2015-11-13 07:19:51 -06:00
27d3d9d296
Merge pull request #6229 from HabitRPG/emails
...
Adjust the way email invitations resolve.
2015-11-13 07:18:41 -06:00
565aaff976
Merge pull request #6219 from HabitRPG/js_ify_common
...
Js ify common
2015-11-13 06:49:54 -06:00
e4679d6a63
Adjust the way email invitations resolve.
2015-11-12 18:58:01 -06:00
8e147d7b12
Allow users who register via facebook to see site tutorial.
2015-11-12 18:26:42 -06:00
abe778836d
Fixes #6225
2015-11-12 12:52:35 -06:00
9408effb4e
Remove coffeescript dependency from website
2015-11-11 20:32:16 -06:00
6acd6460ea
Merge pull request #6218 from crookedneighbor/increase_code_coverage_for_clearflags_route
...
Increase code coverage for clearflags route
2015-11-11 18:49:37 -06:00
43064dcf9a
Wrap flag purcging code in check for flags object
2015-11-11 18:00:15 -06:00
13da95b552
Add tests for clearflags route
2015-11-11 17:58:41 -06:00
06a5a1cb95
Merge pull request #6042 from HabitRPG/sabrecat/more-modals
...
More and better modals; Social Media sharing
2015-11-11 17:32:43 -06:00
3672601999
fix(chat): Handle nonexistent message.flags
2015-11-11 16:25:36 -05:00
117a254cc8
Patch exploit that would allow users to auto-delete messages
2015-11-11 06:46:11 -06:00
1fc21167dc
Send back flag data if user had flagged the message.
2015-11-10 08:15:54 -06:00
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
56fbc33d1c
Merge branch 'develop' into Move-Overview-To-Website
...
Conflicts:
website/src/routes/pages.js
2015-11-05 14:31:00 -05:00
4cbda6818c
Correct code to not iterate over mongoose object
2015-11-05 13:08:37 -06:00
cde66d6167
Merge pull request #6183 from crookedneighbor/clientIdentifier
...
Client identifier
2015-11-04 20:03:31 -06:00
905e7b17ea
Refactor user model
2015-11-04 18:00:40 -06:00
8c4ecb8f6c
feat(static): Apps page
2015-11-04 13:35:31 -05:00
7f189bebba
disable tutorial/tour depending on client
2015-11-04 16:54:47 +01:00
921ee881a5
Only create sample habits+dailies when registered through website
2015-11-04 16:41:13 +01:00
502e7f0af2
Merge branch 'develop' into sabrecat/more-modals
2015-11-03 14:29:23 -05:00
Alys