Nick Gordon
15f3907f00
fix for #1920
2013-11-26 11:51:21 -08:00
Nick Gordon
878bfc7f46
removing sensitive user data from export
2013-11-26 06:48:18 -08:00
Matteo Pagliazzi
d1240473dd
use bindonce for days of the week, thanks @snicker!
2013-11-25 17:38:07 +01:00
Matteo Pagliazzi
c4e8de2ee0
fix language switching
2013-11-25 17:34:41 +01:00
Matteo Pagliazzi
a47a32dbd6
translate days of the week, @snicker here I would like to use bo-text but does not work
2013-11-25 17:30:35 +01:00
Nick Gordon
4ab26ee821
Merge branch 's7export' into develop
2013-11-25 08:12:53 -08:00
Nick Gordon
c0a02eeef8
support for xml and json export of all user data
2013-11-25 08:06:27 -08:00
Matteo Pagliazzi
2e8fc8d248
use script tag not eval to execute moment language code
2013-11-25 17:04:07 +01:00
Matteo Pagliazzi
17c97308f3
stable, pets row 100% width
2013-11-25 16:50:51 +01:00
Matteo Pagliazzi
b4d910c9cb
typo
2013-11-24 21:47:07 +01:00
Matteo Pagliazzi
d1698460e0
add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too
2013-11-24 21:45:24 +01:00
Nick Gordon
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
Matteo Pagliazzi
6736da36d4
use jade class syntax
2013-11-24 17:49:25 +01:00
Matteo Pagliazzi
fa2fb8e3fb
open named links in new window, @snicker this will not work for links auto detected by marked, we should override this piece of code https://github.com/chjj/marked/blob/master/lib/marked.js#L578 but i am not sure it is possible to do without overriding the whole function
2013-11-24 17:49:12 +01:00
Nick Gordon
0e7c7e439f
images shown with markdown now link to themselves in an external browser window
2013-11-23 19:33:41 -08:00
Nick Gordon
aa91d21189
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-23 17:39:19 -08:00
Nick Gordon
38225896f4
fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left
2013-11-23 17:37:20 -08:00
Tyler Renelle
e9467dc466
Merge pull request #1896 from Fandekasp/party_members_order
...
Party members order
2013-11-23 16:52:31 -08:00
Nick Gordon
b793d2b753
fix for https://github.com/HabitRPG/habitrpg/issues/1900
2013-11-23 16:45:14 -08:00
Nick Gordon
2604d8e21e
fix for https://github.com/HabitRPG/habitrpg/issues/1903
2013-11-23 16:20:34 -08:00
Adrien Lemaire
a1d9026052
Merge pull request #1901 from Fandekasp/header_colors
...
add npc color, update leader background
2013-11-23 15:50:20 -08:00
Adrien Lemaire
47cf0eb07d
add npc color, update leader background
2013-11-24 10:49:33 +11:00
Tyler Renelle
33c2c1db2d
Merge pull request #1888 from HabitRPG/sabe_tweak
...
Fix matters of colons
2013-11-23 14:45:45 -08:00
Tyler Renelle
c5a42cbf5a
Merge pull request #1899 from Fandekasp/header_colors
...
change avatars lvl colors
2013-11-23 13:12:36 -08:00
Nick Gordon
4453ac9fb8
removed comments from testing.
2013-11-23 11:14:16 -08:00
Nick Gordon
52145a479e
testing completed, committing test results in comments
2013-11-23 10:55:56 -08:00
Nick Gordon
40de2f3bf0
manual testing of bindonce commencing -____-
2013-11-23 09:26:39 -08:00
Matteo Pagliazzi
1dfd3b8b05
remove code moved in previous commit
2013-11-23 17:45:03 +01:00
Matteo Pagliazzi
df5a436338
use countPets also for stats, fix #1898
2013-11-23 17:42:47 +01:00
Sabe Jones
baf89c7023
Merge branch 'develop' into sabe_tweak
2013-11-23 09:48:15 -06:00
Sabe Jones
0d6f3dd5e6
Make number format consistent between current exp and exp TNL ( fix #1827 )
2013-11-23 09:46:28 -06:00
Adrien Lemaire
d4b25fdc5f
change avatars lvl colors
2013-11-24 01:04:27 +11:00
Sabe Jones
983df5c97c
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-23 06:54:00 -06:00
Adrien Lemaire
b36a288f04
add sort by date joined option
2013-11-23 22:06:22 +11:00
Adrien Lemaire
cef1e07b18
add migration script → default 'random'
2013-11-23 22:03:13 +11:00
Adrien Lemaire
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
Adrien Lemaire
5579030d20
party.order set and cases added
2013-11-23 21:18:33 +11:00
snicker
6eed685004
Merge pull request #1892 from snicker/develop
...
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 23:01:15 -08:00
Nick Gordon
90582c3709
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 22:57:41 -08:00
snicker
11bf814151
Merge pull request #1891 from snicker/develop
...
reverting more bindonce changes...
2013-11-22 22:47:36 -08:00
Nick Gordon
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
Tyler Renelle
123c515cbb
challenges: only push history for dailies / habits
2013-11-22 23:22:24 -07:00
Sabe Jones
9e5e035c6e
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-22 23:22:47 -06:00
Adrien Lemaire
be4691cf58
sort by level
2013-11-23 16:21:43 +11:00
snicker
306e235ef7
Merge pull request #1887 from snicker/develop
...
some style fixes for markdown in chat
2013-11-22 21:17:35 -08:00
Nick Gordon
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
Tyler Renelle
18d6bed3b8
[ #1879 ] separate task schema types into habitschema, dailyschema, etc to reduce server load and to ensure the proper default type (some people are getting habits in the wrong columns)
2013-11-22 17:07:27 -07:00
snicker
3bc285f281
Merge pull request #1886 from snicker/develop
...
Yeah, this didn't work with the achievements popup
2013-11-22 16:02:28 -08:00
Nick Gordon
dfb09b1f9b
Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal
2013-11-22 15:59:53 -08:00
Tyler Renelle
fac99c7f7f
[ #1862 ] re-migrat users with items.pets, items.hatchingPotions, or
...
items.eggs which are arrays, not objects. This shouldn't be happening
still, need to investigate
2013-11-22 16:22:09 -07:00
