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

366 commits

Author SHA1 Message Date
Blade Barringer
89bfc83b95 Organize stat functions alphabetically 2015-07-19 20:19:16 -05:00
Blade Barringer
9994b27f1e Fix member modal on static/front 2015-07-18 16:00:09 -05:00
Blade Barringer
d44dbef859 Move member modal controller to own file 2015-07-18 16:00:08 -05:00
Blade Barringer
b716d882b6 Began refactor of stats page 2015-07-18 16:00:08 -05:00
Blade Barringer
c784b97586 Create private method for how stats should be displayed 2015-07-18 16:00:08 -05:00
Blade Barringer
53fb0ec8b0 Add display experience function 2015-07-18 16:00:07 -05:00
Blade Barringer
f1453d30c4 Add gold display function 2015-07-18 16:00:07 -05:00
Blade Barringer
2eb62de056 Add mpdisplay function 2015-07-18 16:00:07 -05:00
Blade Barringer
17ef7e2885 Add hpDisplay function 2015-07-18 16:00:06 -05:00
Blade Barringer
f9304bd28f Move stat calc scripts to angular service 2015-07-18 16:00:06 -05:00
Blade Barringer
94d476f837 Correct method name 2015-07-18 16:00:06 -05:00
Blade Barringer
a9757c9dbb Refactor member service; Remove logic in functions that were never used 2015-07-18 16:00:03 -05:00
hairlessbear
dbf406c921 Fixes #5623 and fixes #5135 (correctly displays equipment stats in member modals) 2015-07-18 16:00:02 -05:00
Sabe Jones
2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Sabe Jones
73a1c7c596 fix(style): Remove extra class 2015-07-16 11:29:04 -05:00
Sabe Jones
e25819f6de feat(party): Conclude invite experiment 2015-07-16 11:22:19 -05:00
Matteo Pagliazzi
695c793f6e Merge pull request #5632 from HabitRPG/paglias/amazon-payments 
Amazon Payments: implement one time purchases
 2015-07-16 13:24:42 +02:00
Sabe Jones
c15f2b1f80 Merge branch 'sabrecat/quests-page' into develop 2015-07-15 14:12:05 -05:00
Sabe Jones
4a54363966 fix(quests): Show info modal for Gold quests 2015-07-15 14:02:49 -05:00
Matteo Pagliazzi
ecc98411c7 refactor amazon payments and add one time purchases once again 2015-07-15 20:07:17 +02:00
Matteo Pagliazzi
bade139b4b wip amazon payments donation 2015-07-15 20:07:17 +02:00
Sabe Jones
32a74471db Merge branch 'sabrecat/quests-page' into develop 2015-07-14 18:56:32 -05:00
Blade Barringer
7ad2839f05 Adjust look of page blurbs 2015-07-14 08:18:02 -05:00
unknown
7e60864d41 Fixing color on blurbs 2015-07-14 07:46:57 -05:00
unknown
65b7465081 adding blurbs to pages 2015-07-14 07:44:51 -05:00
Blade Barringer
316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
Blade Barringer
6ac049cc71 Allow animal ears to be added to costume or equipped gear 2015-07-12 09:23:03 -05:00
Alys
92bfc66c67 fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear 2015-07-12 18:18:31 +10:00
Blade Barringer
b71f68ef32 Merge branch 'develop' into equipment-refactor-merge-into-develop 2015-07-11 15:55:53 -05:00
Blade Barringer
dccc10aa4d Refactor 2015-07-11 15:05:58 -05:00
Blade Barringer
c33a22ceb3 Put locale key creation into private function 2015-07-11 12:07:20 -05:00
Blade Barringer
94cd0bb852 Use user variable 2015-07-11 11:18:19 -05:00
Blade Barringer
d2e61bf5ef Change string to str 2015-07-11 11:15:04 -05:00
Blade Barringer
cb4b2e43bf Change variable name to itemList 2015-07-11 11:14:50 -05:00
GihHubSphinx
00f7af7807 Introducing a class for buttons allowing wrapping 
New .btn-wrap class for buttons with long text allowing wrapping
 2015-07-10 02:33:09 +05:00
Sabe Jones
c0d35dc472 WIP(quests): Quests page cont'd 
Test fixes and addition of function for buying Quests with Gold
 2015-07-08 17:43:08 -05:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd 
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
 2015-07-08 16:13:23 -05:00
Sabe Jones
6845e8caf3 fix(experiment): Style fixes 
Corrects the display of Google Experiment variants in the absence of an API callback, and widens the avatar stat bar for users who don't have a party.
 2015-07-03 13:46:22 -05:00
Sabe Jones
fb81c79b78 feat(analytics): Invite Friends experiment 
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
 2015-07-02 16:13:22 -05:00
Blade Barringer
4d7a3afc93 Merge branch 'LionC-develop' into develop 2015-07-02 07:58:59 -05:00
Blade Barringer
4bcff71859 Adjust login modal 
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
 2015-07-02 07:58:11 -05:00
Sabe Jones
25dd82ffa0 feat(event): Summer Splash cont'd 
Summer backgrounds, the Seafoam transformation item, and announcements for same.
 2015-07-01 13:11:53 -05:00
Matteo Pagliazzi
ca36c5c632 Merge pull request #5531 from HabitRPG/paglias/amazon-payments 
Amazon Payments Subscriptions
 2015-07-01 01:40:27 +02:00
Sabe Jones
71d8fd2f0c fix(analytics): Handle missing user object 2015-06-30 17:13:56 -05:00
Sabe Jones
3d15da61ec fix(analytics): Correct user ID handling 2015-06-30 16:52:18 -05:00
Sabe Jones
46a7591492 Merge branch 'release-june-30th-2015' into develop 2015-06-30 13:39:51 -05:00
Matteo Pagliazzi
65f4aac23c feat(amazon-payments): working subscriptions, put donations and gifts on hold 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
8747cf4cce fix(amazon-oayments): use production url 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
dbce6f7676 fix(amazon-payments): use right url in production 2015-06-30 17:59:30 +02:00
Matteo Pagliazzi
271245f1e6 feat(amazon-payments): finalize one time purchases 2015-06-30 17:59:30 +02:00