Commit Graph

3295 Commits

Author SHA1 Message Date
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 9083645dc3 migration script: websites → blurb 2013-11-14 17:57:07 +11:00
Adrien Lemaire 153d1957a8 clean code from websites
Need review !
2013-11-14 15:20:35 +11:00
Tyler Renelle 827be92fa1 Merge pull request #1802 from snicker/develop
case-insensitive highlighting for usernames in chat
2013-11-13 13:35:37 -08:00
Nick Gordon 528fd5f067 case-insensitive highlighting for usernames in chat 2013-11-13 06:57:48 -08:00
Tyler Renelle 1db0ae9f76 Merge pull request #1801 from snicker/develop
support for npc styling in autocomplete list to match messages
2013-11-12 22:03:54 -08:00
Nick Gordon 0ac1f4e397 support for npc styling in autocomplete list to match messages 2013-11-12 21:45:31 -08:00
Tyler Renelle 56b1684a45 Merge pull request #1798 from snicker/develop
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
Nick Gordon 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
Nick Gordon f2aaf88b1c forked the angular-at-directive code and made changes to support minification
perhaps this is something that should be absorbed into habitrpg-shared
2013-11-12 16:47:36 -08:00
Nick Gordon edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00
Adrien Lemaire 4980a2e6b5 remove groups websites 2013-11-12 22:25:40 +11:00
Tyler Renelle 32a94871d2 Merge pull request #1796 from snicker/develop
Autocompletion of nicknames in chat
2013-11-12 00:17:29 -08:00
Nick Gordon 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
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 9a5af96ba1 [#1763] migration to restore NaN tasks.value to 0 2013-11-11 20:17:14 -08:00
Tyler Renelle ed8e749b11 Merge pull request #1778 from nafoster/develop
Added even spacing between limited edition skins and rainbow skins
2013-11-11 19:25:28 -08:00
Tyler Renelle 2978842d23 [#1781] challenges: select-all / select-none buttons 2013-11-11 19:00:43 -08:00
Tyler Renelle 86f47cb6f1 halloween: remove "last day" bailey notif 2013-11-11 08:30:51 -08:00
Tyler Renelle 42534b5233 [#1792] put purchased limited skins back on avatar tab 2013-11-11 08:21:29 -08:00
Tyler Renelle cde96bf28b halloween: take down halloween skins 2013-11-11 00:27:20 -08:00
Tyler Renelle 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
Tyler Renelle 9fbb45c253 halloween: bailey notif for last day of spooky skins 2013-11-10 18:13:22 -08:00
Matteo Pagliazzi e711258ced advanced options not shown for rewards, shown but not editable for challenges 2013-11-10 17:35:29 +01:00
Tyler Renelle ddd45d76d4 contrib: fix to upping lvl 0 contrib 2013-11-09 13:24:03 -08:00
Tyler Renelle 66041442da Merge pull request #1770 from snicker/develop
updated README to show initial seeding tasks, and fixed a small typo
2013-11-09 13:19:31 -08:00
Nicole Foster 95031fb6ee Even space between limited edition skins and rainbow skins 2013-11-09 15:25:31 -05:00
Tyler Renelle be7a686657 Merge pull request #1777 from HabitRPG/sabe_tweak
Challenges are no longer an upcoming feature!
2013-11-09 12:25:31 -08:00
Sabe Jones ce1461f0e9 Challenges are no longer an upcoming feature!
Wording tweaks to guild creation text.
2013-11-09 13:34:14 -06:00
Matteo Pagliazzi de1f056af8 typo 2013-11-09 19:32:47 +01:00
Matteo Pagliazzi e198bac475 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-09 19:31:50 +01:00
Matteo Pagliazzi aff43acc84 fix #1769 2013-11-09 19:31:28 +01:00
Tyler Renelle 8c83bc6ad2 challenges: "close" => "end challenge", move outside of edit 2013-11-09 09:37:31 -08:00
Nick Gordon d802c502b0 updated README to show initial seeding tasks, and fixed a small typo 2013-11-09 08:48:38 -08:00
Tyler Renelle 20cac379cf pretty up our bailey notifs 2013-11-08 20:05:12 -08:00
Tyler Renelle f868bcae66 contrib: more enticing bailey announcement 2013-11-08 19:42:13 -08:00
Tyler Renelle 14be0b11c6 contrib: add bailey announcement 2013-11-08 19:28:07 -08:00
Tyler Renelle 242bcda96a contrib: remove gems from admin section, update automatically when they
increase a level
2013-11-08 19:28:07 -08:00
Tyler Renelle c0d36f13ef contrib: links to wikia in tavern & popup 2013-11-08 19:28:07 -08:00
Tyler Renelle 5d6b6c1f2a Merge pull request #1768 from bobbyroberts99/develop
Minor edits to stable.jade
2013-11-08 18:21:43 -08:00
Bob Steffes 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
Bob Steffes dd2e8144bb Revert "Minor edits"
This reverts commit 43bb1bf485.
2013-11-08 17:15:03 -08:00
Bob Steffes 43bb1bf485 Minor edits
Add a space at of sentence and fix run.
2013-11-08 17:01:24 -08:00
Tyler Renelle f35df8a47f [#1726] remove updateTasks() batch api route. That's not how we're using
batch (we'll create a proper batch route & document later), and we
shouldn't support this route
2013-11-08 14:01:29 -08:00
Tyler Renelle 5f9d3991ac [#1766] remove "trigger next day" option 2013-11-08 13:54:29 -08:00
Matteo Pagliazzi daf33f9174 remove console.log 2013-11-08 22:37:40 +01:00
Matteo Pagliazzi 9f326e7433 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-08 22:34:28 +01:00
Matteo Pagliazzi 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
Tyler Renelle 8e8d88376c Merge pull request #1765 from Shaners/patch-4
Update Inventory Hatching Instructions
2013-11-08 12:40:45 -08:00
Shane Lister 64ed414ae6 Update inventory.jade 2013-11-08 10:53:28 -08:00