Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,997 Commits 64 Branches 1,256 Tags
09f827e9fef012576c9b3b6ca7fc0207b2105122
Commit Graph

2151 Commits

Author SHA1 Message Date
Negue 1051c0d50e maybe fixes the multilingual content result 2015-01-02 02:22:22 +01:00
Sabe Jones d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Tyler Renelle 8eebaea3dd woops.. :/ 2014-12-30 20:41:54 -07:00
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Matteo Pagliazzi 756fa83418 fix(date): typo 2014-12-29 22:26:12 +01:00
Matteo Pagliazzi cb13b5ac26 fix(date): add YYYY/MM/DD format 2014-12-29 22:16:58 +01:00
Matteo Pagliazzi 4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Matteo Pagliazzi 752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Matteo Pagliazzi 85f4a2884a add some more debugging for cron 2014-12-27 12:56:54 +01:00
Verabird 2de3e65043 Fix merge conflicts with test values 2014-12-26 16:00:45 -05:00
Verabird 8852ad61b2 Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed 2014-12-26 15:52:42 -05:00
Verabird 7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
Verabird 03f12a3718 Make it possible to choose between MM/dd and dd/MM date format 2014-12-24 22:18:50 -05:00
Matteo Pagliazzi 635ebf626b fix(flag-email): correctly format date 2014-12-23 18:54:56 +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
Tyler Renelle 492260d74a refactor(coupons): coupons cleanup using async.auto 2014-12-20 17:58:00 -07:00
Matteo Pagliazzi 8b3c6f94bf fix(loggly): send more infos about cron errors 2014-12-20 16:20:40 +01: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 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
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 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 
https://github.com/voltrue2/in-app-purchase/commit/cb31043281dc1221c61efb2dfbd13687761bceca
cc @negue
 2014-12-16 11:44:58 -07:00
Matteo Pagliazzi 61ae5c7420 fix(loggly): enable only manually 2014-12-13 15:01:38 +01:00
Matteo Pagliazzi 012e579cfe fix(loggly): typo 2014-12-13 14:57:05 +01:00
Matteo Pagliazzi dac2fc682d feat(loggly): change tag based on base_url, logs internal server errors 2014-12-13 14:48:14 +01:00
Tyler Renelle e98243e3d8 refactor(env): small cleanup 2014-12-12 21:07:38 +01:00
Matteo Pagliazzi 8935538b53 feat(loggly): enable json loggin and start loggin errors during cron 2014-12-12 20:05:37 +01:00
Tyler Renelle e1ea1a24c8 feat(challenges): optional checkbox on group create/edit: 
restrict challenge-creation to leader. Commented-out code for similar
setup for member invites, shouldn't be hard
 2014-12-12 11:37:00 -07:00
Matteo Pagliazzi b10d4606f5 fix(loggly): typo and remove testing 2014-12-12 13:09:21 +01:00
Matteo Pagliazzi af1ff6d740 feat(loggly): add test log, use only in production and add sample config 2014-12-12 12:17:48 +01:00
Matteo Pagliazzi 7356e0bafe feat(loggly): add loggly 2014-12-12 12:11:26 +01:00
Matteo Pagliazzi 948d5762cd fix(flag-message): small refactor 2014-12-12 11:39:22 +01:00
Blade Barringer 7d38eb3b59 Allow admin to reflag a message they've flagged and unflagged previously 2014-12-12 11:05:21 +01:00
Blade Barringer b1600198be Added method for letting an admin unhide a flagged message 2014-12-12 11:05:20 +01:00
Blade Barringer 6bb51c36e2 Admin flagging counts for more, automatically hides message 2014-12-12 11:05:20 +01:00
Blade Barringer 45b91b1251 Added flagCount variable 2014-12-12 11:05:19 +01:00
Blade Barringer 3771d38d48 Added fallback for is message does not contain flags key. Added error 
for if message was already flagged by user
 2014-12-12 11:05:19 +01:00
Matteo Pagliazzi e84880d3e8 feat(flag-message): add server methods 2014-12-12 11:05:19 +01:00