PowerlinxJetfire
04337f8e83
Fix filter buttons when windows resizes fixes (partially) #7772 ( #8258 )
...
* Reloads the quest panel solving issue #7697
* Revert "Reloads the quest panel solving issue #7697 "
This reverts commit 0d58fb0fd3#7772 .
https://github.com/HabitRPG/habitica/issues/7772
2016-12-10 22:08:26 -06:00
Keith Holliday
45297f8bf9
Merge pull request #8256 from a2lin/equipment_search
...
Adds a free-text filter (search) to the equipment page.
2016-12-10 16:28:11 -06:00
Keith Holliday
6f112c29f2
Merge pull request #8268 from Tallestthomas/develop
...
Show link leading to the Food Preferences Wiki page.
2016-12-10 14:41:17 -06:00
Keith Holliday
4d1edb363c
Merge pull request #8243 from 15313-platypi/develop
...
Quest Panel Reload (Issue #7697 )
2016-12-10 14:34:43 -06:00
Alexander Lin
4e303cc592
Clean up code
2016-12-10 02:15:30 -08:00
Travis
798a975185
fix: confirm no user objects reference a group before deleting it when the member count reaches 0 ( #8267 )
...
* fix: confirm no user objects reference a group before deleting it when the member count reaches 0
* Updating mongo queries to return promises and use the select statement.
2016-12-09 12:14:25 -08:00
Keith Holliday
eb2b46fc5d
Merge pull request #8269 from Hus274/8265
...
Adding a merchandise link to the marketplace selector
2016-12-09 11:57:36 -08:00
Keith Holliday
29854d3bdb
Merge pull request #8271 from Hus274/8266
...
Adding habitica mugs to the static merchandise page
2016-12-09 11:54:45 -08:00
Sabe Jones
f8751b002c
fix(subs): record creation for gifts
2016-12-09 19:52:17 +00:00
Travis
cd545e08d5
Implementing retries on failed user updates when finishing a quest ( #8251 )
...
* Implementing retries on failed user updates when finishing a quest. fixes #8035
* Refactoring mongo db retries to use the same as code path as original call and moving retries to count based over time based.
* Adding tests for retry logic and updating retries to happen recursively
* Moving callbacks to promises and other tweaks according to pr.
* Chaging mongoose promise to use .catch() functionality
* If all retries fail, the system will now throw an error instead of returning an error message.
2016-12-09 11:30:17 -08:00
Travis Husman
f69bb4f023
Adding habitica mugs to the static/merch page. fixes #8266
2016-12-09 10:35:00 -08:00
Tom Rasmussen
847081d2b2
Removed extra newlines
2016-12-09 12:01:05 -05:00
Travis Husman
8112d46ea4
Removing line break
2016-12-09 07:32:40 -08:00
Travis Husman
d13bded647
Updating the merchandise link to look like a list item.
2016-12-09 07:31:48 -08:00
Matteo Pagliazzi
1de4ab3612
client: namespaces for actions and getteters
2016-12-08 23:01:59 -08:00
Keith Holliday
f9f22f313f
Merge pull request #8261 from b9chris/develop
...
Fix a bug where 1005-768 the avatars and health bar get covered up.
2016-12-08 18:50:18 -08:00
Sabe Jones
f57eed85a8
3.59.0
2016-12-09 02:42:13 +00:00
Sabe Jones
10dd3318ab
fix(subs): append Gift for troubleshooting clarity
2016-12-09 02:35:51 +00:00
tallestthomas
cbef83c14a
Removed yarn.lock and added it to the .gitignore
2016-12-08 21:31:14 -05:00
Sabe Jones
59709a8590
chore(sprites): compile
...
and Bailey
2016-12-09 02:30:39 +00:00
Sabe Jones
f85f2a0c6d
Gift Subscriptions Promo ( #8270 )
...
* WIP(promo): buy-1-get-1 subs
* WIP(subscriptions): Slack integration
* feat(Slack): notify on sub buy
2016-12-08 18:08:56 -08:00
Travis Husman
605a5a1d5c
Adding a merchandise link to the marketplace selector. fixes #8265
2016-12-08 08:19:13 -08:00
tallestthomas
2d5d786c8e
Added pet food link to pets.json and jade template (issue #8023 )
2016-12-08 11:05:22 -05:00
Travis
5efe5b7b10
updating dragon mount images to all align. fixes #8253 ( #8259 )
2016-12-08 19:52:12 +10:00
Alexander Lin
3e92bb22fa
Refactor, add spec tests for equipment search
2016-12-08 00:08:18 -08:00
Sabe Jones
1249b9d410
feat(content): Dec 2016 pets
2016-12-07 20:57:25 +00:00
Keith Holliday
197aafe092
Updated the button stlyes to make them closer ( #8260 )
2016-12-07 11:47:24 -08:00
tallestthomas
79829ca128
Added link to pet food wiki ( #8023 )
2016-12-07 10:30:29 -05:00
Chris Moschini
adaa1d9a3e
Fix a bug where 1005-768 the avatars and health bar get covered up.
2016-12-07 08:55:36 -05:00
Matteo Pagliazzi
3e6691dbbb
client: test: getters
2016-12-06 18:53:03 -08:00
Matteo Pagliazzi
046761b9aa
client: reorganize filters and add tests
2016-12-06 18:27:49 -08:00
Matteo Pagliazzi
0b0466b960
client: reorganize actions
2016-12-06 17:11:40 -08:00
Matteo Pagliazzi
f8d4a2bd6b
client: update blue and yellow colors
2016-12-06 14:05:01 -08:00
Matteo Pagliazzi
1af59a3770
client: move files again to fix tests
2016-12-06 13:17:23 -08:00
Matteo Pagliazzi
bbcb13c91b
client: reorganize store files
2016-12-06 12:47:47 -08:00
Matteo Pagliazzi
d27dc46c50
chore(i18n): update locales
2016-12-05 16:13:45 -08:00
Alexander Lin
679459b83b
Adds free-text filter to equipment page
...
Closes #8241
2016-12-05 01:06:56 -08:00
Blade Barringer
5a619773d5
chore(i18n): update locales
2016-12-05 01:12:42 -06:00
Marcel Oyuela-Bonzani
ad76ab1315
Triple Equals sign
2016-12-04 13:40:46 -05:00
Marcel Oyuela-Bonzani
15eb8db925
Fix for issue noted.
2016-12-04 04:31:04 -05:00
MathWhiz
a0e92c5605
change stable text ( #8247 )
2016-12-04 17:37:23 +10:00
Chris
eac3e36c07
changed favicon - fixes #7720 ( #8252 )
...
* changed favicon
* Revert "changed favicon"
This reverts commit f28b9eb7382eb0a9cef25b30d3a78949e6a1483d.
* Changed Favicon
fixes #7720
2016-12-04 17:30:35 +10:00
Alys
0b8def555b
make default profile name more descriptive (ref dca958f2e2)
2016-12-04 13:43:49 +10:00
Alys
5f5fa5c2eb
rename Library of Shared Lists guild to Library of Tasks and Challenges
2016-12-04 12:49:43 +10:00
Sabe Jones
1eac8bbbbe
fix(migration): correct comments
2016-12-02 09:48:26 -06:00
Alys
49c7580cd4
3.58.1
2016-12-02 19:41:31 +10:00
Matteo Pagliazzi
dca958f2e2
make sure entire user is loaded when saved
2016-12-02 10:20:54 +01:00
Sabe Jones
eae5f0d605
fix(sprites): staff position
2016-12-02 00:08:44 +00:00
Sabe Jones
6ab091645c
3.58.0
2016-12-01 21:44:23 +00:00
Sabe Jones
d66041c280
chore(sprites): compile
2016-12-01 21:43:46 +00:00
