7c20988c41
Merge branch 'thanksgiving' into develop
2013-11-27 11:53:18 -07:00
db5befb570
thanksgiving turkey & npcs
2013-11-27 11:50:18 -07:00
962b854f87
Merge remote-tracking branch 'origin/sabe_tweak' into develop
...
Conflicts:
views/options/social/tavern.jade
2013-11-27 11:28:31 -07:00
aca122d6de
fix up CONTRIBUTING.md, update "submit bugs" links with this change
2013-11-26 17:09:13 -07:00
a4fb0b42ad
well, this wasn't the fix i was thinking of for #1893 , but it works and I don't know why I didn't do it in the first place
2013-11-26 12:06:48 -08:00
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08:00
f4323ddc24
markdown links in chat will now open in a blank window.
...
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
2013-11-24 10:32:51 -08:00
6736da36d4
use jade class syntax
2013-11-24 17:49:25 +01:00
f7908ddbcb
Correct and clarify some details on contributor rewards
2013-11-24 09:50:21 -06:00
c51a34730d
Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off.
2013-11-24 08:53:48 -06:00
9086ccffcd
Consistent formatting of markdown hint in group edit fields
2013-11-24 07:41:41 -06:00
2101fe255f
Place link to Markdown help prominently in Tavern chat ( fix #1906 )
2013-11-24 07:35:12 -06:00
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
b793d2b753
fix for https://github.com/HabitRPG/habitrpg/issues/1900
2013-11-23 16:45:14 -08:00
4453ac9fb8
removed comments from testing.
2013-11-23 11:14:16 -08:00
52145a479e
testing completed, committing test results in comments
2013-11-23 10:55:56 -08:00
40de2f3bf0
manual testing of bindonce commencing -____-
2013-11-23 09:26:39 -08:00
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
2a7adf7285
reverting more bindonce changes...
...
* challenges are not showing, this could be related to the bo-if directive being broken https://github.com/Pasvaz/bindonce/issues/29
* NPCs lost their color because bindonce seems to have a major issue on tags that are using both interpolation and the bo-class directives
2013-11-22 22:44:02 -08:00
f26cb2abf3
making it nicer to be in chat if someone decides to post spammy crap or huge images
2013-11-22 21:15:28 -08:00
b431336463
more optimizations with bindonce, replacing ngIf with boIf.
...
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
2013-11-22 15:16:24 -08:00
0d19c0de21
Looked for opportunities to replace ngclass with boclass to improve performance, as well as replacing some instances of ng-if with bo-if
2013-11-22 14:40:44 -08:00
2350e3d359
initial load of bindonce, implementation for chat. performance has improved noticibly, but I think we need to do this in a few other places
2013-11-22 14:23:47 -08:00
efe2ff5d70
super awesome mega-fix with unintended awesome collateral-fixes
...
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
2013-11-22 10:38:40 -08:00
44f33f7298
Merge pull request #1872 from bobbyroberts99/wikia
...
Add link to wikia Tags article when creating a new challenge
2013-11-20 13:14:21 -08:00
6b2a60330f
Add link to wikia Tags article when creating a new challenge
...
The ? icon now links to the wiki Tags article
2013-11-20 13:08:05 -08:00
e240a4404f
reorganize menus
2013-11-19 11:22:41 +11:00
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
0ce0823de4
update ui to test hidable gears
2013-11-19 11:22:41 +11:00
a262828e09
Merge pull request #1847 from HabitRPG/sabe_tweak_3
...
Work on standardizing terminology
2013-11-17 12:22:40 -08:00
13856ce1ce
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-17 20:53:00 +01:00
a81e77f0ff
update chat messages timestamp
2013-11-17 20:52:39 +01:00
6cc41c47c7
Work on standardizing terminology
2013-11-17 09:36:38 -06:00
cb64ab5a7d
Make it easier for people to find "how to contribute" wiki page
2013-11-17 08:09:23 -06:00
34d5eda736
[ #1832 ] remove relative-date, use moment instead
2013-11-17 13:21:21 +01:00
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
4fa4519b34
[ #1829 ] sort challenge-box by creation date
2013-11-15 21:32:25 -08:00
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
460afb7763
[ #1829 ] sort by timestamp, show group & creator in challenge header
2013-11-15 18:57:35 -08:00
2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
05334550b0
[ #1837 ] separate groups filter from "create new challenge"-available groups
2013-11-15 17:36:36 -08:00
5116a99dce
moved UI stuff into the settings area, moved authWithSession to the Auth controller
2013-11-15 16:25:09 -08:00
b958103447
Merge branch 'develop' of https://github.com/snicker/habitrpg into develop
2013-11-15 06:20:37 -08:00
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
1e6dec0bbe
pets: popover placement fixes
2013-11-14 22:07:08 -08:00
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
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
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
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
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