Commit Graph

185 Commits

Author SHA1 Message Date
Tyler Renelle 10e9c205e6 Merge branch 'translations' into develop
Conflicts:
	locales/bg/app.json
	locales/nl/app.json
2013-11-13 23:37:29 -08:00
Tyler Renelle 95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link
replace github contributing links → wikia link
2013-11-13 23:26:19 -08:00
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 340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Nick Gordon 528fd5f067 case-insensitive highlighting for usernames in chat 2013-11-13 06:57:48 -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
Matteo Pagliazzi 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
Nick Gordon edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00
Matteo Pagliazzi 5ddf54466c can change language from setting 2013-11-12 16:13:35 +01: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 2978842d23 [#1781] challenges: select-all / select-none buttons 2013-11-11 19:00:43 -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
Sabe Jones ce1461f0e9 Challenges are no longer an upcoming feature!
Wording tweaks to guild creation text.
2013-11-09 13:34:14 -06:00
Tyler Renelle 8c83bc6ad2 challenges: "close" => "end challenge", move outside of edit 2013-11-09 09:37:31 -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
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
Shane Lister 64ed414ae6 Update inventory.jade 2013-11-08 10:53:28 -08:00
Shane Lister 30e4dbcb98 Update Hatching Instructions
On behalf of @bobbyroberts99
2013-11-08 10:43:22 -08:00
Tyler Renelle 4e668a7de4 contrib: heroic at (8) 2013-11-08 08:51:33 -08:00
Tyler Renelle 06d1f77ce5 contribu: cleanup tavern, add legend for contrib tiers 2013-11-07 17:25:58 -08:00
Tyler Renelle 962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle e387ee9d13 Merge remote-tracking branch 'Shaners/patch-3' into contrib
Conflicts:
	views/options/pets.jade
2013-11-06 17:40:02 -08:00
Tyler Renelle d679fa1e62 contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor 2013-11-06 15:59:56 -08:00
Matteo Pagliazzi ffd119b16d invited consistent with members 2013-11-06 20:31:00 +01:00
Matteo Pagliazzi 774ded9fb2 fix #1740 2013-11-04 15:17:09 +01:00
Tyler Renelle 427a70e76d [#1731] update guild gems wording 2013-11-03 18:30:50 -08:00
Tyler Renelle 62012a1052 fix adding challenges as subdoc to groups. write migration to restore those that have been created. Also in migration fix missing task.ids (taskSchema issue) 2013-11-02 18:05:14 -07:00
Tyler Renelle 646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
2013-11-02 16:07:12 -07:00
Matteo Pagliazzi 9454a3a629 should help performances, it inserted the whole group leader object into the profile attr 2013-11-02 12:40:36 +01:00
Tyler Renelle 8ae75e09c5 [#1716] use ui-router to collapse challenge participants (WIP) 2013-11-01 23:46:14 -07:00
Tyler Renelle 65b18f3af1 [#1711] limit number of members that get sent down with group, limit profile
fields sent down
2013-11-01 19:27:08 -07:00
Matteo Pagliazzi f7dba5f323 avoid reloading for group operations 2013-11-01 21:08:36 +01:00
Tyler Renelle 4b4a043a5f [#1685] add help popover to explain challenge task coloring / charts 2013-11-01 11:09:49 -07:00
Matteo Pagliazzi 3562079ba6 small design tweaks, fix #1682 2013-11-01 18:33:50 +01:00
Tyler Renelle dfeae89a07 challenges: minimum 1 gem for public challenges 2013-10-31 19:30:07 -07:00
Tyler Renelle 58fa97fb19 challenges: shortcode for tag names & task tooltips 2013-10-31 18:18:34 -07:00
Tyler Renelle b3804c4d1f [#1675] fixes to populating Group.challenges, and display challenges in party
page. I'm not sure about having challenges as a subdoc anymore, i think
it will be better performance and maintenance if we just reference
Challenge.group/members and remove User.challenges & Group.challenges
2013-10-31 16:20:48 -07:00
Tyler Renelle 14b5044fd7 [#1695] add access control to update/deleting challenges 2013-10-31 15:32:30 -07:00
Tyler Renelle 39821752fa challenges: move options/challenges to options/social/challenges 2013-10-31 14:37:04 -07:00
Tyler Renelle 012dabf8b6 challenges: visually collapse members list (still loads the full thing, revisit later) 2013-10-31 14:26:48 -07:00