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

178 commits

Author SHA1 Message Date
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -07:00
Tyler Renelle
680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -07:00
Sabe Jones
dab22ec051 Small formatting fix to Advanced Options 2013-12-02 11:10:58 -06:00
Sabe Jones
37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -06:00
Sabe Jones
45b87288f0 Change "reroll" to "Fortify" in Gems popover text 2013-12-01 15:03:03 -06:00
Sabe Jones
af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06:00
Nick Gordon
62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop 
Conflicts:
	views/options/social/tavern.jade
 2013-11-27 11:28:31 -07:00
Tyler Renelle
aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
Nick Gordon
86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Nick Gordon
15f3907f00 fix for #1920 2013-11-26 11:51:21 -08:00
Matteo Pagliazzi
d1240473dd use bindonce for days of the week, thanks @snicker! 2013-11-25 17:38:07 +01:00
Matteo Pagliazzi
a47a32dbd6 translate days of the week, @snicker here I would like to use bo-text but does not work 2013-11-25 17:30:35 +01:00
Sabe Jones
780b0a3593 Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06:00
Adrien Lemaire
47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle
33c2c1db2d Merge pull request #1888 from HabitRPG/sabe_tweak 
Fix matters of colons
 2013-11-23 14:45:45 -08:00
Tyler Renelle
c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08:00
Nick Gordon
4453ac9fb8 removed comments from testing. 2013-11-23 11:14:16 -08:00
Nick Gordon
52145a479e testing completed, committing test results in comments 2013-11-23 10:55:56 -08:00
Nick Gordon
40de2f3bf0 manual testing of bindonce commencing -____- 2013-11-23 09:26:39 -08:00
Matteo Pagliazzi
df5a436338 use countPets also for stats, fix #1898 2013-11-23 17:42:47 +01:00
Sabe Jones
0d6f3dd5e6 Make number format consistent between current exp and exp TNL (fix #1827) 2013-11-23 09:46:28 -06:00
Adrien Lemaire
d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Sabe Jones
983df5c97c Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list. 2013-11-23 06:54:00 -06:00
Nick Gordon
90582c3709 more bindonce rollbacks... bo-if seems to work sometimes, othertimes not 2013-11-22 22:57:41 -08:00
Nick Gordon
dfb09b1f9b Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal 2013-11-22 15:59:53 -08:00
Nick Gordon
b431336463 more optimizations with bindonce, replacing ngIf with boIf. 
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
 2013-11-22 15:16:24 -08:00
Nick Gordon
0d19c0de21 Looked for opportunities to replace ngclass with boclass to improve performance, as well as replacing some instances of ng-if with bo-if 2013-11-22 14:40:44 -08:00
Sabe Jones
e458b571dc Move stat formulae to mouseover popup instead of inline 2013-11-21 20:37:55 -06:00
Adrien Lemaire
0ce0823de4 update ui to test hidable gears 2013-11-19 11:22:41 +11:00
Tyler Renelle
fc352ec2c4 [#1732] temporarily allow restore-streak on challenge tasks 2013-11-17 22:23:22 -07:00
Tyler Renelle
a262828e09 Merge pull request #1847 from HabitRPG/sabe_tweak_3 
Work on standardizing terminology
 2013-11-17 12:22:40 -08:00
Matteo Pagliazzi
7d5da13f6d small performance fix 2013-11-17 21:20:43 +01:00
Sabe Jones
450e154948 On further thought, "Equipment" is better than "Gear." Also fixed a typo. 2013-11-17 10:01:27 -06:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Tyler Renelle
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Filippos
cbc1185f00 Added 'icon-ok' as an upper save button 2013-11-14 15:01:58 +02:00
Tyler Renelle
10e9c205e6 Merge branch 'translations' into develop 
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
 2013-11-13 23:37:29 -08:00
Tyler Renelle
95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link 
replace github contributing links → wikia link
 2013-11-13 23:26:19 -08:00
Tyler Renelle
aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website 
remove broken website field from profile
 2013-11-13 23:09:27 -08:00
Adrien Lemaire
340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Matteo Pagliazzi
7eaed0348f git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations 2013-11-12 14:54:17 +01:00
Matteo Pagliazzi
1d9148eebb move middleware.locals only where it is needed and transform it into a common function, simplify translations and adds automatic language detection 2013-11-12 14:49:01 +01:00
Adrien Lemaire
2e0d83a9cb remove broken website field from profile 
Websites can be added with markdown in the blurb field
 2013-11-12 17:31:10 +11:00
Tyler Renelle
dda3670d03 mounts: only show mount head in stable (fix later), use egg.mountText 
for grown mount popovers. replace pet/mount tooltips with popovers
 2013-11-11 13:50:11 -08:00
Matteo Pagliazzi
b6adc8e1d8 translations try 2013-11-11 22:30:38 +01:00