sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 20:49:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4834 commits 1 branch 0 tags 1.6 GiB
Commit graph

60 commits

Author SHA1 Message Date
Tyler Renelle
8c23bd0d21 chore(april-fools): revert april fools 2014-04-02 00:05:33 -06:00
Tyler Renelle
71a23096cc feat(april-fools): april fools (revert here when done) 2014-03-31 20:12:16 -06:00
Lorian
94480d8cdb Added a second message under the "rest at the inn" button, explaining how the inn interacts with boss fights. 2014-02-17 13:43:27 -08:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle
313ec3d869 Merge branch 'develop' into bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 23:41:14 -07:00
deilann
25941623b1 putting in issue ticket 
correctly putting in issue ticket for "report a bug"
 2014-02-07 17:44:56 -08:00
Tyler Renelle
ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 00:03:33 -07:00
deilann
66c7f48e2b updating LFG 
Updating Looking for Group to the proper (not dead) link.
 2014-02-06 11:37:35 -08:00
Matteo Pagliazzi
e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Matteo Pagliazzi
b6edc28b14 refactor(bs3): merge develop 2014-02-06 16:19:51 +01:00
Marcelo Sizer
386d108c3c Replace hard-coded strings for window.env.t on js files 2014-02-05 20:43:49 -02:00
deilann
908a5a2408 updating tavern link to new issue ticket 
Explains how Github works. Should reduce number of dupe tickets.
 2014-02-05 13:07:56 -08:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Marcelo Sizer
44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Marcelo Sizer
aeb705b652 style(tavern): add space between 2 and gems 2014-01-29 17:38:32 -02:00
Matteo Pagliazzi
abdbaa6fe3 Merge pull request #2583 from Sinza-/split-main-json 
Split main.json
 2014-01-28 10:25:31 -08:00
Marcelo Sizer
06200accad fix(translation): Fix #2585. 
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
 2014-01-27 14:21:50 -02:00
Marcelo Sizer
8f4016d669 Split main.json 2014-01-26 17:30:41 -02:00
Matteo Pagliazzi
5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Marcelo Sizer
fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Matteo Pagliazzi
13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Luveluen
6f3229c679 Update tavern.jade 2014-01-23 10:16:32 +01:00
Luveluen
0fb8ec9a8b Update tavern.jade 
line 68 and following after confirmation
 2014-01-23 00:04:17 +01:00
Sabe Jones
c1fa5a79ab Fix #2438 
Bosses damage you for party members' misses, not your own undone Dailies, while you're in the Inn.
 2014-01-16 21:09:15 -06:00
Aiseant
e9715f36b8 Update tavern.jade 
Add infos about resting while on Boss quest
 2014-01-15 11:37:02 +01:00
Bob Steffes
fcf1788357 Update Tavern.jade 
I changed the name of wiki forum so it didn't display as "LFG Board board" which broke the link.
 2014-01-10 08:48:14 -08:00
Tyler Renelle
36d32d6b16 update forum & lfg links 2014-01-09 20:48:36 -07:00
Sabe Jones
111651da1e Fix tier labels no longer providing info on click 2014-01-08 18:49:53 -06:00
Sabe Jones
0a959b5f92 More UI demystification 2014-01-07 22:56:18 -06:00
Bob Steffes
ae84ebc47c Change link to Trello feature request card 
Instead of linking to the Board it now links directly to the card
 2013-12-27 08:50:08 -07:00
Bob Steffes
8578c33c07 Add wiki glossary to tavern 
My local repo is behind and ahead so I'm submitting from GitHub. Not sure how to fix, so if there a bunch of old commits, please ignore. This is the only active one I've got going.
 2013-12-21 13:57:02 -08:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Tyler Renelle
ae4ca337c8 Merge pull request #1949 from bobbyroberts99/develop 
Reposition Markdown formatting link
 2013-12-14 21:21:45 -08:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
b6fceaca1b fix some tavern links 2013-12-08 19:55:49 -07:00
Tyler Renelle
76565384d3 Merge branch 'classes' into develop 
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
 2013-12-08 18:17:53 -07:00
Sabe Jones
dd8b38ca04 Answer tavern FAQ in resource links 2013-12-06 06:34:54 -06:00
Tyler Renelle
e5c34af7fd grunt-spritesmith contrib gear habitrpg-shared#69d248f 2013-12-05 15:47:08 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
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
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
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
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
aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00