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

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matteo Pagliazzi
967801eb1f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-22 19:21:57 +01:00
Matteo Pagliazzi
a8578602d7 fix drops not showing until refresh 2013-11-22 19:21:34 +01:00
Tyler Renelle
9075bf0856 Merge pull request #1876 from HabitRPG/sabe_tweak 
Move stat formulae to mouseover popup instead of inline
 2013-11-22 06:31:48 -08:00
Sabe Jones
e458b571dc Move stat formulae to mouseover popup instead of inline 2013-11-21 20:37:55 -06:00
Tyler Renelle
1ef6bb18a8 classes WIP 2013-11-21 10:15:44 -08:00
Tyler Renelle
d98257812f build 2013-11-20 15:16:07 -08:00
Tyler Renelle
44f33f7298 Merge pull request #1872 from bobbyroberts99/wikia 
Add link to wikia Tags article when creating a new challenge
 2013-11-20 13:14:21 -08:00
Bob Steffes
6b2a60330f Add link to wikia Tags article when creating a new challenge 
The ? icon now links to the wiki Tags article
 2013-11-20 13:08:05 -08:00
Matteo Pagliazzi
8955fb5a39 typo 2013-11-20 21:44:20 +01:00
Matteo Pagliazzi
7e437e405d fix for countPets, working when originalCount is 0 2013-11-20 21:37:40 +01:00
Matteo Pagliazzi
1a388fa994 fix #1803, when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code? 2013-11-20 21:36:18 +01:00
Matteo Pagliazzi
bca346e616 use _.isFunction 2013-11-20 18:56:40 +01:00
Matteo Pagliazzi
56437d499e hotfix for pet count on server 2013-11-20 18:55:03 +01:00
Matteo Pagliazzi
4bedefbc57 use helpers.countPets on server, fix client side pet count 2013-11-20 18:48:48 +01:00
snicker
6fc848270f Merge pull request #1868 from snicker/develop 
chat highlights work properly when preceeded by spaces again
 2013-11-20 06:50:03 -08:00
Nick Gordon
afc9b6f62b chat highlights work properly when preceeded by spaces again 2013-11-20 06:46:07 -08:00
Tyler Renelle
03492ef5ea Merge pull request #1856 from ilefotiv/patch-2 
Updated hideable gears
 2013-11-19 18:35:56 -08:00
snicker
a64cb5674c Merge pull request #1857 from snicker/develop 
accomodate longer titles per #1855
 2013-11-19 06:41:35 -08:00
Nick Gordon
46410bc244 accomodate longer titles per #1855 2013-11-19 06:39:14 -08:00
Felix
0223761d6c Updated hideable gears 
Updated:
-showArmor
-other
-showWeapon
-showShield
 2013-11-19 10:13:40 +01:00
Tyler Renelle
7fac154f4d Merge pull request #1815 from Fandekasp/make_all_gears_hidable 
Make all gears hidable
 2013-11-18 20:25:32 -08:00
Tyler Renelle
4071301cad Merge pull request #1851 from ilefotiv/patch-1 
Update app.json
 2013-11-18 18:54:39 -08:00
Adrien Lemaire
0a0504d800 update translations files 2013-11-19 11:24:03 +11:00
Adrien Lemaire
e240a4404f reorganize menus 2013-11-19 11:22:41 +11:00
Adrien Lemaire
05814237ed update translations with new Show gear strings 2013-11-19 11:22:41 +11:00
Adrien Lemaire
7c15f09e03 code logic to update preferences 2013-11-19 11:22:41 +11:00
Adrien Lemaire
80be38062e add migration file for default preferences 2013-11-19 11:22:41 +11:00
Adrien Lemaire
0ce0823de4 update ui to test hidable gears 2013-11-19 11:22:41 +11:00
Matteo Pagliazzi
f258298eda update slovene translation (@mrgoodwrong) 2013-11-18 17:06:47 +01:00
Matteo Pagliazzi
98f3902224 deleteTag wasModified not necessary anymore 2013-11-18 17:03:09 +01:00
Matteo Pagliazzi
557d65a626 do not count rare pets into pet counts & fix beast master achievement 2013-11-18 16:18:57 +01:00
Matteo Pagliazzi
ec1681fce4 add countPets helper 2013-11-18 16:07:23 +01:00
Felix
47a630d660 Update app.json 
Minor changes and correctness checks.
 2013-11-18 10:04:15 +01:00
Tyler Renelle
fc352ec2c4 [#1732] temporarily allow restore-streak on challenge tasks 2013-11-17 22:23:22 -07:00
Tyler Renelle
ca3022747e Merge pull request #1835 from dannybm/develop 
Full Hebrew language locale translation
 2013-11-17 20:22:26 -08:00
Tyler Renelle
30d6f6c4d8 [#1789] remove all undefined pets once and for all 2013-11-17 21:17:58 -07:00
Tyler Renelle
f64ca7d4d0 translations: adding slovene (thanks @mrgoodwrong !) 2013-11-17 19:42:01 -08:00
Tyler Renelle
58c1522ff6 Merge pull request #1842 from nafoster/develop 
A few JP translations
 2013-11-17 19:29:23 -08:00
Matteo Pagliazzi
7cae5b6d48 hotfix for minification issues 2013-11-17 22:59:42 +01:00
Matteo Pagliazzi
7c5818c876 build 2013-11-17 22:34:49 +01: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
Tyler Renelle
df3f38d7fb Merge pull request #42 from HabitRPG/sabe_tweak 
Change "HP" to "Health" and clarify Potion type
 2013-11-17 12:21:26 -08:00
Matteo Pagliazzi
7d5da13f6d small performance fix 2013-11-17 21:20:43 +01:00
Matteo Pagliazzi
13856ce1ce Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-17 20:53:00 +01:00
Matteo Pagliazzi
a81e77f0ff update chat messages timestamp 2013-11-17 20:52:39 +01:00
Nicole Foster
ec0a57fd21 Merge remote-tracking branch 'upstream/develop' into develop 2013-11-17 14:44:23 -05:00
Tyler Renelle
5fffc32ad3 [#1844] some tasks have their "type" incorrectly set. I need to find out 
what's causing this, for now fix in database
 2013-11-17 11:09:41 -08:00
Tyler Renelle
a579698865 Merge pull request #1846 from HabitRPG/sabe_tweak_2 
Make it easier for people to find "how to contribute" wiki page
 2013-11-17 10:22:39 -08:00
Tyler Renelle
f738fae0c8 Merge pull request #1845 from HabitRPG/sabe_tweak 
Remove bland/harsh border styling on eggs and avatar options
 2013-11-17 10:18:59 -08:00
Sabe Jones
b701e2b24a Go with the borderless option 2013-11-17 10:21:43 -06:00