sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3989 commits 3 branches 0 tags 1.6 GiB
Commit graph

334 commits

Author SHA1 Message Date
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
d1a34f570d customizations: migrate skins for more PCs, start building out migration 2013-12-14 16:12:41 -07:00
Tyler Renelle
dc348d5601 [#1969] add in @Fandekasp's shirts, had to do separate commit for handling of 
user.preferences.shirt
 2013-12-14 00:35:03 -07:00
Tyler Renelle
549add08ed classes: 2gems / new hair,beard,stache 2013-12-13 22:56:00 -07:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
b5a4177719 separate saddle out to it's own market section 2013-12-12 18:38:05 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared 
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
 2013-12-11 21:42:57 -07:00
Sabe Jones
847f090b7a Remove "yet" from no-food message 
Fix pet peeve :trombone:
 2013-12-08 21:25:34 -06: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
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -07:00
Tyler Renelle
714dad6e91 classes: small bug fixes 2013-12-07 20:41:48 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle
79e8b2f4a5 Revert "mounts: temporarily remove mounts code from views. merging to master so" 
This reverts commit d245c87f29.
 2013-12-07 11:34:53 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items, 
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
 2013-12-06 15:41:58 -07:00
Tyler Renelle
3e5c213694 classes armory: separate gear listings by class type, show selected gear 2013-12-06 09:26:02 -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
5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle
2563ec5763 classes: beards & mustaches! 2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900 classes: fixes to class-selection & reroll, remove show/hide gear since 
we're using costumes
 2013-12-04 23:53:55 -07:00
Tyler Renelle
5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d classes: fix customizations based on habitrpg-shared#9821a88 2013-12-04 15:09:56 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Sabe Jones
37f7a923ea Fix #1934 (make Reset and Restore options more distinct) 2013-12-02 10:20:38 -06:00
Sabe Jones
af80548a34 Partial fix to #1938 (New name and location for Re-Roll) 2013-12-01 11:58:03 -06: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
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07: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
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
aca122d6de fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -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
c0a02eeef8 support for xml and json export of all user data 2013-11-25 08:06:27 -08: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
Sabe Jones
f7908ddbcb Correct and clarify some details on contributor rewards 2013-11-24 09:50:21 -06:00
Sabe Jones
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
Sabe Jones
9086ccffcd Consistent formatting of markdown hint in group edit fields 2013-11-24 07:41:41 -06:00
Sabe Jones
2101fe255f Place link to Markdown help prominently in Tavern chat (fix #1906) 2013-11-24 07:35:12 -06: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
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07: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
Adrien Lemaire
dcd0e7e95b add setting in Social→Party→Members 2013-11-23 21:59:58 +11: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
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
Nick Gordon
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
Nick Gordon
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
Nick Gordon
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
Nick Gordon
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
Tyler Renelle
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
Bob Steffes
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
Adrien Lemaire
e240a4404f reorganize menus 2013-11-19 11:22:41 +11:00
Adrien Lemaire
7c15f09e03 code logic to update preferences 2013-11-19 11:22:41 +11:00
Adrien Lemaire
0ce0823de4 update ui to test hidable gears 2013-11-19 11:22:41 +11:00
Tyler Renelle
a262828e09 Merge pull request #1847 from HabitRPG/sabe_tweak_3 
Work on standardizing terminology
 2013-11-17 12:22:40 -08:00
Matteo Pagliazzi
13856ce1ce Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-17 20:53:00 +01:00
Matteo Pagliazzi
a81e77f0ff update chat messages timestamp 2013-11-17 20:52:39 +01:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Sabe Jones
cb64ab5a7d Make it easier for people to find "how to contribute" wiki page 2013-11-17 08:09:23 -06:00
Matteo Pagliazzi
34d5eda736 [#1832] remove relative-date, use moment instead 2013-11-17 13:21:21 +01: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
Tyler Renelle
4fa4519b34 [#1829] sort challenge-box by creation date 2013-11-15 21:32:25 -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
2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle
05334550b0 [#1837] separate groups filter from "create new challenge"-available groups 2013-11-15 17:36:36 -08: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
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
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
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
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Tyler Renelle
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
Tyler Renelle
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
95c886eee8 Merge pull request #1811 from Fandekasp/update_contrib_link 
replace github contributing links → wikia link
 2013-11-13 23:26:19 -08:00
Tyler Renelle
aad8f80c9d Merge pull request #1795 from Fandekasp/remove_website 
remove broken website field from profile
 2013-11-13 23:09:27 -08:00
Adrien Lemaire
340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Nick Gordon
528fd5f067 case-insensitive highlighting for usernames in chat 2013-11-13 06:57:48 -08:00
Nick Gordon
0ac1f4e397 support for npc styling in autocomplete list to match messages 2013-11-12 21:45:31 -08:00
Tyler Renelle
56b1684a45 Merge pull request #1798 from snicker/develop 
Fixed issues with positioning of userlist
 2013-11-12 20:16:42 -08:00
Nick Gordon
66c0840e76 a few fixes and performance increases: 
* username autocompletes on click now instead of showing undefined
* an adjustable 'update interval' stops the huge performance hit by delaying events from firing until the user has stopped typing for a while
* nested controllers can cause issues because of prototypal inheritance if the models are not defined correctly... with ChatCtrl._chatMessage, this was the case. Modified it to fit in better with "best practices". See blog post here: http://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html
 2013-11-12 20:04:37 -08:00
Matteo Pagliazzi
be2010b0a2 add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code 2013-11-12 22:01:27 +01:00
Nick Gordon
edcafcc3ce Fixed issues with positioning of userlist 2013-11-12 07:41:26 -08:00