Sabe Jones
6cc41c47c7
Work on standardizing terminology
2013-11-17 09:36:38 -06:00
Matteo Pagliazzi
75ce46d4af
moment version consistent with habitrpg-shared
2013-11-17 16:12:25 +01:00
Matteo Pagliazzi
f448f4b71b
bower.json auto update
2013-11-17 13:32:44 +01: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
Tyler Renelle
20c976d1dc
Merge pull request #1843 from snicker/develop
...
Fixed case-insensitive highlighting issues and identified a possibly *major* performance problem
2013-11-16 10:25:59 -08: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
Matteo Pagliazzi
20f9e6b911
upgrade angular, fix #1786
2013-11-16 15:18:58 +01:00
Tyler Renelle
fb1cc7b127
auth.auth: ensure v
2013-11-16 02:22:56 -08:00
Tyler Renelle
4fa4519b34
[ #1829 ] sort challenge-box by creation date
2013-11-15 21:32:25 -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
460afb7763
[ #1829 ] sort by timestamp, show group & creator in challenge header
2013-11-15 18:57:35 -08:00
Tyler Renelle
9d18e9efd0
Merge pull request #1830 from nafoster/develop
...
Lots of Japanese translations
2013-11-15 18:47:58 -08:00
Tyler Renelle
53db31d4fb
[ #1828 ] don't let users create party if they already belong to one
2013-11-15 18:16:48 -08:00
Tyler Renelle
2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
Dušan Juretić
34ea6038f1
add single test for notificationServices
2013-11-15 22:42:30 -03:00
Dušan Juretić
2f5025e322
add tests for groupServices
2013-11-15 22:42:30 -03:00
Tyler Renelle
05334550b0
[ #1837 ] separate groups filter from "create new challenge"-available groups
2013-11-15 17:36:36 -08:00
Tyler Renelle
c9ddc0e023
Merge pull request #1831 from snicker/develop
...
data exporting support, supports exporting task history via csv
2013-11-15 17:25:46 -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
e2e7ba15b2
ack, trailing comma
2013-11-15 08:56:54 -08:00
Nick Gordon
c69bc0de58
derp. moment is already a dependency
2013-11-15 08:55:06 -08:00
Nicole Foster
00d6a5077a
Lots of Japanese translations
2013-11-15 09:22:46 -05: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
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
550ca394a9
groups: remove _v for now, it's causing issues (cast to Number failed
...
for Object) and I don't know why
2013-11-14 20:30:48 -08:00
Tyler Renelle
97d592401b
Merge pull request #1825 from HabitRPG/sabe_tweak_fix
...
Shields don't come free ya know!
2013-11-14 20:00:00 -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
Tyler Renelle
55faf443ce
send error to refresh page if they haven't since update
2013-11-14 18:23:07 -08:00
Tyler Renelle
94459e429c
Merge pull request #1824 from HabitRPG/sabe_tweak
...
One does not simply *pull request* into Heroism.
2013-11-14 18:01:02 -08: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
4ca516b7bc
Merge pull request #1817 from nafoster/develop
...
Many JP translations
2013-11-14 14:07:47 -08:00
Tyler Renelle
224cbe2277
pets: better fix than 64ac920 , and unsets beastmaster if wrongly set
2013-11-14 13:49:59 -08:00
Nicole Foster
af8ca6d5b0
Many JP translations
2013-11-14 16:34:36 -05:00
Tyler Renelle
64ac920ca7
pets: fix to beastmaster with new pet system
2013-11-14 13:25:00 -08:00
Tyler Renelle
92a7344a58
mounts: back to habirpg-shared#master
2013-11-14 13:05:31 -08: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
Matteo Pagliazzi
1631406a5e
greek code set to "el"
2013-11-14 21:21:49 +01:00
Matteo Pagliazzi
41d8bc04cd
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-14 20:50:36 +01:00
Matteo Pagliazzi
7df04633e2
correct languageName for Ukrainian
2013-11-14 20:50:17 +01:00
Tyler Renelle
201b04f759
i18n: greek bug
2013-11-14 11:17:47 -08:00
Tyler Renelle
edc4a8cdc2
Merge pull request #1814 from phil230/upper_save
...
contrib: Added 'icon-ok' as an upper save button
2013-11-14 10:51:30 -08:00
Tyler Renelle
ffe8ae899b
Merge pull request #1816 from phil230/greek_tr
...
contrib: Added Greek Language
2013-11-14 10:46:16 -08:00
Matteo Pagliazzi
68c9748619
armour -> armor
2013-11-14 19:23:35 +01:00
Filippos
fafa17c80d
Removed clientSideStrings
2013-11-14 17:25:15 +02:00
