10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
95c886eee8
Merge pull request #1811 from Fandekasp/update_contrib_link
...
replace github contributing links → wikia link
2013-11-13 23:26:19 -08:00
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
340590774c
replace github contributing links → wikia link
2013-11-14 15:09:20 +11:00
528fd5f067
case-insensitive highlighting for usernames in chat
2013-11-13 06:57:48 -08:00
0ac1f4e397
support for npc styling in autocomplete list to match messages
2013-11-12 21:45:31 -08:00
56b1684a45
Merge pull request #1798 from snicker/develop
...
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
66c0840e76
a few fixes and performance increases:
...
* username autocompletes on click now instead of showing undefined
* an adjustable 'update interval' stops the huge performance hit by delaying events from firing until the user has stopped typing for a while
* nested controllers can cause issues because of prototypal inheritance if the models are not defined correctly... with ChatCtrl._chatMessage, this was the case. Modified it to fit in better with "best practices". See blog post here: http://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html
2013-11-12 20:04:37 -08:00
be2010b0a2
add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code
2013-11-12 22:01:27 +01:00
edcafcc3ce
Fixed issues with positioning of userlist
2013-11-12 07:41:26 -08:00
5ddf54466c
can change language from setting
2013-11-12 16:13:35 +01:00
7eaed0348f
git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations
2013-11-12 14:54:17 +01:00
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
4980a2e6b5
remove groups websites
2013-11-12 22:25:40 +11:00
32a94871d2
Merge pull request #1796 from snicker/develop
...
Autocompletion of nicknames in chat
2013-11-12 00:17:29 -08:00
cd693835ce
Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages
2013-11-11 22:32:52 -08:00
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
2978842d23
[ #1781 ] challenges: select-all / select-none buttons
2013-11-11 19:00:43 -08:00
b6adc8e1d8
translations try
2013-11-11 22:30:38 +01:00
de7ae2203f
remove old files
2013-11-11 21:21:19 +01:00
a1f9bf60fb
try
2013-11-11 21:20:12 +01:00
86f47cb6f1
halloween: remove "last day" bailey notif
2013-11-11 08:30:51 -08:00
42534b5233
[ #1792 ] put purchased limited skins back on avatar tab
2013-11-11 08:21:29 -08:00
cde96bf28b
halloween: take down halloween skins
2013-11-11 00:27:20 -08:00
72f64fa85c
[ #1751 ] /challenges/:cid/:mid task filtering by "in this challenge" at
...
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
2013-11-10 23:41:42 -08:00
9fbb45c253
halloween: bailey notif for last day of spooky skins
2013-11-10 18:13:22 -08:00
e711258ced
advanced options not shown for rewards, shown but not editable for challenges
2013-11-10 17:35:29 +01:00
ce1461f0e9
Challenges are no longer an upcoming feature!
...
Wording tweaks to guild creation text.
2013-11-09 13:34:14 -06:00
8c83bc6ad2
challenges: "close" => "end challenge", move outside of edit
2013-11-09 09:37:31 -08:00
20cac379cf
pretty up our bailey notifs
2013-11-08 20:05:12 -08:00
f868bcae66
contrib: more enticing bailey announcement
2013-11-08 19:42:13 -08:00
14be0b11c6
contrib: add bailey announcement
2013-11-08 19:28:07 -08:00
242bcda96a
contrib: remove gems from admin section, update automatically when they
...
increase a level
2013-11-08 19:28:07 -08:00
c0d36f13ef
contrib: links to wikia in tavern & popup
2013-11-08 19:28:07 -08:00
8773e8ee88
Minor edits
...
Fix a runon sentence, add a space after a comma and change adventure to
venture by your side.
Happy note, I finally got my local copy running. Needed to edit
config.json with my actual settings.
2013-11-08 17:40:23 -08:00
dd2e8144bb
Revert "Minor edits"
...
This reverts commit 43bb1bf485
2013-11-08 17:15:03 -08:00
43bb1bf485
Minor edits
...
Add a space at of sentence and fix run.
2013-11-08 17:01:24 -08:00
5f9d3991ac
[ #1766 ] remove "trigger next day" option
2013-11-08 13:54:29 -08:00
9f326e7433
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-08 22:34:28 +01:00
3a332c4c45
port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting
2013-11-08 22:33:48 +01:00
64ed414ae6
Update inventory.jade
2013-11-08 10:53:28 -08:00
30e4dbcb98
Update Hatching Instructions
...
On behalf of @bobbyroberts99
2013-11-08 10:43:22 -08:00
4e668a7de4
contrib: heroic at (8)
2013-11-08 08:51:33 -08:00
4a1ed7006e
remove comment
2013-11-08 17:49:30 +01:00
daac0a4b04
show but disable challenge daily days, fix #1758
2013-11-08 17:42:45 +01:00
d419db68f2
typo, fix #1761
2013-11-08 17:23:17 +01:00
06d1f77ce5
contribu: cleanup tavern, add legend for contrib tiers
2013-11-07 17:25:58 -08:00
7c94b4b6d3
contrib: add contributor achievement modal
2013-11-07 13:42:29 -08:00
7fe4f31a16
contrib: show profile._id in modal so admins can assign contrib status
2013-11-07 13:05:34 -08:00
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
Tyler Renelle