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
10080 commits 3 branches 0 tags 1.6 GiB
Commit graph

10080 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blade Barringer
a139ca8ba5 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-18 17:10:04 -05:00
Blade Barringer
dc2fab14d0 Merge branch 'GitHubSphinx-Sphinx-i18n-db1' into develop 2015-07-18 17:06:26 -05:00
Blade Barringer
4f5626b73b Merge branch 'hairlessbear-fix-ian-popover' into develop 2015-07-18 17:00:32 -05:00
Blade Barringer
4e6c2e7335 Add missing classes 2015-07-18 16:59:54 -05:00
Blade Barringer
4cff85784d Move stats to separate partials 2015-07-18 16:00:09 -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
3926a6e95a Remove unnecssary semicolons 2015-07-18 16:00:06 -05:00
Blade Barringer
94d476f837 Correct method name 2015-07-18 16:00:06 -05:00
Blade Barringer
ff42505d1b Add string 2015-07-18 16:00:05 -05:00
Blade Barringer
2b4e48fbe6 Add stat calc to common 2015-07-18 16:00:05 -05:00
Blade Barringer
20148be288 Watch js files in common folder 2015-07-18 16:00:05 -05:00
Blade Barringer
163b0545e8 Adjustments for error handling 2015-07-18 16:00:04 -05:00
Blade Barringer
6d5b57d139 Add class bonus calc function 2015-07-18 16:00:04 -05:00
Blade Barringer
e5428f29c1 Add calculation for equipment stat bonus 2015-07-18 16:00:04 -05:00
Blade Barringer
841923e054 Add level bonus calculation script 2015-07-18 16:00:03 -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
6525cd6f8c Revert "First shot at modifying stats.jade attribute table to use ng-repeat" 
This reverts commit 0d6bc403d069036d998f43c6f7b9173be8f13157.
 2015-07-18 16:00:03 -05:00
hairlessbear
d8f74e5d9f First shot at modifying stats.jade attribute table to use ng-repeat 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
Matteo Pagliazzi
3fa8ab80b5 chore(i18n): update locales 2015-07-17 15:31:12 +02:00
Matteo Pagliazzi
86eaff7cb0 fix(i18n): string for amazon payments 2015-07-17 15:28:55 +02:00
hairlessbear
c61c572887 '.row.col-md-12' changed to '.row: .col-md-12' 2015-07-16 21:10:48 -04:00
hairlessbear
eae7f79363 Fixed time traveler items repositioning strangely on window resize 2015-07-16 20:37:14 -04:00
hairlessbear
e2073f75b8 Refactored inventory file NPCs to use Bootstrap v3 grid and CSS instead of tables 2015-07-16 20:19:32 -04:00
hairlessbear
6657be51d7 Merge pull request #11 from crookedneighbor/death_to_tables 
Change Ian on quests page to not use tables
 2015-07-16 19:09:54 -04:00
Sabe Jones
2407c9eeb8 feat(quests): Improve buy confirm dialog 2015-07-16 12:56:26 -05:00
Blade Barringer
668a8bb6f6 chore(i18n): update locales 2015-07-16 12:04:10 -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
GihHubSphinx
e48703602a Make colon is stats hideable 2015-07-16 12:00:56 +05:00
GihHubSphinx
aa0aec8d4b Revert "New string in stats if gear has no benefits (take 2)" 
This reverts commit fdbd18a8ed.
 2015-07-16 10:54:17 +05:00
Alys
239f7c9c95 change message on Armoire when it is empty to say that new gear arrives in the first week of the month 2015-07-16 12:56:28 +10: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
e0bfd60eb1 amazon payments: switch to green button 2015-07-15 20:07:17 +02: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
Matteo Pagliazzi
de32461787 feat(amazon-payments): WIP add donations 2015-07-15 20:07:17 +02:00
Blade Barringer
6c6c9b3464 Change Ian on quests page to not use tables 2015-07-15 08:19:39 -05:00
Blade Barringer
8a97b597f5 Resize sea foam image 
Fixes #5609
 2015-07-15 07:53:12 -05:00
Blade Barringer
3e1f1f191d Merge pull request #5619 from gisikw/habitica-console 
Add a 'gulp console' method which preloads Mongo, models
 2015-07-15 06:58:04 -05:00