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

5920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
fdcc22bde9 Closes #4361 2014-12-24 09:02:03 -06:00
Matteo Pagliazzi
635ebf626b fix(flag-email): correctly format date 2014-12-23 18:54:56 +01:00
Matteo Pagliazzi
c55ebf5c07 Merge pull request #4402 from HabitRPG/add-flag-to-chat 
Add flag to chat
 2014-12-23 18:36:23 +01:00
Blade Barringer
8e0358f7c7 Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-23 10:08:01 -06:00
Blade Barringer
84db289957 Merge branch 'develop' into add-flag-to-chat 2014-12-23 10:07:42 -06:00
Matteo Pagliazzi
4c785e8459 fix(flag-chat): correct url for tavern flags 2014-12-22 21:09:27 +01:00
Blade Barringer
37b9e5012a Added links to user modals 2014-12-22 13:22:42 -06:00
Matteo Pagliazzi
2d4c5e7b98 feat(flag-chat): fetch author and add some group variables 2014-12-22 20:02:22 +01:00
Matteo Pagliazzi
7aff280a71 feat(flag-chat): add some variables 2014-12-22 19:56:11 +01:00
Matteo Pagliazzi
652ce10e22 feat(flag-chat): start implemnting email 2014-12-22 19:48:03 +01:00
Sabe Jones
07fbcbcb08 Revert "fix(phantom): downgrade to node 0.10.22 due to CERT error, see" 
This reverts commit dc18569e78.
 2014-12-21 20:53:03 -06:00
Sabe Jones
883d472b94 Merge pull request #4395 from SabreCat/Bailey 
Wonderland Bailey 1
 2014-12-21 15:47:51 -06:00
Sabe Jones
833ff90a59 chore(news): Wonderland Bailey 1 2014-12-21 15:41:32 -06:00
Sabe Jones
5979aa3b9a Merge pull request #4394 from SabreCat/hair 
Wintery Hair Colors for Wonderland 2015
 2014-12-21 15:17:47 -06:00
Sabe Jones
bb89a10356 feat(event): Wintery Hair Colors 2014-12-21 13:58:47 -06:00
Tyler Renelle
492260d74a refactor(coupons): coupons cleanup using async.auto 2014-12-20 17:58:00 -07:00
Matteo Pagliazzi
b2bbfdfe09 Merge pull request #4392 from crookedneighbor/fix-moment-in-tests 
Updated moment calls to use number, period to fix the depreciation error
 2014-12-20 17:15:19 +01:00
Matteo Pagliazzi
8b3c6f94bf fix(loggly): send more infos about cron errors 2014-12-20 16:20:40 +01:00
Blade Barringer
95951a4706 Updated moment calls to use number, period to fix the deprecation error 2014-12-19 19:41:22 -06:00
Matteo Pagliazzi
739d8885a3 fix(emails): remove unused variable 2014-12-19 19:59:12 +01:00
Matteo Pagliazzi
7c0b25d58a pass base_url to emails as variable 2014-12-19 19:46:05 +01:00
Blade Barringer
be37e88dc3 Corrected example for send gift to be correct 2014-12-19 11:06:09 -06:00
Blade Barringer
d358236f42 Corrected example for show private message so it would result in a valid 
call
 2014-12-19 11:06:09 -06:00
Blade Barringer
a078636416 Fixed get members so it can be used on static/api page 2014-12-19 11:06:09 -06:00
Blade Barringer
18288ed016 Merge pull request #4390 from thehindenburg/seasonShop 
change link in gala page to gala wiki. Closes #4390 

Got @thehindenburg 's `uuid` from a previous PR: `5a07a8f6-100c-447f-9272-d5796326fc93`. Would someone log this contribution?
 2014-12-19 10:03:49 -06:00
thehindenburg
1675bb26b2 change link in gala page to gala wiki 2014-12-19 07:47:28 -08:00
Blade Barringer
9406b3cf70 Removed unnecessary console.log 2014-12-18 22:36:52 -06:00
Blade Barringer
be831d864a Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	src/controllers/groups.js
	views/options/social/chat-message.jade
 2014-12-18 21:58:06 -06:00
Blade Barringer
7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	views/options/social/chat-message.jade
 2014-12-18 21:55:50 -06:00
Blade Barringer
7db273c0be Merge pull request #3773 from benlind/buttonless_habits_full_space 
Fixes #3260: Buttonless habits full width
 2014-12-18 13:52:01 -06:00
Tyler Renelle
dc18569e78 fix(phantom): downgrade to node 0.10.22 due to CERT error, see 
https://github.com/Medium/phantomjs/issues/262 (cc @sabrecat)
 2014-12-17 22:16:41 -07:00
Sabe Jones
c7da56cc00 Merge pull request #4387 from SabreCat/seasonal 
fix(seasonal): Leslie link
 2014-12-17 18:38:16 -06:00
Sabe Jones
8ff0a4a4a4 fix(seasonal): Leslie link 2014-12-17 18:27:37 -06:00
Sabe Jones
eadedd5897 Merge pull request #4383 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:51:02 -06:00
Sabe Jones
dbe608bc3a fix(news): correct link and awkward image 2014-12-16 20:24:04 -06:00
Sabe Jones
58957118c0 chore(news): Bailey for Seasonal Shop 2014-12-16 20:18:55 -06:00
Tyler Renelle
d91d9e1eb3 refactor(facebook): use async.auto to collect multiple vars, cleaner 
than waterfall
 2014-12-16 16:30:51 -07:00
Tyler Renelle
2822ce233f fix(inn): see https://github.com/HabitRPG/habitrpg-shared/pull/231 2014-12-16 14:17:38 -07:00
Tyler Renelle
709fb2b706 Revert "refactor(iap): use env var for google IAP". orders are being 
left in "Chargeable - Delivered" for some reason.

This reverts commit 43961a5ab9.
 2014-12-16 13:07:01 -07:00
Tyler Renelle
43961a5ab9 refactor(iap): use env var for google IAP, intead of key file. See 
cb31043281
cc @negue
 2014-12-16 11:44:58 -07:00
Blade Barringer
d56eb1eeeb Added last guild link, corrected hall links 2014-12-14 20:10:42 -06:00
Blade Barringer
63c2248b38 Corrected guild links 2014-12-14 20:07:46 -06:00
Blade Barringer
9cdbca8c2b Reverted routing for groups back 2014-12-14 20:05:01 -06:00
Blade Barringer
d1b1a866ac Fixed when routing. Closes #4371 2014-12-14 19:01:52 -06:00
Sabe Jones
071ac02ec2 chore(git): Resolve merge conflict 2014-12-14 14:55:37 -06:00
Blade Barringer
a9fa8ed038 Merge pull request #4382 from SabreCat/timetravel 
Translate TT in menu
 2014-12-14 14:34:43 -06:00
Sabe Jones
9f46e14cd6 fix(seasonal): missing bang 2014-12-14 14:18:57 -06:00
Sabe Jones
867f50b514 fix(seasonal): Add menu item 2014-12-14 14:12:20 -06:00
Sabe Jones
8cd1ea48db fix(I18N): Remove more hardcoded text 2014-12-14 14:10:39 -06:00
Sabe Jones
6dcbd329a5 fix(seasonal): Typo in string resource 2014-12-14 14:05:43 -06:00