krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,429 Commits 63 Branches 1,225 Tags
078ea4768a747b13f8f77aabbb88cdda40b4a7f0
Commit Graph

1136 Commits

Author SHA1 Message Date
Sabe Jones
ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
Sabe Jones
00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones
f57e3e69a1 WIP(greeting-cards): Working send + modals 2015-08-13 15:43:51 -05:00
Sabe Jones
b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Matteo Pagliazzi
f750c53ccc remove quote from filename 2015-08-13 17:52:38 +02:00
Matteo Pagliazzi
61cd8f58af start using cloudfront for frontpage assets 2015-08-13 17:16:24 +02:00
Matteo Pagliazzi
4993d67f2f export avatars to separate folder in s3 bucket 2015-08-13 14:12:32 +02:00
Blade Barringer
bf4d690a7c Merge pull request #5775 from HabitRPG/item_store_fix 
Split out potion and armoire out of the itemStore object
 2015-08-12 22:35:54 -05:00
Blade Barringer
7c6641482a Merge pull request #5776 from crookedneighbor/qhUQxV7Q_add_number_of_user_tasks_to_analytics 
Analytics improvements
 2015-08-12 22:31:44 -05:00
Blade Barringer
ceec310e5f Use human readable name 2015-08-12 22:16:30 -05:00
Blade Barringer
9a27b2e8cb Add task numbers to analytics 2015-08-12 21:47:04 -05:00
Blade Barringer
bcf7c9712e Split out potion and armoire out of the itemStore object 
Fixes #5743
 2015-08-12 18:53:49 -05:00
Sabe Jones
3c8424a83e Merge branch 'crookedneighbor/refactor_cards' into sabrecat/greeting-cards 2015-08-12 11:53:28 -05:00
Blade Barringer
c7edbfb9b2 Remove empty object in close 2015-08-12 08:42:01 -05:00
Blade Barringer
203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys
f4c89f9379 initialise buyThis message variable at point of declaration - fixes https://github.com/HabitRPG/habitrpg/issues/5770 2015-08-12 21:26:51 +10:00
Alys
dbbd03e6cb remove one-time binding from "You're resting in the inn" banner above Dailies column - fixes https://github.com/HabitRPG/habitrpg/issues/5693 2015-08-12 16:53:51 +10:00
Alys
879ba83002 change habitrpg.com to habitica.com where appropriate - email addresses in static Contact page and various in-game URLs 2015-08-12 16:12:59 +10:00
Blade Barringer
869b27d786 Correct markdown 2015-08-11 20:01:45 -05:00
Blade Barringer
0dc10b5f8e Convert valentines to markdown 2015-08-11 18:47:12 -05:00
Blade Barringer
a29dd4cc16 Correct styling for focusable buttons 
Fixes #5767
 2015-08-11 18:34:46 -05:00
Alys
3e9cfdc437 Improve instructions in password reset email. Replace BASE_URL with habitica.com TEMPORARILY (Alys has a To-Do to revert this). 2015-08-09 20:07:27 +10:00
Blade Barringer
787cb6cabb Final adjustments to PR 
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
 2015-08-05 18:27:24 -05:00
Simon Gabler
2343e4720c Add tooltips for day buttons to show "due" or "not due" 2015-08-05 22:25:03 +02:00
Simon Gabler
1997338751 Show popover for daily and weekly dailies 2015-08-05 22:23:41 +02:00
Simon Gabler
99bdf4c541 Add hint for "Repeat every" option title. Fixes #5603 2015-08-05 17:02:02 +02:00
Blade Barringer
3e5a3a00cb Merge pull request #5741 from HabitRPG/use_base_url_for_redirect 
Adjust Force Habitica Code
 2015-08-04 19:22:50 -05:00
Blade Barringer
82d2d6507f Add missing space 2015-08-04 18:55:55 -05:00
Blade Barringer
e6c1b69cb0 Swap out isHabitrpg for ignoreRedirect 2015-08-04 18:55:26 -05:00
Blade Barringer
93a2d3d660 Use constants for is_prod and base_url 2015-08-04 18:30:27 -05:00
Blade Barringer
675808e54e Catch habitrpg.com specifically 2015-08-04 18:16:36 -05:00
Sabe Jones
68cc0fd56a fix(avatar): Delist Splashy Skins 
Also removes a style that was causing hair colors to be the only 40x40 buttons on a page full of 60x60 buttons.
 2015-08-04 15:17:38 -05:00
Sabe Jones
bc11e03bef fix(sharing): Localize Tweet text 2015-08-04 14:55:15 -05:00
Sabe Jones
60e65a8bea feat(armoire): August additions 
Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.
 2015-08-04 12:45:01 -05:00
Blade Barringer
5731f00736 Add baseUrl variable 2015-08-04 12:09:54 -05:00
Blade Barringer
0c92c4a048 Switch redirect to baseUrl 2015-08-04 08:42:53 -05:00
Blade Barringer
c402ec61b2 Remove checkmark from focused task, increase opacity of background 
Fixes #5682
 2015-08-04 08:16:31 -05:00
Max Harmony
64a3009e7a HabitRPG -> Habitica 2015-08-03 19:24:24 +00:00
Matteo Pagliazzi
4f333c4f8a fix(amazon-payments): swap colors between paypal and amazon 2015-08-03 18:41:34 +02:00
Blade Barringer
5ed5ca8126 Merge branch 'adjustments-to-challenge-participant-pr' into develop 2015-08-03 08:47:30 -05:00
Blade Barringer
01237df213 Add buttons to challenge participant modal 2015-08-03 08:40:33 -05:00
Blade Barringer
1b19cc1c4d Merge branch 'teh-maxh-patch-1' into develop 2015-08-03 07:54:15 -05:00
Sabe Jones
af4bb5e23f chore(news): End Summer Splash 2015-08-02 14:09:26 -05:00
Blade Barringer
68f5a162fd Merge branch 'Lokeh_webhooks-more-details' into develop 2015-08-02 09:28:49 -05:00
Max Harmony
7c4331080c add'l link changes 2015-08-02 01:03:34 +00:00
Blade Barringer
a960f5ef72 Revert back to toJSON() 2015-08-01 16:08:54 -05:00
Blade Barringer
c7e751d662 Adjsut formatting 2015-08-01 14:04:33 -05:00
Blade Barringer
b567a0d9a6 Refactor webhook and add tests 2015-08-01 14:03:45 -05:00
Simon Gabler
c9e7b4d73d Make challenge participant's name clickable in progress modal. Fixes #5558 2015-08-01 16:12:58 +02:00
Simon Gabler
cba9752111 Add mod Cantras to community guidelines page. Fixes #5676 2015-07-31 23:05:17 +02:00