Blade Barringer
|
2a7dfe09a0
|
Move user can own quest categories constant to constants module.
|
2015-11-15 12:27:16 -06:00 |
|
Blade Barringer
|
40cee42e03
|
Remove unneeded return statement
|
2015-11-15 11:04:17 -06:00 |
|
Blade Barringer
|
6ec864ea4e
|
Remove unused src files in content directory
|
2015-11-15 11:03:30 -06:00 |
|
Blade Barringer
|
1a31c26330
|
Add item list to common constants module
|
2015-11-15 11:03:17 -06:00 |
|
Blade Barringer
|
411946e487
|
Modularize mystery sets
|
2015-11-15 10:08:40 -06:00 |
|
Blade Barringer
|
600f3e4554
|
Extract classes, events and gearTypes into constants file.
|
2015-11-15 09:47:06 -06:00 |
|
Blade Barringer
|
b13b2d0f62
|
Remove coffee content index file
|
2015-11-15 09:28:26 -06:00 |
|
Blade Barringer
|
e5d99ce271
|
Convert common files to es2015.
|
2015-11-15 08:16:55 -06:00 |
|
Matteo Pagliazzi
|
879ec97408
|
fix some requires
|
2015-11-13 17:41:18 +01:00 |
|
Matteo Pagliazzi
|
38749eae1b
|
fix i18n.js so that it supports lodash 3
|
2015-11-13 17:30:12 +01:00 |
|
Blade Barringer
|
6e8e1648d9
|
Merge branch 'develop' into api-v3
|
2015-11-13 07:38:24 -06:00 |
|
Blade Barringer
|
565aaff976
|
Merge pull request #6219 from HabitRPG/js_ify_common
Js ify common
|
2015-11-13 06:49:54 -06:00 |
|
Amin Arria
|
807726305f
|
Added timezone form
|
2015-11-12 19:27:25 -04:30 |
|
Blade Barringer
|
5ebead68ab
|
Remove coffee version of i18n
|
2015-11-11 21:24:21 -06:00 |
|
Blade Barringer
|
efd0e2333e
|
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
User can now check out of inn from tasks page
|
2015-11-11 20:49:35 -06:00 |
|
Blade Barringer
|
774a42d67e
|
Convert coffee files to JS
|
2015-11-11 20:32:00 -06:00 |
|
Blade Barringer
|
92a8c3d958
|
chore(i18n): update locales
|
2015-11-11 20:24:12 -06:00 |
|
Sabe Jones
|
f0a484bbe1
|
fix(strings): Variable population count
|
2015-11-11 21:10:24 -05:00 |
|
Blade Barringer
|
c5445dc426
|
Merge branch 'develop' into api-v3
|
2015-11-11 19:42:39 -06:00 |
|
Sabe Jones
|
83b61f9aa3
|
Merge branch 'develop' into sabrecat/pet-201511
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
|
2015-11-11 18:36:25 -05:00 |
|
Sabe Jones
|
b32ab5a587
|
chore(news): Pet quest Bailey
Also adds one missing sprite asset for the quest.
|
2015-11-11 18:31:22 -05:00 |
|
Sabe Jones
|
eba2ac386e
|
feat(pets): November quest
Fully functional commit. Missing only Bailey and the quest scroll sprite.
|
2015-11-11 17:23:16 -05:00 |
|
Sabe Jones
|
586edc03c6
|
WIP(pets): Incomplete cobra sprites
|
2015-11-11 16:23:38 -05:00 |
|
Sabe Jones
|
cc92b985a2
|
fix(sharing): Translatable share strings
|
2015-11-11 13:35:14 -05:00 |
|
Matteo Pagliazzi
|
4f21ee290b
|
finish upgrading to lodash 3
|
2015-11-11 11:08:16 +01:00 |
|
Matteo Pagliazzi
|
3795b1d151
|
wip: starts upgrading lodash to v3
|
2015-11-11 10:32:49 +01:00 |
|
Sabe Jones
|
eed4207c6d
|
Merge branch 'develop' into sabrecat/more-modals
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
|
2015-11-09 16:24:17 -05:00 |
|
Gautham Chandra
|
b9b2536478
|
User can now check out of inn from tasks page
Fixes #5651
|
2015-11-07 18:32:19 -05:00 |
|
Matteo Pagliazzi
|
0834f8eeea
|
disable api v2 and related tests to enable changes to models
|
2015-11-07 15:51:26 +01:00 |
|
Sabe Jones
|
164309e050
|
feat(sharing): Streak Achievement
|
2015-11-06 16:54:23 -05:00 |
|
Sabe Jones
|
56fbc33d1c
|
Merge branch 'develop' into Move-Overview-To-Website
Conflicts:
website/src/routes/pages.js
|
2015-11-05 14:31:00 -05:00 |
|
Sabe Jones
|
18c2279be4
|
fix(overview): Wording and layout tweaks
|
2015-11-05 14:18:51 -05:00 |
|
Sabe Jones
|
bb55a74f48
|
chore(news): iOS update Bailey
Also fixes the color of the iOS app icon and codes it more intelligently.
|
2015-11-05 11:48:51 -05:00 |
|
Blade Barringer
|
3726f48ff2
|
chore(i18n): update locales
|
2015-11-04 21:57:16 -06:00 |
|
Sabe Jones
|
3a1862ecef
|
fix(static): Non-widgety App Store links
|
2015-11-04 22:42:10 -05:00 |
|
Sabe Jones
|
de5d2df94c
|
fix(i18n): Add missing string
|
2015-11-04 16:04:51 -05:00 |
|
Sabe Jones
|
8c4ecb8f6c
|
feat(static): Apps page
|
2015-11-04 13:35:31 -05:00 |
|
Amin Arria
|
8611c00201
|
Added links
|
2015-11-03 22:38:55 -04:30 |
|
Amin Arria
|
f79110d6d2
|
Changed to be more like the FAQ
|
2015-11-03 22:03:24 -04:30 |
|
Sabe Jones
|
02abee9f4e
|
fix(sharing): Landing page tweaks
|
2015-11-03 16:16:17 -05:00 |
|
Sabe Jones
|
0260ea3fcd
|
WIP(sharing): Draft functional landing page
|
2015-11-03 15:04:31 -05:00 |
|
Sabe Jones
|
502e7f0af2
|
Merge branch 'develop' into sabrecat/more-modals
|
2015-11-03 14:29:23 -05:00 |
|
Sabe Jones
|
3691a59ddb
|
fix(front-page): Update registered user count
|
2015-11-03 12:30:54 -06:00 |
|
Amin Arria
|
167af1afd4
|
New static page: overview
|
2015-11-03 13:35:14 -04:30 |
|
Sabe Jones
|
1fa15ba24a
|
Merge pull request #6167 from HabitRPG/sabrecat/content-201511
November backgrounds and Armoire
|
2015-11-03 11:58:51 -06:00 |
|
Blade Barringer
|
2713b0f26f
|
chore(i18n): update locales
|
2015-11-02 22:08:28 -06:00 |
|
Sabe Jones
|
6b3fcd3d11
|
fix(content): Correct stats for Royal Robes
...in newtype content file
|
2015-11-02 17:34:59 -05:00 |
|
Sabe Jones
|
510080325d
|
fix(content): Correct missing Armoire items
...in newstyle content files
|
2015-11-02 17:33:03 -05:00 |
|
Sabe Jones
|
e74c83be2e
|
feat(content): November backgrounds and Armoire
|
2015-11-02 17:28:20 -05:00 |
|
Sabe Jones
|
2cb4e80019
|
chore(event): End Fall Festival
|
2015-11-02 12:55:48 -05:00 |
|