Commit graph

1213 commits

Author SHA1 Message Date
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
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
05334550b0 [#1837] separate groups filter from "create new challenge"-available groups 2013-11-15 17:36:36 -08:00
Nick Gordon
5116a99dce moved UI stuff into the settings area, moved authWithSession to the Auth controller 2013-11-15 16:25:09 -08:00
Nick Gordon
b958103447 Merge branch 'develop' of https://github.com/snicker/habitrpg into develop 2013-11-15 06:20:37 -08:00
Nick Gordon
7bf1bf2af0 data export commit, supports exporting task history via csv
*adds the following new dependencies: moment, express-csv
*recommend replacing functionality of 'relative-date' with features from 'moment'
*supports retrieval of CSV history via the API and in browser
**/api/v1/export/history (requires typical API authorization)
**/export/history.csv (requires session authorization)
*adds new routes for data export
2013-11-15 06:18:16 -08:00
Tyler Renelle
1e6dec0bbe pets: popover placement fixes 2013-11-14 22:07:08 -08:00
Sabe Jones
5ae2f06006 Shields don't come free ya know!
Fix a couple of missed pieces from reward tier text updates.
2013-11-14 20:42:09 -06:00
Sabe Jones
ee1768b7e2 One does not simply *pull request* into Heroism.
Improved descriptions of reward tiers in the Tavern chat sidebar. Also a handful of miscellaneous English syntax tweaks.
2013-11-14 19:42:03 -06:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop
Conflicts:
	views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Tyler Renelle
d245c87f29 mounts: temporarily remove mounts code from views. merging to master so
we can run schema migration and start with item translations. This commit will be reverted
when mounts is fully merged
2013-11-14 12:59:00 -08:00
Filippos
cbc1185f00 Added 'icon-ok' as an upper save button 2013-11-14 15:01:58 +02:00
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
Matteo Pagliazzi
7eaed0348f git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations 2013-11-12 14:54:17 +01:00
Matteo Pagliazzi
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
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
dda3670d03 mounts: only show mount head in stable (fix later), use egg.mountText
for grown mount popovers. replace pet/mount tooltips with popovers
2013-11-11 13:50:11 -08:00
Matteo Pagliazzi
b6adc8e1d8 translations try 2013-11-11 22:30:38 +01:00
Matteo Pagliazzi
de7ae2203f remove old files 2013-11-11 21:21:19 +01:00
Matteo Pagliazzi
a1f9bf60fb try 2013-11-11 21:20:12 +01: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
bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle
e6f524fce2 mounts: much cleaner inventory interface. Replace text (underneath) with
gem cost. Use popover instead of tooltip, show item.text & item.notes
for more details than before (especially useful for saddle). Screenshot: http://goo.gl/0AfLfG
2013-11-10 20:03:54 -08:00
Tyler Renelle
543635dd37 mounts: change growth-points requirement to 50 (@lemoness) 2013-11-10 19:20:34 -08:00
Tyler Renelle
05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle
9fbb45c253 halloween: bailey notif for last day of spooky skins 2013-11-10 18:13:22 -08:00
Tyler Renelle
4f2a4b1f02 mounts: rare mounts html fix 2013-11-10 17:17:24 -08:00
Tyler Renelle
244fe63bdd mounts: add support for rare mounts 2013-11-10 14:36:40 -08:00
Tyler Renelle
cd79649100 mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount 2013-11-10 13:43:11 -08:00
Tyler Renelle
284114c056 mounts: counting bug fixes, put pets & mounts in tabs 2013-11-10 12:28:08 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -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