sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9330 commits 3 branches 0 tags 1.6 GiB
Commit graph

509 commits

Author SHA1 Message Date
Blade Barringer
690321baca Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2 
Made text on static/contact translatable
 2015-05-24 22:17:10 -05:00
Blade Barringer
a298393e04 Merge pull request #5275 from GitHubSphinx/Sphinx-entry1 
Swap faq and overview in the top menu
 2015-05-24 22:15:24 -05:00
Blade Barringer
30ef563534 Merge branch 'negue-anonymizedUser' into develop 2015-05-24 22:04:18 -05:00
Blade Barringer
abbfdaeda5 Adjust NotGonnaGitUs's PR 
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
 2015-05-24 21:22:40 -05:00
GihHubSphinx
fac855898f Swap faq and overview in the top menu 
Addressing request by lemoness
https://github.com/HabitRPG/habitrpg/issues/5261
 2015-05-25 02:25:51 +05:00
Blade Barringer
120872ffd2 Merge in develop 2015-05-24 15:46:57 -05:00
Blade Barringer
165dd3a4a6 Fixes for minor visual inconsistencies with popovers and toolbars 
Closes #5274, closes #5272, closes #5271
 2015-05-24 15:34:12 -05:00
GihHubSphinx
dc51c6e478 Made text on static/contact translatable 
Addressing _#12 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

Before/after screenshot: http://i.snag.gy/b00FV.jpg

"Report a Bug" string is used from generic.json as already translated
before
 2015-05-24 13:31:29 +05:00
Blade Barringer
a07f8572b0 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-22 23:35:19 -05:00
Blade Barringer
ed56f51611 Merge branch 'hairlessbear-avatar_indicate_equipped' into develop 2015-05-22 23:35:01 -05:00
Blade Barringer
9ec14c1ac6 Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1 
Made two lines translatable
 2015-05-22 23:20:13 -05:00
Blade Barringer
1e757cc087 Adjust disabled button look 2015-05-22 23:12:09 -05:00
GihHubSphinx
fe2e0618b8 Make Invite-friends-to-group dialog translatable 
UI strings of the dialog of invitation to the group made translatable
 2015-05-23 02:44:32 +05:00
Jaiden Mispy
eab2dbfa86 Disable chat textarea and buttons while sending 2015-05-22 12:14:10 -07:00
negue
4e8918818a fix(pushNotifications): user null check 
#5252
 2015-05-21 23:24:10 +02:00
GihHubSphinx
2440b312a2 Made two lines translatable 
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
 2015-05-21 17:12:16 +05:00
Alys
ee4df15b71 Merge pull request #5247 from hairlessbear/tavern_guidline_button_fix 
Fixed sync button display before community guildlines are accepted
 2015-05-21 20:57:00 +10:00
SabreCat
13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
hairlessbear
4ee8a6867d Fixed sync button before community guildlines are accepted 2015-05-20 10:20:32 -04:00
Blade Barringer
bd76b762e6 Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications 
Negue wip push notifications
 2015-05-18 11:14:53 -05:00
hairlessbear
b912dcaf6a Added selectableInventory logic to animal ears 2015-05-17 22:01:54 -04:00
hairlessbear
9c205e600a Merge branch 'avatar_indicate_equipped' of https://github.com/hairlessbear/habitrpg into develop 2015-05-17 17:19:17 -04:00
hairlessbear
456dd37f41 Added selectableInventory to two buttons I missed the first time 2015-05-17 16:51:59 -04:00
hairlessbear
c47c555a21 Added indication of currently equipped preferences to avatar customization page 2015-05-17 16:30:22 -04:00
Blade Barringer
54f8f6d387 Merge pull request #5227 from hairlessbear/move_battle_gear_popover 
Moved battle gear popover from top to right
 2015-05-17 10:19:45 -05:00
hairlessbear
86ee687b8b Moved battle gear popover to right 2015-05-17 09:31:28 -04:00
Kelsey Ando
69cd5f8490 Merge branch 'develop' into fixes-issue-5183 2015-05-17 00:44:15 -04:00
Blade Barringer
da20a493c6 Merge branch 'hairlessbear-level_100_attribute_message' into develop 2015-05-16 22:50:57 -05:00
Blade Barringer
9017ba7d7e Hide attribute points counter if you're over 100 and have 0 left 2015-05-16 17:08:06 -05:00
hairlessbear
52d869b195 Fixed issue #5203 2015-05-16 16:52:58 -04:00
Blade Barringer
3c35b52d27 Hide contributor level if contribText func is not available; put math on scope 2015-05-15 23:08:26 -05:00
Blade Barringer
d6385a94e9 Front page now shows avatar with link 2015-05-15 22:31:47 -05:00
Kelsey Ando
f06e286f64 adding changes that were suggested from crookedneighbor to make the edit and save button be btn-sm 2015-05-15 11:00:26 -04:00
Blade Barringer
2ba1a1fc85 Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop 2015-05-15 07:41:46 -05:00
Blade Barringer
d7ce151500 Add translatable strings 2015-05-14 21:56:16 -05:00
Kelsey Ando
ca70e010ca Merge branch 'develop' into fixes-issue-5183 2015-05-14 21:33:04 -04:00
Kelsey Ando
0af264ef87 changing padding for the leave button on the party page so it will line up with the edit group button 2015-05-14 21:09:41 -04:00
Blade Barringer
023458b6e5 Add test for getting push notification when gifted a subscription 2015-05-13 19:31:26 -05:00
Blade Barringer
3cbd5fd9ff Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-13 19:11:57 -05:00
Sabe Jones
89d1d63b24 Merge pull request #5198 from SabreCat/pet-skins 
Pet Skins and Ears
 2015-05-13 15:44:23 -05:00
Sabe Jones
0cb1d8ec9a test(purchases): Gem buying tests 
Also corrects the byline for Inn improvements to credit primary coder @hairlessbear.
 2015-05-13 14:21:13 -05:00
Matteo Pagliazzi
05f6e5e14d fix(flags): correctly send flag reports emails 2015-05-13 20:08:46 +02:00
Sabe Jones
35ff90b4d3 Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins 2015-05-13 12:12:57 -05:00
Sabe Jones
3abec07119 chore(news): Bailey 2015-05-13 11:44:52 -05:00
Sabe Jones
29109051d7 feat(customize): Animal skins and ears 
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
 2015-05-13 11:19:08 -05:00
hairlessbear
8e5cdbd742 Fixed challenges achievement always displaying (again) 
Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won.
 2015-05-13 12:12:03 -04:00
Blade Barringer
f7f126c352 Add alert box to dailies resting in the inn message 2015-05-13 07:29:17 -05:00
Alys
2ac763cc50 add message about Resting in the Inn to top of Dailies column when preferences.sleep is true 2015-05-13 16:56:52 +10:00
Blade Barringer
4050e9ad0c Fix guilds not loading ＼(^ω^＼) 2015-05-12 22:28:06 -05:00
Blade Barringer
8a4abc632f Refactor push notifications test; Prevent push notification from being sent when buying gems for yourself as a gift 2015-05-12 20:18:06 -05:00