Commit graph

25741 commits

Author SHA1 Message Date
Sabe Jones
450e154948 On further thought, "Equipment" is better than "Gear." Also fixed a typo. 2013-11-17 10:01:27 -06:00
Sabe Jones
4fbc31d1e6 Change "HP" to "Health" and clarify Potion type 2013-11-17 09:55:04 -06:00
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
Sabe Jones
cb64ab5a7d Make it easier for people to find "how to contribute" wiki page 2013-11-17 08:09:23 -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
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
4547417d62 build, export moment & lodash as helpers (to be used in $rootScope) 2013-11-17 13:27:50 +01:00
Matteo Pagliazzi
3a2edb6539 remove relative date & upgrade & export moment 2013-11-17 13:24:36 +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
Nicole Foster
0f1420e909 A few JP translations 2013-11-16 11:16:04 -05:00
Matteo Pagliazzi
20f9e6b911 upgrade angular, fix #1786 2013-11-16 15:18:58 +01:00
djuretic
24f0e58396 Merge pull request #41 from djuretic/master
Use egg.text instead of egg.name & fix unit tests
2013-11-16 04:29:58 -08:00
Dušan Juretić
80afa45b2b revert to using egg.name 2013-11-16 09:26:15 -03: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
Dušan Juretić
2879b050a0 use egg.text instead of egg.name, fix unit tests 2013-11-15 23:18:16 -03: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
dannybm
0b8bd7b76c Full quality Hebrew language locale translation
This updates includes quality top down Hebrew translation. The previous version seemed to be poor quality google translation.

* should be tested and tweaked for minor adjustments right after deployment
2013-11-16 02:29:14 +02: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
ecd7a32974 Merge pull request #40 from therufs/fix-rarity
Fix drop ratios
2013-11-14 20:37:02 -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
Ruthan
c9aeb65d55 Rebalance potion ratios (version 2) 2013-11-14 20:52:24 -05: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
Ruthan
ccd39036b6 Fix drop ratios 2013-11-14 20:22:39 -05:00
Tyler Renelle
4ca516b7bc Merge pull request #1817 from nafoster/develop
Many JP translations
2013-11-14 14:07:47 -08:00