Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,237 Commits 64 Branches 1,256 Tags
3f16cd4fbf49af4c90b347ccd6965eb778fc16d7
Commit Graph

531 Commits

Author SHA1 Message Date
Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Kaitlin Hipkin 792e8d8094 fix awarding of party {up,on} achievs to update server 2016-03-10 20:38:53 -05:00
Sabe Jones cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -06:00
Kaitlin Hipkin d2d3b9deab award party {up,on} achiev when party reaches {2,4} members 2016-03-08 20:55:18 -05:00
Matteo Pagliazzi 582ded4494 disable rate limiting middleware 2016-03-08 23:21:11 +01:00
Phillip Thelen 36790592c6 add tests for improvement categories 2016-03-06 17:56:51 +01:00
Blade Barringer b553a6c134 fix: Remove active handles (incompatible with node v4) 2016-03-05 08:11:21 -06:00
Blade Barringer 511b003ec5 Merge pull request #6811 from crookedneighbor/upgrade_babel 
chore: upgrade babel to v6
 2016-03-04 08:36:08 -06:00
Blade Barringer 9447a6ce10 feat: pre-compile babel when used in production 2016-03-04 07:44:22 -06:00
Phillip Thelen a1e1ac211f improve improvement category validation 2016-03-04 14:00:26 +01:00
Sabe Jones ea983179a4 Merge pull request #6804 from HabitRPG/sabrecat/active-handles 
Active handles logging
 2016-03-03 13:55:14 -06:00
Blade Barringer 0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Sabe Jones af38e83e36 fix(logging): don't log without env var 2016-03-02 11:30:49 -05:00
Sabe Jones c761944c35 feat(logging): timestamp active handles output 2016-03-02 10:22:46 -05:00
Alys f69a29c152 improve group invitation code and tests 2016-03-02 09:26:55 +10:00
Sabe Jones a698559c04 fix(log-handles): don't log verbose code 2016-03-01 16:46:39 -05:00
Sabe Jones bff5258a56 fix(logging): get interval from env var 2016-03-01 16:46:39 -05:00
Sabe Jones 078100aac8 chore(logging): output active handles per 10 minutes 2016-03-01 16:46:38 -05:00
Matteo Pagliazzi 531d3969f4 fix cluster.fork 2016-03-01 09:15:13 +01:00
Alys cc5f794f3d prevent party inviter's email address being used as a Reply-To 2016-02-27 18:48:41 +10:00
Matteo Pagliazzi 82c4f91317 put newrelic behind a flag 2016-02-25 21:05:42 +01:00
Phillip Thelen 668ad6ff45 change imrovementCategories to array; 2016-02-24 15:57:08 +01:00
Matteo Pagliazzi d3e1a415a8 require newrelic as the first thing on startup 2016-02-21 22:39:55 +01:00
Matteo Pagliazzi f4d66c7384 config newrelic 2016-02-21 22:30:25 +01:00
Matteo Pagliazzi 4dfb24af6e enable newrelic 2016-02-21 22:02:37 +01:00
Phillip Thelen c751ee74c0 store which areas the user wants to improve in 2016-02-18 20:30:14 +01:00
Phillip Thelen 86181253c6 store reminders for tasks 2016-02-18 20:30:02 +01:00
Alys 3563244cdc change number of users from 1,000,000 to 1,100,000 2016-02-18 12:42:47 +10:00
Sabe Jones b4b64dcf19 fix(performance): no chat notifs from big Guilds 2016-02-12 13:18:30 -05:00
Sabe Jones 67929f3a96 fix(performance): don't send chat notifs for Newbies Guild 2016-02-11 21:29:32 -05:00
Matteo Pagliazzi 9b09848655 revert change to static files testing 2016-01-30 19:42:09 +01:00
Matteo Pagliazzi 6851a39dec test no-cache instead of max-age=0 2016-01-30 19:24:56 +01:00
Sabe Jones 91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Phillip Thelen 8e8c28725a Add avatar customizations to content API 2016-01-25 21:59:13 -06:00
Sighne 4d1daf1c41 Uses a const instead of a variable 2016-01-16 11:11:48 +01:00
Sighne a716ce3fa7 Adds a variable to manage user count 2016-01-16 11:11:48 +01:00
Alys fc01104a0d change habitrpg to habitica for PayPal subscription config 2016-01-14 03:08:16 +10:00
Matteo Pagliazzi f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Sabe Jones dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones 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
Matteo Pagliazzi 5244702e48 perf improvements for challenges history and migration 2016-01-11 18:29:39 +01:00
Matteo Pagliazzi b1a7e44722 fixes for new history preening, allow only 1 history entry per day in challenges tasks 2016-01-09 21:02:40 +01:00
Matteo Pagliazzi ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Daniel Van Camp 0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Blade Barringer 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
Georgi Gardev beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Blade Barringer b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
darkmeep 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
Daniel Van Camp 3c7ddf8df1 Merge branch 'develop' into static-page-merch 2015-12-14 21:27:50 +01:00
Alys 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