sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3808 commits 3 branches 0 tags 1.6 GiB
Commit graph

3808 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bob Steffes
2905a2777e Fix reposition of markdown formatting after 2 reverts 
What a mess, but I think it's oK now. Sorry.
 2013-11-30 16:37:04 -08:00
Bob Steffes
0dd911f2ba Revert "Re-modify position of markdown down formatting link" 
This reverts commit 7fdda14cb8.

Conflicts:
	views/options/social/tavern.jade
 2013-11-30 16:29:17 -08:00
Bob Steffes
b1e5ee6433 Revert "Reposition Markdown formatting link" 
This reverts commit 7fdda14cb8.

Conflicts:
	views/options/social/tavern.jade
 2013-11-30 16:26:35 -08:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
1000796ddd Merge pull request #1946 from theyliveforever/develop 
Spanish translation revised
 2013-11-30 13:22:49 -08:00
Bob Steffes
bb3f0ae7ec Reposition markdown formatting link (3rd try) 
This replaces previous 2 commits. z-index has been removed.
 2013-11-30 12:07:23 -08:00
Bob Steffes
db7e582c95 Re-modify position of markdown down formatting link 
I think this one makes more sense than previous PR and it also adjust
spacing of Note. Still interested in feedback (would it make sense to
add to docs.css and call a class or just do it inline?

This is also first time, I've submitted a change to a pull request (and
I'm not sure what's gonna happen). Hopefully github is smart and just
modifies the previous commit (but we'll see).
 2013-11-30 10:21:32 -08:00
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07:00
Bob Steffes
7fdda14cb8 Reposition Markdown formatting link 
There's probably a better way to do this. Feedback welcome.
 2013-11-30 08:07:20 -08:00
Andrea
2cd35472fc Update app.json 2013-11-30 00:07:39 -02:00
Nick Gordon
9bb4e2c272 update userschema to use specialPets from habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/pull/45 2013-11-29 09:06:13 -08:00
Nicole Foster
e7373b173d JP translation fixes 2013-11-29 09:05:16 +11:00
Nicole Foster
20d7651a66 Some JP translations 2013-11-29 09:04:57 +11:00
Nick Gordon
5b610bfc5c small fix for sanity 2013-11-27 22:48:48 -08:00
Nick Gordon
62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
Nick Gordon
1d03fee4e3 change reference to images directory for emoji, fixes #1935 2013-11-27 20:46:18 -08:00
Tyler Renelle
63e44062b4 thanksgiving: newstuff too 2013-11-27 11:59:07 -07:00
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop 
Conflicts:
	views/options/social/tavern.jade
 2013-11-27 11:28:31 -07:00
Tyler Renelle
caaebe01a2 re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!) 2013-11-27 10:53:47 -07:00
Tyler Renelle
68bb5993c9 Merge pull request #1925 from bobbyroberts99/patch-1 
Update Contributing.md
 2013-11-27 08:26:18 -08:00
Matteo Pagliazzi
44401a9162 add emoji.js file to tests, fix travis build 2013-11-27 16:28:09 +01:00
Matteo Pagliazzi
bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +01:00
Matteo Pagliazzi
d3eed2282c fix custom day start, @lefnire we may have to restore old values or make a bailey announcement about this, also client-side the validation prevents deleting the old value, it only allows to use the increase/decrease button or selecting the old value and replacing it 2013-11-27 16:08:34 +01:00
Matteo Pagliazzi
a196cc0586 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-27 15:59:02 +01:00
Nick Gordon
4dbd2fd2f6 pointed to new repository with minifiable code for emoji parsing 2013-11-27 06:19:45 -08:00
Nick Gordon
13a7292377 emoji works, huzzah. addresses #681, #1840, and some discussion in #1908 2013-11-26 21:49:53 -08:00
Bob Steffes
29f0597178 Update Contributing.md 
Correct link to userID on wikia and make a few grammatical & punctuation changes.
 2013-11-26 20:03:52 -08:00
Adrien Lemaire
4af9d97c33 Update CONTRIBUTING.md 
add links to "Contributing to HabitRPG" and "Tips"
 2013-11-27 11:54:00 +11:00
Tyler Renelle
aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
Tyler Renelle
878c9756d1 add CONTRIBUTING.md, which will automatically add a "read this before 
submitting a ticket" kinda thing to issues.
 2013-11-26 16:58:01 -07:00
Nick Gordon
86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Tyler Renelle
2b128f71f4 [#1532] add better validation on preferences.dayStart, and a migration to 
cleanup corrupt ones
 2013-11-26 15:18:20 -07:00
Nick Gordon
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
Nick Gordon
15f3907f00 fix for #1920 2013-11-26 11:51:21 -08:00
Matteo Pagliazzi
860a084c69 fix for multiple guilds creation 2013-11-26 20:16:10 +01:00
Nick Gordon
878bfc7f46 removing sensitive user data from export 2013-11-26 06:48:18 -08:00
Sabe Jones
91a0b09470 Fix a few typos/inaccuracies in English app.json 2013-11-25 22:10:50 -06: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
Sabe Jones
780b0a3593 Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06: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