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
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
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
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
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
Matteo Pagliazzi
75ce46d4af
moment version consistent with habitrpg-shared
2013-11-17 16:12:25 +01:00
Sabe Jones
cb64ab5a7d
Make it easier for people to find "how to contribute" wiki page
2013-11-17 08:09:23 -06:00
Sabe Jones
44a82c71e2
Remove bland/harsh border styling on eggs and avatar options. Falls back to a button look that's much nicer.
2013-11-17 07:40:19 -06:00
Matteo Pagliazzi
f448f4b71b
bower.json auto update
2013-11-17 13:32:44 +01:00
Matteo Pagliazzi
b83eb0ee28
moment is exported as an helper by habitrpg-shared
2013-11-17 13:28:57 +01:00
Matteo Pagliazzi
34d5eda736
[ #1832 ] remove relative-date, use moment instead
2013-11-17 13:21:21 +01:00
Tyler Renelle
20c976d1dc
Merge pull request #1843 from snicker/develop
...
Fixed case-insensitive highlighting issues and identified a possibly *major* performance problem
2013-11-16 10:25:59 -08:00
Nick Gordon
55998085e3
fixed the issue with case insensitive highlighting highlighting short usernames
...
how this works:
* rather than throw an expensive regular expression at each chat message, we start by checking to see if the users name exists.
* then, by simple string manipulation we verify that the preceeding character before the alleged username is whitespace, the start of a line, or an '@' character.
* FINALLY, we verify the following character is a non-word character using a regular expression.
* then we cache the highlight status on the local `message` object, because for some reason, this function is called **every time a character is typed in the chatbox.** this seems like a hugh performance problem to me, need to see if there is a way to disable that or something
2013-11-16 09:24:01 -08:00
Nicole Foster
0f1420e909
A few JP translations
2013-11-16 11:16:04 -05:00
Matteo Pagliazzi
20f9e6b911
upgrade angular, fix #1786
2013-11-16 15:18:58 +01:00
Tyler Renelle
fb1cc7b127
auth.auth: ensure v
2013-11-16 02:22:56 -08:00
Tyler Renelle
4fa4519b34
[ #1829 ] sort challenge-box by creation date
2013-11-15 21:32:25 -08:00
Tyler Renelle
b9d3b3a1a7
admin: refresh contrib list when saving a member
2013-11-15 20:06:18 -08:00
Tyler Renelle
b762ecba81
admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes
2013-11-15 19:27:23 -08:00
Tyler Renelle
460afb7763
[ #1829 ] sort by timestamp, show group & creator in challenge header
2013-11-15 18:57:35 -08:00
Tyler Renelle
9d18e9efd0
Merge pull request #1830 from nafoster/develop
...
Lots of Japanese translations
2013-11-15 18:47:58 -08:00
Tyler Renelle
53db31d4fb
[ #1828 ] don't let users create party if they already belong to one
2013-11-15 18:16:48 -08:00
