sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 01:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4606 commits 3 branches 0 tags 1.6 GiB
Commit graph

1795 commits

Author SHA1 Message Date
Matteo Pagliazzi
8b29eb530a refactor(bs3): port drops modals 2014-02-01 19:39:05 +01:00
Matteo Pagliazzi
f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Marc-André Larivière
0afaa69d7d Created new CSS entry for equipment title and modified inventory.jade accordingly 2014-02-01 13:17:21 -05:00
Marc-André Larivière
875698c111 Created new CSS entry for equipment-title and modified inventory.jade accordingly 2014-02-01 12:52:38 -05:00
Matteo Pagliazzi
4dcf74a38a refactor(bs3): port avatar level label 2014-02-01 17:18:37 +01:00
Matteo Pagliazzi
af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Matteo Pagliazzi
0a047f5b2f Merge branch 'develop' into paglias/bs3 2014-02-01 16:47:32 +01:00
Matteo Pagliazzi
ff49695635 refactor(bs3): misc fixes & port death modal 2014-02-01 16:46:48 +01:00
Tyler Renelle
52f8f0d5b0 feat(winter): remove winter scrolls & snowballs 2014-02-01 07:43:25 -08:00
Tyler Renelle
a9d7add1e3 chore(bailey): baconsaur update 2014-01-31 22:03:52 -07:00
Tyler Renelle
b29231056b chore(bailey): vice notif 2014-01-31 15:36:47 -07:00
Tyler Renelle
800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Matteo Pagliazzi
49e1bf1ba4 refactor(bs3): fix 2014-01-31 22:05:09 +01:00
Matteo Pagliazzi
823296fc41 refactor(bs3): sync with develop 2014-01-31 21:56:39 +01:00
Matteo Pagliazzi
f4c30390f5 refactor(bs3): start porting app, general layout and filters 2014-01-31 21:18:44 +01:00
Tyler Renelle
179316e10f feat(restore): add restore-gp back in. Parly to end the winter event, 
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
 2014-01-31 12:54:37 -07:00
Tyler Renelle
4ba5a9cf26 refactor(restore): remove restore-gear commented-out code, that stuff is 
incompatible with new gear setup (circa class system)
 2014-01-31 12:50:13 -07:00
Matteo Pagliazzi
cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi
0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Tyler Renelle
0a0c6c73a5 chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness 2014-01-30 21:34:06 -07:00
Tyler Renelle
aff885c05c feat(habitBirthday): add habitrpg birthday event. includes cakes for all 
pets, absurd party robes, npc swap, badge, etc. @lemoness
 2014-01-30 19:20:07 -07:00
Marc-André Larivière
2e64b03a63 Fixed inventory alignment. Issue #2158 2014-01-30 19:58:34 -05:00
Marc-André Larivière
49ec9d2e5c Fixed inventory alignment. Issue #2158 2014-01-30 19:57:50 -05:00
Matteo Pagliazzi
c7c6181bbc Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-01-30 22:26:28 +01:00
Matteo Pagliazzi
76db2d49c2 18n(merge): merge @Sinza- pr, @lefnire now it is ready 2014-01-30 22:25:42 +01:00
Marcelo Sizer
44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Tyler Renelle
3660f1a85c feat(premium): backport server code for premium subs (it's just ccard 
handling & uer model stuff)
 2014-01-30 10:51:32 -07:00
Matteo Pagliazzi
5f0cf6575c fix(settings): remove unnecessary code 2014-01-30 18:44:53 +01:00
Matteo Pagliazzi
e9fb7d0343 Merge pull request #2627 from Sinza-/subscriber 
i18n(subscriber): replace subscriber hard-coded strings for env.t
 2014-01-30 09:37:42 -08:00
Cole Gleason
a6d66f68ba Merge remote-tracking branch 'upstream/sabe/attributes' into develop 2014-01-30 11:10:09 -06:00
Sabe Jones
f6e12fa25e fix(allocateNow): Send empty object to user.ops per @colegleason suggestion 
Tested with both implemented allocation modes, looks good!
 2014-01-30 07:55:27 -06:00
Matteo Pagliazzi
c93bc46908 refactor(bs3): use templates for modals 2014-01-29 22:18:13 +01:00
Matteo Pagliazzi
7354efc1d5 refactor(bs3): working register & prettier login modal 2014-01-29 21:28:11 +01:00
Marcelo Sizer
aeb705b652 style(tavern): add space between 2 and gems 2014-01-29 17:38:32 -02:00
Matteo Pagliazzi
3f3869ea28 refactor(bs3): working login modals, had to readd bootstrap origin javascript plugins 2014-01-29 18:37:51 +01:00
Matteo Pagliazzi
4c9da6883f refactor(bs3): static pages 
works everything exeception made for the login modal, it opens but since this directive has had a lot of changes in angular-ui-bootstrap it will require more work (like all modals), @lefnire
 2014-01-29 18:26:58 +01:00
Cole Gleason
2b17b041ca Merge pull request #2533 from Sinza-/buy-quest 
Add information to quests on the Market before you buy them
 2014-01-28 18:49:29 -08:00
Marcelo Sizer
cd4cb0a552 i18n(subscriber): replace subscriber hard-coded strings for env.t 2014-01-28 22:30:05 -02:00
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
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
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
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
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
deilann
b44f7088ad new landing copy 2014-01-25 18:21:56 -08: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
Marcelo Sizer
17c63cdc6e Replace string for env.t 2014-01-24 20:26:33 -02: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
Matteo Pagliazzi
8e99186e9c refactor(translations): achievements 2014-01-24 20:07:02 +01:00
Matteo Pagliazzi
a9095f3464 fix(translations): remove translations for privacy & terms 2014-01-24 17:38:21 +01:00
Marcelo Sizer
ed71522131 Fix version conflict 2014-01-24 07:28:30 -02:00
Marcelo Sizer
d3d970b87f Make locked quests purchasable 2014-01-23 23:11:30 -02:00
Marcelo Sizer
fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Marcelo Sizer
9e6a9a3d0e Don't show information if the quest is locked 2014-01-23 18:26:55 -02:00
Marcelo Sizer
6c68c51ab5 Fix version conflict 2014-01-23 17:26:37 -02:00
Marcelo Sizer
635451dc8c Close quest modal after quest purchase 2014-01-23 16:11:40 -02:00
Marcelo Sizer
b2d5e2a090 Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest 2014-01-23 15:53:42 -02:00
Matteo Pagliazzi
13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Matteo Pagliazzi
50953ddf81 Merge pull request #2525 from Sinza-/develop 
Replace a line for env.t
 2014-01-23 06:01:06 -08:00
Luveluen
6f3229c679 Update tavern.jade 2014-01-23 10:16:32 +01:00
Luveluen
669789df67 Update index.jade 2014-01-23 09:45:34 +01:00
Luveluen
50f992b63c Update hall.jade 2014-01-23 09:43:17 +01:00
Luveluen
ab84219835 Update group.jade 2014-01-23 09:40:31 +01:00
Luveluen
ed180692e3 Update create-group.jade 2014-01-23 09:36:32 +01:00
Luveluen
6fb88ee1b5 Update chat-message.jade 2014-01-23 09:35:18 +01:00
Luveluen
34fe364fea Update chat-box.jade 2014-01-23 09:33:41 +01:00
Luveluen
2282e36bac Update challenges.jade 2014-01-23 09:31:33 +01:00
Tyler Renelle
9fa4521739 feat(challenges): add angular-ui-select2 for simpler find/select 
challenge winner.
 2014-01-22 23:22:21 -08:00
Tyler Renelle
ae0d758d8f feat(challenges): add button for csv export 2014-01-22 23:22:21 -08:00
Sabe Jones
d3f4a561fd docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth 
Requires commit 667a426 on habitrpg-shared. Adds a line to the Rebirth modal informing users that limited edition gear can be repurchased after Rebirth. Removed a line from the top of the modal to make room, preventing scrolling at ordinary resolutions--I'm open to suggestions if we think that line is crucial.
 2014-01-22 20:45:04 -06:00
Sabe Jones
d782fc6b6a fix(stats): Better layout for attribute point allocation 2014-01-22 20:34:03 -06:00
Marcelo Sizer
4d834c5c2b Replace a line for env.t 2014-01-22 22:37:09 -02:00
Luveluen
077e23519c Update avatar.jade 2014-01-23 00:24:15 +01:00
Luveluen
c4a230d73c Update avatar.jade 2014-01-23 00:19:42 +01:00
Luveluen
0fb8ec9a8b Update tavern.jade 
line 68 and following after confirmation
 2014-01-23 00:04:17 +01:00
Luveluen
13503986fb Update index.jade 
line 39
 2014-01-22 23:43:58 +01:00
Luveluen
9f56426472 Update hall.jade 
line 47!
 2014-01-22 23:34:06 +01:00
Luveluen
098247233f Update group.jade 
line 133 problem
 2014-01-22 23:21:19 +01:00
Luveluen
39eb590299 Update create-group.jade 2014-01-22 22:51:57 +01:00
Luveluen
7540f6acc9 Update challenges.jade 2014-01-22 22:16:54 +01:00
Luveluen
11a558cd20 Update challenge-box.jade 2014-01-22 21:42:48 +01:00
Matteo Pagliazzi
c51c9ad03b improve(translation): merge @Sinza- pr 2014-01-22 19:51:30 +01:00
Marcelo Sizer
ef97abf1bf Fix diverging older version 2014-01-22 16:16:19 -02:00
Marcelo Sizer
bb13f37525 Fix identation 2014-01-22 16:07:04 -02:00
Marcelo Sizer
6ada7f300f Replace hard-coded strings for env.t on views/shared/modals folder 2014-01-22 16:04:28 -02:00
Matteo Pagliazzi
5a03409e33 Revert "improve(translations): translated shared/modals/achievements" 
This reverts commit 090c28a35b.
 2014-01-22 17:38:19 +01:00
Matteo Pagliazzi
eec6ead971 Revert "improve(translations): translate death modal" 
This reverts commit 50333026b6.
 2014-01-22 17:34:54 +01:00
Matteo Pagliazzi
50333026b6 improve(translations): translate death modal 2014-01-22 17:18:35 +01:00
Matteo Pagliazzi
090c28a35b improve(translations): translated shared/modals/achievements 2014-01-22 17:08:12 +01:00
Matteo Pagliazzi
a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Luveluen
4f07ab39b0 Update inventory.jade 2014-01-22 12:10:51 +01:00
Sabe Jones
5ddf09fe13 fix(settings): reintroduce space between captions and help bubbles stripped during localization 2014-01-21 19:52:04 -06:00
Tyler Renelle
f16654d235 feat(quests): add canBuy so we can exclude certain items from the 
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
 2014-01-21 14:44:53 -08:00
Tyler Renelle
e48c7277f8 fix(quests): list multiple rewards in dialog 2014-01-21 14:12:09 -08:00
Luveluen
8b97438607 Update stable.jade 2014-01-20 19:44:33 +01:00
Luveluen
e47afa8965 Update stable.jade 2014-01-20 19:41:17 +01:00
Luveluen
c85e3a2107 Update inventory.jade 2014-01-20 19:23:49 +01:00
Luveluen
18eeafafc8 Update inventory.jade 2014-01-20 19:07:50 +01:00
Luveluen
06132f8a48 Update inventory.jade 2014-01-20 18:55:29 +01:00
Matteo Pagliazzi
52decb7ede fix(translations): @lefnire now everything is ok 2014-01-20 17:51:43 +01:00
Luveluen
fa212b6e93 Update index.jade 2014-01-20 17:50:28 +01:00
Matteo Pagliazzi
fba739535b fix(translations): correct some variables 2014-01-20 17:25:14 +01:00
Matteo Pagliazzi
d000c70679 fix(translations): revert some views 2014-01-20 17:08:27 +01:00
Matteo Pagliazzi
f85117a422 Merge pull request #2486 from luveluen/develop 
jade->json
 2014-01-20 07:56:54 -08:00
Luveluen
ffff867ba3 Update stable.jade 2014-01-20 16:20:06 +01:00
Luveluen
462f11e48c Update inventory.jade 2014-01-20 16:08:37 +01:00
Luveluen
c37512baa6 Update index.jade 2014-01-20 14:41:51 +01:00
Luveluen
68041f206c Update settings.jade 2014-01-19 22:02:55 +01:00
Luveluen
87d528ce50 Update profile.jade 
fullname -> fullName
 2014-01-19 21:46:57 +01:00
Luveluen
bfebb61520 Update profile.jade 2014-01-19 21:40:41 +01:00
Paul Sainsbury
66582b2d05 Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ 2014-01-19 22:24:54 +02:00
Luveluen
46e29e8999 Update settings.jade 2014-01-19 21:16:52 +01:00
Luveluen
4e5323ea2f Update settings.jade 2014-01-19 21:10:18 +01:00
Luveluen
b48c584f43 Update settings.jade 2014-01-19 21:05:41 +01:00
Luveluen
1f0d91e9c6 Update profile.jade 2014-01-19 21:04:03 +01:00
Luveluen
b9bafc304e Update settings.jade 2014-01-19 21:03:01 +01:00
Luveluen
00cb57deb6 Update settings.jade 2014-01-19 21:00:11 +01:00
Luveluen
d87a3caae7 Update profile.jade 2014-01-19 20:50:31 +01:00
Luveluen
f748d89fdc Update profile.jade 2014-01-19 20:11:03 +01:00