krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

2671 Commits

Author SHA1 Message Date
Alys
87bd55cca1 Merge pull request #6780 from colwem/issue6774 
Improve styling of markdown blockquotes - fixes #6774
 2016-03-06 19:59:30 +10:00
Alys
e59f614568 Merge pull request #6786 from murraybd/use-level-style-in-modals 
Use level style in modals
 2016-03-06 18:52:21 +10:00
Alys
9cac8dd95e Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740 
Fixed partially hidden button in chat box
 2016-03-06 18:18:02 +10:00
Alys
612d455fe1 Merge pull request #6782 from andrewcham/issue6779 
update community guidelines - fixes #6779
 2016-03-06 17:42:08 +10:00
Christopher Giroir
edce3d01a9 Resizing image to remove aliasing 2016-03-05 11:13:20 -08:00
Christopher Giroir
82cfd8afc8 Moving to new purple logo.png 2016-03-05 11:06:01 -08:00
Matteo Pagliazzi
b5e1cd33e2 Merge branch 'develop' into api-v3 2016-03-05 19:29:02 +01:00
Matteo Pagliazzi
6830a4464a Merge branch 'api-v3-email-3' of https://github.com/piousbox/habitrpg into piousbox-api-v3-email-3 2016-03-05 19:24:11 +01:00
Matteo Pagliazzi
863ca9954e errors working with babel 6, export v3 shared modules in main common module 2016-03-05 18:58:40 +01:00
Blade Barringer
b553a6c134 fix: Remove active handles (incompatible with node v4) 2016-03-05 08:11:21 -06:00
Victor Piousbox
7dfdbb8b05 /user/update-email endpoint 2016-03-04 21:27:16 +00:00
Blade Barringer
b97511db31 fix: Use module.exports instead of export default 2016-03-04 13:29:51 -06:00
Blade Barringer
4cd0428f0a Merge branch 'develop' into api-v3 2016-03-04 12:16:22 -06:00
Keith Holliday
bcc4d568df Moved unlinkChallengeTasks to challenge model and added tests 2016-03-04 11:45:21 -06:00
Lucas Torroba
4f4ea8416c Closed issue #6758 
After some discussion on the thread, this is probably the neatest
solution to issue #6758. I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
 2016-03-04 13:16:37 -03: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
Blade Barringer
99242ac60f fix: remove dependency that was causing build to fail 2016-03-03 22:24:55 -06:00
Matteo Pagliazzi
d85c64705e Merge branch 'develop' into api-v3 2016-03-03 21:15:16 +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
Matteo Pagliazzi
96c582e062 fix tests, move most errors to shared code 2016-03-03 19:16:03 +01:00
Blade Barringer
0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Matteo Pagliazzi
80f791c86b add tests, move CustomError to common, fix casting 2016-03-03 00:16:28 +01: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
Matteo Pagliazzi
05b6e25c28 port spells to api-v3 2016-03-02 13:05:17 +01:00
Matteo Pagliazzi
8920b05f9e Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2016-03-02 12:59:51 +01: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
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Keith Holliday
20621b940e Added better tests to ensure tasks are synced 2016-03-01 14:38:09 -06:00
Matteo Pagliazzi
9114d74357 Merge branch 'develop' into api-v3 2016-03-01 09:44:57 +01:00
Matteo Pagliazzi
531d3969f4 fix cluster.fork 2016-03-01 09:15:13 +01:00
Nick Bunn
251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Matteo Pagliazzi
e5224a7b2a add support for user._tmp, disable user.filters since it is not used 2016-02-29 23:20:13 +01:00
Matteo Pagliazzi
0c700cc36d Merge branch 'develop' into api-v3 2016-02-29 16:39:31 +01:00
Matteo Pagliazzi
3512233966 add meta/models controller to get public models paths 2016-02-29 01:04:19 +01:00
Keith Holliday
6e732a67c9 Added initial challenge model tests 2016-02-28 14:44:18 -06:00
Christopher Giroir
7e845962f4 Fixing comments 2016-02-28 11:58:39 -08:00
Brian Murray
8d7c46d79f Merge branch 'develop' into use-level-style-in-modals 2016-02-28 10:13:10 -08:00
Alys
6cd861dcdc Merge pull request #6742 from murraybd/develop 
Display attribute info in Character Build
 2016-02-28 19:39:20 +10:00
Andrew Cham
518532efdc #6779 Update community-guidelines.jade with current date 2016-02-28 01:20:31 -08:00
Alys
91fc6186e5 Merge pull request #6736 from delftswa2016/fix-perks-buygems 
Fixed perk amounts when buying subscription through gem
 2016-02-28 18:32:39 +10:00
Matteo Pagliazzi
5e68589ac8 check for membership when leaving public guild, fix memberCount update when leaving group, add missing files 2016-02-28 01:11:45 +01:00
Matteo Pagliazzi
733da70b48 getFirebaseToken route 2016-02-27 18:31:28 +01:00
Matteo Pagliazzi
3284bb2384 add logout 2016-02-27 18:18:56 +01:00
Matteo Pagliazzi
84810ae758 Merge pull request #6778 from HabitRPG/api-v3-session-invite 
[API v3] Refactor session invite (no more session!)
 2016-02-27 18:07:39 +01:00