sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-26 13:22:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4472 commits 3 branches 0 tags 1.6 GiB
Commit graph

4472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
ffe415e6f3 chore(bailey): add announcement re: STWC processing time 2014-01-28 12:44:19 -08:00
Tyler Renelle
a4524cdb9a chore(bailey): add bailey for group plans + perfect day achiev. Keep 
basic-plan announcement up for a bit longer
 2014-01-28 12:27:30 -08:00
Matteo Pagliazzi
9226b83d84 Merge pull request #2591 from Alys/patch-2 
Market "Sell..." button: add spaces, remove bracket
 2014-01-28 10:48:54 -08:00
Tyler Renelle
5028707c7b feat(marketing): add video tuts on "learn more" page until we have some copy 2014-01-28 10:44:33 -08:00
Tyler Renelle
a582a0546d feat(marketing): some frontpage updates, a screenshot, & "contact us" 
button mods
 2014-01-28 10:36:05 -08:00
Matteo Pagliazzi
abdbaa6fe3 Merge pull request #2583 from Sinza-/split-main-json 
Split main.json
 2014-01-28 10:25:31 -08:00
Matteo Pagliazzi
3785dad215 Merge pull request #2605 from Sinza-/split-fix 
Remove duplicated 'none' and minor adjusts
 2014-01-28 10:24:37 -08:00
Matteo Pagliazzi
f15d825dc5 Merge pull request #2600 from Sinza-/envt-drops 
Replace hard-coded strings for env.t on drops.jade file
 2014-01-28 10:24:13 -08:00
Matteo Pagliazzi
14b01836c5 fix(merge) 2014-01-28 19:10:07 +01:00
Matteo Pagliazzi
6ac7f9e5c7 merge @speg pr 2014-01-28 19:08:35 +01:00
Tyler Renelle
66f95cdd4c feat(premium): updates to group plans info page 2014-01-28 09:22:46 -08:00
Sabe Jones
76a7ab5bcc feat(attributes): Add backfill button in flat and classbased allocation modes 
Partial implementation of a "distribute points now" button for backfilling accrued Attribute points. Works with flat and classbased allocation so far; taskbased will require much fancier handling.
 2014-01-28 08:57:29 -06:00
Etryn
9fa8646768 Fixed unnecessary margin on button group buttons 
Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
 2014-01-28 01:13:24 -08:00
Tyler Renelle
f7f4a0c166 feat(administrators): start adding features page for admin accounts 2014-01-27 18:24:24 -08:00
Tyler Renelle
0ddaae4d75 feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links 2014-01-27 17:40:43 -08:00
Marcelo Sizer
f8bc2d7618 Remove duplicated 'none' and minor adjusts 2014-01-27 23:27:11 -02:00
Tyler Renelle
2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's 
client-side anyway (@colegleason @paglias)
 2014-01-27 16:34:22 -08:00
Tyler Renelle
cc934b577e chore(license): remove conflicting text (fixes #2596), and simply reference the GPLv3 file by URL. Assets & content designed by BQ are CC-BY-SA, for HabitRPG are CC-BY-NC-SA 2014-01-27 15:42:42 -08:00
Marcelo Sizer
aa6ee57ca7 Replace hard-coded strings for env.t on drops.jade file 2014-01-27 15:45:46 -02:00
Marcelo Sizer
06200accad fix(translation): Fix #2585. 
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
 2014-01-27 14:21:50 -02:00
Alice Harris
a0dad56a9b Market "Sell..." button: add spaces, remove bracket 
Fix some text appearance issues:

- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".

- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see 4f07ab39b0

- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
 2014-01-27 19:27:06 +10:00
Tyler Renelle
51bff23885 fix(stable): show hatchable combo when petOwned>0 (fyi @deilann) 2014-01-26 17:46:09 -08:00
Tyler Renelle
1d8539837c Merge pull request #2576 from Sinza-/mult-sell-buttons 
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
 2014-01-26 17:26:42 -08:00
Tyler Renelle
5caaff1cea fix(beastmaster): fixes #2557, adds opacity to previously-owned pets 
after they're mounted. You can earn them back again
 2014-01-26 17:24:48 -08:00
Tyler Renelle
47bcaf83e7 feat(homepage): use .marketing for centering, add playbutton as static 
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28), let's iterate
/ prettify. @deilann
 2014-01-26 14:22:01 -08:00
Tyler Renelle
286a69fd46 chore(bailey): udpated bailey for premium 2014-01-26 13:59:41 -08:00
Tyler Renelle
62af638e8a Merge pull request #2570 from deilann/patch-1 
removed stray paren in profile.jade
 2014-01-26 12:41:06 -08:00
Tyler Renelle
4ca67bdee8 Merge pull request #2574 from deilann/copy-3 
new landing copy
 2014-01-26 12:37:49 -08:00
Marcelo Sizer
c09d89f872 Fix version conflict 2014-01-26 17:39:36 -02:00
Marcelo Sizer
8d41c44ad7 Fix version conflict 2014-01-26 17:37:54 -02:00
Marcelo Sizer
8f4016d669 Split main.json 2014-01-26 17:30:41 -02:00
Sabe Jones
bc1adeb127 fix(mounts): Move avatar upward when mounted regardless of pet 
Step 1 toward fixing some of our mount sprite positioning issues. If the avatar always moves up when mounted, we gain substantial freedom to reposition the mount, especially on the vertical axis.
 2014-01-26 11:02:59 -06:00
Matteo Pagliazzi
4274090205 fix(translations): fix #2564 and similar ones 2014-01-26 14:48:38 +01:00
Marcelo Sizer
de2c0280b2 Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion 2014-01-26 01:18:54 -02:00
deilann
b44f7088ad new landing copy 2014-01-25 18:21:56 -08:00
Dušan Juretić
117c26cfd3 Added tests for translations (env.t) 2014-01-25 21:01:43 -03:00
deilann
2c0f5fc5d0 removed stray paren 
Stray parentheses was cutting off destination for the string submitted upon changing names in profiles.
 2014-01-25 13:17:01 -08:00
Cole Gleason
2a91cee0ff Merge branch 'round-boss' into develop 2014-01-25 13:22:49 -06:00
Cole Gleason
1412570484 revert(party): Round boss health up instead of to nearest integer 
This reverts commit 626da5681f.

Fixes #2563.
 2014-01-25 13:22:24 -06:00
Tyler Renelle
11b37c6047 Merge pull request #2553 from djuretic/mark_collected_items 
Mark collected items in collection quests
 2014-01-24 17:36:22 -08:00
Tyler Renelle
1dc68112d1 fix(paypal): fixes #2492, remove environment check for now, only have 
production-mode option. revisit
 2014-01-24 17:29:10 -08:00
Dušan Juretić
70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03:00
Tyler Renelle
ecbe780e70 fix(find_uniq_user): fix 2014-01-24 17:04:01 -08:00
Marcelo Sizer
17c63cdc6e Replace string for env.t 2014-01-24 20:26:33 -02:00
Matteo Pagliazzi
13131087ff fix(translations): add env.t to rootScope 2014-01-24 23:19:17 +01:00
Matteo Pagliazzi
2eb7ea5e91 Merge pull request #2550 from HabitRPG/paglias/translations-refactoring 
Refactor translations
 2014-01-24 13:53:46 -08:00
Matteo Pagliazzi
5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Cole Gleason
0c935f9c9a Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-01-24 15:29:17 -06:00
Cole Gleason
626da5681f fix(party): Round boss health up instead of to nearest integer 
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.

Fixes #2504.
 2014-01-24 15:27:30 -06:00
Matteo Pagliazzi
d107db7013 refactor(translations) 2014-01-24 21:27:06 +01:00