Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,110 Commits 64 Branches 1,256 Tags
f5e9568cef15eefe2c3683a5456b59cd8df19435
Commit Graph

2175 Commits

Author SHA1 Message Date
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
Blade Barringer 6749109423 Added note for paglias 2014-12-12 11:05:19 +01:00
Blade Barringer e2c0a41f88 Added a flags key to message object 2014-12-12 11:05:17 +01:00
Tyler Renelle ae762837e2 refactor(challenges): cleanup challenge-creation. can use async.auto to 
keep variables around, no need to set parent closure vars
 2014-12-11 21:35:41 -07:00
Blade Barringer a021ab2896 Allow admin to reflag a message they've flagged and unflagged previously 2014-12-11 21:43:01 -06:00
Blade Barringer 38cd0e8de1 Added method for letting an admin unhide a flagged message 2014-12-11 17:29:01 -06:00
Tyler Renelle 14a38033f9 Merge branch 'negue-iap_verification' into develop 2014-12-11 14:51:31 -07:00
Blade Barringer 8ac3e312ed Admin flagging counts for more, automatically hides message 2014-12-11 13:34:43 -06:00
Blade Barringer 6fb531234d Added flagCount variable 2014-12-11 13:00:25 -06:00
Blade Barringer d8515fc8de Added fallback for is message does not contain flags key. Added error 
for if message was already flagged by user
 2014-12-11 12:16:57 -06:00
Blade Barringer 0cf7bba822 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-11 10:21:19 -06:00
Matteo Pagliazzi 29382d18f7 fix(reset-password): use array for variables 2014-12-11 17:05:31 +01:00
Matteo Pagliazzi 1761752240 use email server for reset-password 2014-12-11 16:51:39 +01:00
Blade Barringer cea2879539 Merge branch 'mountmaster' of https://github.com/taldin/habitrpg into taldin-mountmaster 2014-12-11 08:15:18 -06:00
Tyler Renelle f9cc2adda5 fix(iap): iap verification fixes 2014-12-10 14:25:00 -07:00
Negue bb37c163cf fix spacing 2014-12-10 14:21:03 -07:00
Negue d92832bfb2 Hopefully a working IOS Verification 2014-12-10 14:21:03 -07:00
Negue ecf20f423c IAP Verification for Android 2014-12-10 14:21:03 -07:00
Negue b59a70f128 more dummy controller, just for iap data 2014-12-10 14:21:02 -07:00
Negue cc4812712a dummy iap verify routes 2014-12-10 14:21:02 -07:00
Matteo Pagliazzi ae6e0255c6 feat(flag-message): add server methods 2014-12-07 14:35:09 +01:00
Blade Barringer e49e8f5765 Added note for paglias 2014-12-07 13:50:47 +01:00
Blade Barringer a2cf14324c Added a flags key to message object 2014-12-07 13:50:46 +01:00
Tyler Renelle cb9083d9ba fix(webhooks): don't send webhooks if not valid url (also if not 
enabled), fixes #4357
 2014-12-06 10:25:41 -07:00
Tyler Renelle f3fc6644b8 refactor(paypal): some plan debugging cleanup 2014-12-04 16:16:53 -07:00
Tyler Renelle c14af0e855 chore(multi-core): allow "CORES" nconf var, so can just use one core (or 
however many) cc @paglias
 2014-12-03 19:12:42 -07:00
Tyler Renelle 1a84d01933 fix(gifts): allow gifting 0<gift<1 (cc @Alys @crookedneighbor) 2014-12-03 19:00:49 -07:00
Tyler Renelle d2e230db1f fix(plans): various bug fixes 2014-12-03 18:34:26 -07:00
Tyler Renelle 30c1ac4b1e fix(plans): lots of bug fixes & cleanup 2014-12-03 16:01:57 -07:00