 Sabe Jones
|
e82f73c712
|
Merge branch 'develop' into sabrecat/modal-warnings
|
2015-09-02 15:17:33 -04:00 |
|
|
Matteo Pagliazzi
|
7acec14e6b
|
do not allow leaders to kick themselves from group
|
2015-09-01 16:33:24 +02:00 |
|
|
Kevin Gisi
|
69782b5bd1
|
Fixed the wrong redirect
|
2015-08-31 17:59:19 -04:00 |
|
|
Kevin Gisi
|
177c48820c
|
Domain redirects -> 301
|
2015-08-31 17:34:18 -04:00 |
|
|
Alys
|
fd446fc5e5
|
convert habitica.com to BASE_URL
|
2015-08-23 12:23:35 +10:00 |
|
|
Blade Barringer
|
8fc69102aa
|
Merge branch 'develop' into 3onyc-fix-hash-leak
|
2015-08-22 17:45:47 -05:00 |
|
|
Sabe Jones
|
12b0361d45
|
WIP(warning-modal): Low health warning
|
2015-08-18 16:05:48 -04:00 |
|
|
3onyc
|
1c13c48bee
|
Fix removing user salt+hash from API response
|
2015-08-16 17:04:24 +02:00 |
|
|
Alys
|
71a9f7caf4
|
make challenge permission error messages translatable
|
2015-08-16 17:30:51 +10:00 |
|
|
Alys
|
53f861f3c0
|
allow challenges to be edited, deleted, closed by admin users (moderators and staff) through the web UI (not by API calls)
|
2015-08-16 16:51:53 +10:00 |
|
|
Blade Barringer
|
426acf44c8
|
Wrap task analytics in if statement
|
2015-08-14 23:43:47 -05:00 |
|
|
Matteo Pagliazzi
|
b31966b1ee
|
use assign in place of merge, make sure references to tavern and mods are not lost
|
2015-08-14 22:02:19 +02:00 |
|
|
Matteo Pagliazzi
|
2e1b046701
|
add TODO comments, send mods to client as they are used there
|
2015-08-14 21:05:04 +02:00 |
|
|
Matteo Pagliazzi
|
dc4c6fa6e7
|
add TODO commit about logging errors catched when party invite code is invalid
|
2015-08-14 15:21:17 +02:00 |
|
|
Matteo Pagliazzi
|
289d288f38
|
fix typo
|
2015-08-14 15:02:46 +02:00 |
|
|
Matteo Pagliazzi
|
d3c78bb890
|
revert dataexport controller changes
|
2015-08-14 15:02:16 +02:00 |
|
|
Matteo Pagliazzi
|
e1620bad2b
|
stringify into window.env only what we really need, save a lot of KBs
|
2015-08-14 14:53:17 +02:00 |
|
|
Matteo Pagliazzi
|
34dd4494ec
|
in locals middleware require tavern and mods only once
|
2015-08-14 13:10:53 +02:00 |
|
|
Matteo Pagliazzi
|
ca457df36a
|
fix typo catatories -> categories
|
2015-08-14 12:23:10 +02:00 |
|
|
Matteo Pagliazzi
|
491652d712
|
fix several typypos and a missing dep
|
2015-08-14 12:00:09 +02:00 |
|
|
Matteo Pagliazzi
|
47f6f2febe
|
refactor middlewares in their own folder, move buildFiles to libs/buildFiles
|
2015-08-14 11:50:09 +02:00 |
|
|
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
|
b2100c2c54
|
WIP(greeting-cards): Abandon spell refactor
|
2015-08-13 14:31:34 -05:00 |
|
|
Matteo Pagliazzi
|
4993d67f2f
|
export avatars to separate folder in s3 bucket
|
2015-08-13 14:12:32 +02: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 |
|
|
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
|
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 |
|
|
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
|
68f5a162fd
|
Merge branch 'Lokeh_webhooks-more-details' into develop
|
2015-08-02 09:28:49 -05: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 |
|
|
Alys
|
07bdc89738
|
habitrpg.wikia.com -> habitica.wikia.com. Also a trello URL change.
|
2015-07-31 18:53:32 +10:00 |
|
|
Alys
|
798b2890d0
|
HabitRPG -> Habitica text changes
|
2015-07-31 18:05:10 +10:00 |
|
|
Sabe Jones
|
65f21619ae
|
feat(naming-day): Bailey etc.
|
2015-07-30 19:46:04 -05:00 |
|
|
Kevin Gisi
|
efcf0a57d4
|
Change host check to proxy check
|
2015-07-30 19:27:00 -04:00 |
|
|
Kevin Gisi
|
339dec3ac0
|
Emergency fix
|
2015-07-30 19:10:14 -04:00 |
|
|
Kevin Gisi
|
cfdcadb2bc
|
Added redirects to habitica for non-API urls
|
2015-07-30 13:20:24 -04:00 |
|
|
Blade Barringer
|
1001cc8889
|
Refactor webhook section to be cleaner
Added note to put webhook into own module
|
2015-07-30 08:19:22 -05:00 |
|
|
Will
|
7245ffa94a
|
refactor user.toJSON()
|
2015-07-30 00:21:41 -07:00 |
|
|
Will
|
4e5d630a87
|
remove profile object from webhooks
|
2015-07-29 21:43:13 -07:00 |
|
|
Will
|
b3ae6eef17
|
maxHEalth uses new shared.maxHealth
|
2015-07-29 21:43:13 -07:00 |
|
|
Will
|
f3829c8ce4
|
code cleanup and commenting
|
2015-07-29 21:43:13 -07:00 |
|
|
Will
|
a27f8d6705
|
add profile info and computed stats
|
2015-07-29 21:43:12 -07:00 |
|
|
Sabe Jones
|
788fba08c2
|
Merge branch 'develop' into sabrecat/habitica-day
|
2015-07-29 14:00:58 -05:00 |
|