Victor Piousbox
54a94db2de
working on amazon payments
2016-04-21 03:52:29 +00:00
Victor Piousbox
3cba6d934b
resolving conflicts
2016-04-20 22:04:31 +00:00
Keith Holliday
9e3d8ba4ac
Separated out buy functions into buyGear, buyArmoire, and buyPotion ( #7065 )
2016-04-19 16:50:04 +02:00
Matteo Pagliazzi
f44dbbbd71
Merge branch 'develop' into api-v3
2016-04-19 12:16:22 +02:00
Matteo Pagliazzi
2dd633a471
better organize common/index
2016-04-19 12:11:10 +02:00
Matteo Pagliazzi
7aa6587f2f
Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2
2016-04-19 12:07:18 +02:00
Alys
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10:00
MathWhiz
ed49a377e1
add community guidelines info to profile editing ( #7086 )
...
* add community guidelines info to profile editing
* Update profile.jade
2016-04-19 10:15:21 +10:00
MathWhiz
f1788080da
Add list of Featured third-party Apps ( #7046 )
...
* add list of featured third-party apps
* Add comma
* add descriptions
* add description to other
* add table
* add description to other
Conflicts:
common/locales/en/settings.json
website/views/options/settings.jade
* Update settings.json
* Sort extensions by name
2016-04-19 08:21:07 +10:00
Sabe Jones
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00:00
Victor Pudeyev
715bb5e047
shared-code-statsComputed ( #7067 )
...
* shared-code-statsComputed
* \$w is in common/script/index.js
2016-04-16 19:24:13 +02:00
Victor Piousbox
ab156c0e4d
resolving conflicts
2016-04-15 16:55:37 +00:00
Victor Piousbox
d27bbbe994
some locales work
2016-04-15 16:46:50 +00:00
Victor Piousbox
261a5a66b1
working on promisifying amazonPayments
2016-04-15 16:46:50 +00:00
Blade Barringer
887aa478ec
chore: merge in develop
2016-04-15 10:11:54 -05:00
Blade Barringer
10936d9a4d
chore: Switch to custom eslint-config
2016-04-15 09:03:59 -05:00
Blade Barringer
33c0cdd569
chore(lint): lint files in preparation for eslint v2
2016-04-15 08:37:05 -05:00
Blade Barringer
1a64886f7d
Merge branch 'develop' into api-v3
2016-04-15 08:04:46 -05:00
Victor Piousbox
74fc45524b
working on promisifying amazonPayments
2016-04-14 22:49:24 +00:00
Matteo Pagliazzi
11b5c1b405
v3: several fixes to class system, move /logout outside of api
2016-04-14 20:05:30 +02:00
Sabe Jones
7bb6f968b4
feat(content): Pet Quest 2016-04 ( #7071 )
...
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
Matteo Pagliazzi
6458796a36
v3: first review of common code and task models
2016-04-12 19:30:39 +02:00
Matteo Pagliazzi
004b032084
adapt reset to v2 and remove deleted files from gulpfile
2016-04-12 18:50:02 +02:00
Keith Holliday
3970064fe5
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 11:19:36 -05:00
Matteo Pagliazzi
fa32dabc92
Merge pull request #7064 from piousbox/shared-code-crit
...
shared-code-crit
2016-04-12 09:58:46 +02:00
Victor Pudeyev
2f1329254e
shared-code-tags-gold-silver ( #7056 )
2016-04-12 09:57:57 +02:00
Victor Piousbox
2d69285080
shared-code-crit
2016-04-11 20:21:33 +00:00
Matteo Pagliazzi
463ba81468
fix(build) only require/import the main common file
2016-04-11 19:46:48 +02:00
Blade Barringer
2f715c4530
chore: Compile skill icon sprites
2016-04-11 07:59:53 -05:00
mathwhiz
5b110159a1
Add spell images
2016-04-11 07:59:39 -05:00
Matteo Pagliazzi
c6879aa5df
fix(v3): cleanup of shared code
2016-04-10 18:42:59 +02:00
Keith Holliday
42ef779b46
Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests
2016-04-10 09:47:14 -05:00
Matteo Pagliazzi
7a24bceac9
Merge pull request #7051 from piousbox/shared-code-percent
...
shared-code-percent
2016-04-10 12:29:43 +02:00
Victor Piousbox
3c784e869a
shared-code-percent
2016-04-09 21:13:16 +00:00
Victor Piousbox
1f4a0680ea
shared-code-private-messages
2016-04-09 16:56:03 +00:00
Matteo Pagliazzi
6b2d1a1416
v3 adapt v2: adapt common ops
2016-04-09 16:45:43 +02:00
Blade Barringer
80c115940e
fix: Correct southpole background
...
closes #7039
closes #7041
2016-04-09 09:31:18 -05:00
Blade Barringer
8ba150074a
chore(i18n): update locales
2016-04-09 09:27:04 -05:00
Matteo Pagliazzi
910ea836ba
Merge branch 'api-v3' into api-v3-adapt-v2
2016-04-09 15:31:09 +02:00
Matteo Pagliazzi
81fa689a11
Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll
...
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-09 15:14:04 +02:00
Blade Barringer
60f99a29ed
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-04-08 21:31:53 -05:00
Blade Barringer
8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
Keith Holliday
1685b7285f
Ported reroll. Added unit tests. Added reroll route. Added integration tests
2016-04-08 15:56:11 -05:00
Matteo Pagliazzi
70fd869934
Merge branch 'api-v3' into api-v3-adapt-v2
2016-04-08 12:03:50 +02:00
Matteo Pagliazzi
276cbc58bb
v3: fix cron middleware, remove unused code from shared
2016-04-08 11:56:51 +02:00
Victor Piousbox
9704c47293
Merge branch 'api-v3' into shared-code-webhooks
2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8
resolving conflicts
2016-04-07 21:23:16 +00:00
Keith Holliday
fec9ce3dbe
Ported rebirth. Add unit tests. Added rebirth route. Added integration tests
2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
2d3fbe9f13
v3 adapt v2: lint client only shared ops and enable members integration tests
2016-04-07 11:54:36 +02:00
Matteo Pagliazzi
81d665513c
Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive
2016-04-06 23:24:14 +02:00
