Matteo Pagliazzi
557d65a626
do not count rare pets into pet counts & fix beast master achievement
2013-11-18 16:18:57 +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
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
Sabe Jones
b701e2b24a
Go with the borderless option
2013-11-17 10:21:43 -06:00
Sabe Jones
6cc41c47c7
Work on standardizing terminology
2013-11-17 09:36:38 -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
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
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
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
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
9b1c8884a4
[ #1735 ] fix repeated timezone setting for UK users
2013-11-14 21:29:34 -08:00
Tyler Renelle
3461d67995
challenges: include challenges that user created, or belongs to, even if
...
not in group anymore
2013-11-14 20:30:48 -08:00
Tyler Renelle
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Matteo Pagliazzi
c256295d6f
fix tests, @lefnire not the best solution but it works
2013-11-14 14:48:36 +01:00
Matteo Pagliazzi
0c40d44de7
remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed
2013-11-14 14:41:42 +01:00
Matteo Pagliazzi
c75bfaa4d9
remove $rootScope.translations, it should not be necessary, update readme
2013-11-14 14:16:46 +01: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
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
153d1957a8
clean code from websites
...
Need review !
2013-11-14 15:20:35 +11:00
Matteo Pagliazzi
83d9368c2e
translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set
2013-11-13 22:01:02 +01: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
8a2059ee2f
typo
2013-11-12 16:24:22 +01:00
Matteo Pagliazzi
d797c21075
emit event when user is synced and update code to use it
2013-11-12 16:23:21 +01: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
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
bfbc907fa1
mounts: show when selectedFood by green-circle highlighting pets
2013-11-10 22:53:20 -08:00
Tyler Renelle
e990850b01
mounts: new saddle logic. saddles don't drop, can only purchase for
...
5G. Saddle instantly raises pet=>mount (full 50pts). Saddles no longer
required as "finisher" item. (@lemoness)
2013-11-10 20:23:14 -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
4c15905cd9
mounts: block creating mount if they already have it
2013-11-10 15:13:50 -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
Nicole Foster
95031fb6ee
Even space between limited edition skins and rainbow skins
2013-11-09 15:25:31 -05: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
