snicker
6eed685004
Merge pull request #1892 from snicker/develop
...
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 23:01:15 -08:00
Nick Gordon
90582c3709
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 22:57:41 -08:00
snicker
11bf814151
Merge pull request #1891 from snicker/develop
...
reverting more bindonce changes...
2013-11-22 22:47:36 -08:00
Nick Gordon
2a7adf7285
reverting more bindonce changes...
...
* challenges are not showing, this could be related to the bo-if directive being broken https://github.com/Pasvaz/bindonce/issues/29
* NPCs lost their color because bindonce seems to have a major issue on tags that are using both interpolation and the bo-class directives
2013-11-22 22:44:02 -08:00
Tyler Renelle
123c515cbb
challenges: only push history for dailies / habits
2013-11-22 23:22:24 -07:00
Sabe Jones
9e5e035c6e
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-22 23:22:47 -06:00
Adrien Lemaire
be4691cf58
sort by level
2013-11-23 16:21:43 +11:00
snicker
306e235ef7
Merge pull request #1887 from snicker/develop
...
some style fixes for markdown in chat
2013-11-22 21:17:35 -08:00
Nick Gordon
f26cb2abf3
making it nicer to be in chat if someone decides to post spammy crap or huge images
2013-11-22 21:15:28 -08:00
Tyler Renelle
18d6bed3b8
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:07:27 -07:00
snicker
3bc285f281
Merge pull request #1886 from snicker/develop
...
Yeah, this didn't work with the achievements popup
2013-11-22 16:02:28 -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
Tyler Renelle
fac99c7f7f
[ #1862 ] re-migrat users with items.pets, items.hatchingPotions, or
...
items.eggs which are arrays, not objects. This shouldn't be happening
still, need to investigate
2013-11-22 16:22:09 -07:00
snicker
f006a97f42
Merge pull request #1885 from snicker/bindonce
...
Bindonce implementation
2013-11-22 15:21:16 -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
Nick Gordon
2350e3d359
initial load of bindonce, implementation for chat. performance has improved noticibly, but I think we need to do this in a few other places
2013-11-22 14:23:47 -08:00
Matteo Pagliazzi
8e5edbbef8
fix #1611 , @lefnire added a migration for deleted tags, this time it should not delete all of them ;)
2013-11-22 20:23:41 +01:00
Matteo Pagliazzi
e722a064c8
revert drop notification change
2013-11-22 20:11:35 +01:00
snicker
b723bc17dd
Merge pull request #1880 from snicker/develop
...
super awesome mega-fix with unintended awesome collateral-fixes
2013-11-22 10:49:25 -08:00
Nick Gordon
efe2ff5d70
super awesome mega-fix with unintended awesome collateral-fixes
...
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
2013-11-22 10:38:40 -08:00
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
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
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
Felix
47a630d660
Update app.json
...
Minor changes and correctness checks.
2013-11-18 10:04:15 +01:00
