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

780 commits

Author SHA1 Message Date
Sabe Jones
601af6ddc0 Make better use of space for customizations and Market 2013-12-26 07:56:01 -06:00
Sabe Jones
3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Sabe Jones
e5b8a92ea2 Minimal fix for #2092 2013-12-25 23:56:51 -06:00
Sabe Jones
f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle
83817ec2ee bosses: add extra notes about losing quest scroll on abort 2013-12-25 11:20:38 -07:00
Tyler Renelle
44e89d1be7 bosses: misc small bugs 2013-12-25 00:55:38 -07:00
Tyler Renelle
f8559b1762 bosses: pretty things up amongst the modals, etc. Move rewards to a 
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
 2013-12-24 23:30:48 -07:00
Tyler Renelle
094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Sabe Jones
3b94b18bb6 Implement Rebirth in controllers and API, revise modal per @wc8 feedback 2013-12-24 18:09:32 -06:00
Tyler Renelle
ae403a55a5 quests: add abort feature 2013-12-23 02:56:55 -07:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Sabe Jones
485209ed74 Remove sliding effect on avatar mouseover 2013-12-22 12:20:35 -06:00
Sabe Jones
60c622f1c1 Initial commit: unlock notification, new modals 2013-12-22 08:32:39 -06:00
Tyler Renelle
61245e31b8 update justin guide re: todos adding 1MP 2013-12-21 18:50:18 -07:00
Tyler Renelle
181bc7f0d1 add justin notif on int bonus for restored MP 2013-12-21 15:22:20 -07:00
Tyler Renelle
8b8f385fff winter: make bailey head more visible with holiday gear (remember to 
revert this after 1/31!)
 2013-12-20 23:14:08 -07:00
Tyler Renelle
bf699ca466 Merge branch 'winter' into develop 2013-12-20 21:59:54 -07:00
Tyler Renelle
58195d9eeb #2012 preventDefault as well as stopPropagation. This will preven the 
checkbox from getting checked, which may not be desirable, but at least
 prevents the bug for now
 2013-12-20 19:57:03 -07:00
Tyler Renelle
a4ba5b036f save user on spell-cast (so we don't get second mp loss notif) 2013-12-20 18:52:14 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle
f4fca98bd1 fix #2058 double-task deletion 2013-12-19 21:45:52 -07:00
Tyler Renelle
06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Tyler Renelle
04df61fb53 fix #2030, immediately "fulfill" spell cast, don't wait for server response 2013-12-17 19:33:36 -07:00
Tyler Renelle
41cc6ff3bc fix #2032 - add button to show classes tour, mention 10pt/day mp regen 2013-12-17 19:22:21 -07:00
Tyler Renelle
d03a996946 classes: very simple "buffs applied" icon next to level, add chat message 
for party / member casts (@wc8 @sabrecat)
 2013-12-17 19:16:31 -07:00
Tyler Renelle
03c4a04ff5 classes: better-positioned justin 2013-12-17 17:24:14 -07:00
Tyler Renelle
c059cebdd1 Merge pull request #2027 from muncus/develop 
fix typo in Auto Allocate guide.
 2013-12-17 16:16:07 -08:00
Tyler Renelle
8833a4495d classes: much better justin guide which starts with 
equipment (and *shows* that you still have it), and *then* goes to
through the class system details (@wc8)
 2013-12-17 17:12:39 -07:00
Marc Dougherty
0bd61b90a9 fix typo in Auto Allocate guide. 2013-12-17 15:56:17 -08:00
Tyler Renelle
2efc0972d6 cleanup some inventory tabs. now it's inventory > drops, pet, mounts, equipment 2013-12-17 16:51:27 -07:00
Tyler Renelle
87f4a1d204 #2017 add ability to opt out of classes entirely (@wc8) 2013-12-17 16:44:46 -07:00
Tyler Renelle
ceea1b5909 #2008 add option to disable sticky header 2013-12-17 14:04:38 -07:00
Tyler Renelle
3b02717271 #2008 #2020 fixes to justin popovers so they don't go funky with sticky.js 2013-12-17 13:47:44 -07:00
Tyler Renelle
d2a460769d #2008 #2020 use jquery.sticky instead of bootstrap affix 2013-12-17 13:41:13 -07:00
Tyler Renelle
a79baba45c fix #2016 (grammar) 2013-12-17 12:02:11 -07:00
Tyler Renelle
2b7730b6e3 fix #2007 resotore MPfix restore mp 2013-12-17 09:17:41 -07:00
Tyler Renelle
949cd97b91 fix(#2003) healer gear not showing 2013-12-16 22:50:44 -07:00
Tyler Renelle
4650e2f592 classes: timeout on justin. would prefer of $state.go() had a callback param 2013-12-16 21:16:32 -07:00
Tyler Renelle
ee3e7c2032 [#1990] Spelling updates 2013-12-16 16:28:46 -07:00
Tyler Renelle
91f5da7989 [#1994] dismiss alert fix 2013-12-16 15:43:16 -07:00
Tyler Renelle
b908581473 [#1994] fix "can't add task to challenge" 2013-12-16 15:38:40 -07:00
Tyler Renelle
302340bee2 [#1997] classes: add MP to restore dialog (@wc8 you might find this useful) 2013-12-16 13:38:23 -07:00
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00
Tyler Renelle
7c2e803475 classes: charge gems for class-change 2013-12-16 11:47:55 -07:00
Tyler Renelle
a7100b6606 classes: cast URL fix 2013-12-16 00:18:50 -07:00
Tyler Renelle
616cf41017 MOBILE_APP on static, deep-watch user.items.gear.equipped 2013-12-15 23:17:09 -07:00
Tyler Renelle
07a27d1c22 use updateStore outside of user.fns (habitrpg-shared#5d39056) 2013-12-15 22:38:08 -07:00
Tyler Renelle
b9f8ae3f62 move userServices.js to habitrpg-shared, so mobile can share the code 2013-12-15 21:28:59 -07:00
Tyler Renelle
259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -07:00
Tyler Renelle
91e1287d06 APIv2: some finalization of APIv2. Add new routes, re-rigg 
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
 2013-12-15 16:53:06 -07:00
Tyler Renelle
d0b07ba4db apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops) 2013-12-15 14:16:04 -07:00
Tyler Renelle
12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Tyler Renelle
774775de7a fixes: appliedTags, add moment to rootScope (repeat i18n issues). Also, 
discard the sync-queue if errors were detected. Previously, if an op
triggered server error, the op is still in the queue and will keep
trying. Thus, in-browser user is corrupt - they'll need to logout /
clear localStorage. This *should* fix that, while still allowing the
sync-queue to build up when offline (status appears to == 0 in those
cases). @paglias just FYI - should be good, but wanna loop you in just
in case.
 2013-12-15 12:11:25 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Tyler Renelle
26697546e8 classes: header z-index:100, generalized shop_money classes, only show 
owned gear if == true
 2013-12-14 11:34:41 -07:00
Magnilucent
376e977238 Fixes #1959: petCount was only being updated... 
in groupsCtrl.js. This made profile.petCount blank unless the current
user viewed himself in chat. I put the code to set profile.petCount into
userCtrl.js.

Note: petCount (not profile.petCount) is still always equal to the
current user's pet count. There is probably a better solution than this,
I just don't know enough about AngularJS to make it.
 2013-12-14 02:38:08 -05:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -07:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -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
6b0a6692ff [#1977] misc fixes 2013-12-12 17:38:01 -07:00
Tyler Renelle
caa2f26003 [#1977] [#1616] move sortTask to user.ops 2013-12-12 17:32:54 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
d4e0ae85a0 [#1977] port pet-feeding to user.ops, so that it's now available in the API. Also add handling of 200 errors to simply notify and continue on up to server (friendly messages) 2013-12-12 15:58:17 -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
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
a3d2e59033 Merge pull request #1971 from Xatres/develop 
Updated Beginner's Tour, Mk 5
 2013-12-08 16:55:45 -08:00
Xatres
af82ff520c Updated Beginner's Tour, Mk 5 
Fixed Wiki link (double quotes --> single quotes)
 2013-12-08 18:59:38 -05:00
Tyler Renelle
542c72c95c Merge pull request #1957 from Xatres/develop 
Updated Beginner's Tour
 2013-12-08 09:01:11 -08: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
Xatres
8283eca0d4 Updated Beginner's Tour, Mk 4 
Added link to HabitRPG wiki.
 2013-12-08 09:54:36 -05: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
46f91db14c Mounts: prevent feeding special pets 2013-12-07 13:54:19 -07:00
Tyler Renelle
8f75b84b42 mounts: bugfix to drop notif for food 2013-12-07 12:17:03 -07:00
Tyler Renelle
e367985fa8 window.env not available on frontpage, @paglias is this an ok workaround? 2013-12-07 11:56:22 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Xatres
2d6fb91273 Updated Beginner's Tour, Mk 3 
Quickfix to changed "sex" to "body type," in anticipation of coming customization updates.
 2013-12-07 11:59:08 -05: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
Xatres
d2a0fb073f Updated Beginner's Tour, Mk 2 
Fixed issues proposed by SabreCat, including gender neutral language, general terminology, and adding a note about unlockable features at the end.
 2013-12-06 15:46:39 -05:00
Matteo Pagliazzi
9b459e37f3 fix siteVerion check & reload page after batchUpdate if needed, @lefnire let me know what do you think and if it needs to be applied to other routes too 2013-12-06 21:43:25 +01:00
Tyler Renelle
b852d9a9f2 classes #943 more general solution to two-handed weapons habitrpg-shared#41da82f 2013-12-06 11:46:07 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -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
469a1e5e12 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-12-05 21:50:47 -06:00
Tyler Renelle
7f1892b34a classes: move item-store sorting from web to shard (so we can share with 
mobile) habitrpg-shared#6651665
 2013-12-05 18:20:09 -07:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -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
62d50a1f4d classes: fixes to buying items 2013-12-04 23:10:14 -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
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
Xatres
a28327410e Updated Beginner's Tour 
As requested by SabreCat, I've done some editing on the Beginner's Tour. Mostly I just flesh out the guide to how the game works and try to contextualize everything on the page with the user avatar. If we implement these changes, there may need to be a few edits to the starting task descriptions to prevent overlap.

Definitely check to make sure I didn't mess up any of the coding. I'm a writer, not a programmer.
 2013-12-02 19:01:17 -05:00
Nick Gordon
aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08:00
Sabe Jones
30a5b349f8 Fix #1909 (keep stack selected after selling item) 2013-12-01 10:16:21 -06:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07: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
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
Matteo Pagliazzi
bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +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
13a7292377 emoji works, huzzah. addresses #681, #1840, and some discussion in #1908 2013-11-26 21:49:53 -08: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
Matteo Pagliazzi
860a084c69 fix for multiple guilds creation 2013-11-26 20:16:10 +01:00
Matteo Pagliazzi
c4e8de2ee0 fix language switching 2013-11-25 17:34:41 +01: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
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
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
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire
47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle
c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -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
Adrien Lemaire
d4b25fdc5f change avatars lvl colors 2013-11-24 01:04:27 +11:00
Adrien Lemaire
b36a288f04 add sort by date joined option 2013-11-23 22:06:22 +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
Adrien Lemaire
be4691cf58 sort by level 2013-11-23 16:21:43 +11: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
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
Matteo Pagliazzi
e722a064c8 revert drop notification change 2013-11-22 20:11:35 +01:00
snicker
b723bc17dd Merge pull request #1880 from snicker/develop 
super awesome mega-fix with unintended awesome collateral-fixes
 2013-11-22 10:49:25 -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
Matteo Pagliazzi
a8578602d7 fix drops not showing until refresh 2013-11-22 19:21:34 +01:00
Matteo Pagliazzi
8955fb5a39 typo 2013-11-20 21:44:20 +01:00
Matteo Pagliazzi
1a388fa994 fix #1803, when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code? 2013-11-20 21:36:18 +01:00
Matteo Pagliazzi
4bedefbc57 use helpers.countPets on server, fix client side pet count 2013-11-20 18:48:48 +01:00
Nick Gordon
afc9b6f62b chat highlights work properly when preceeded by spaces again 2013-11-20 06:46:07 -08:00
Nick Gordon
46410bc244 accomodate longer titles per #1855 2013-11-19 06:39:14 -08:00
Adrien Lemaire
7c15f09e03 code logic to update preferences 2013-11-19 11:22:41 +11:00
Matteo Pagliazzi
557d65a626 do not count rare pets into pet counts & fix beast master achievement 2013-11-18 16:18:57 +01: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
b701e2b24a Go with the borderless option 2013-11-17 10:21:43 -06:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Sabe Jones
44a82c71e2 Remove bland/harsh border styling on eggs and avatar options. Falls back to a button look that's much nicer. 2013-11-17 07:40:19 -06:00
Matteo Pagliazzi
b83eb0ee28 moment is exported as an helper by habitrpg-shared 2013-11-17 13:28:57 +01: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
b9d3b3a1a7 admin: refresh contrib list when saving a member 2013-11-15 20:06:18 -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
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
9b1c8884a4 [#1735] fix repeated timezone setting for UK users 2013-11-14 21:29:34 -08:00
Tyler Renelle
3461d67995 challenges: include challenges that user created, or belongs to, even if 
not in group anymore
 2013-11-14 20:30:48 -08:00
Tyler Renelle
4c3f04cc49 Merge branch 'mounts' into develop 
Conflicts:
	views/options/inventory/stable.jade
 2013-11-14 13:04:44 -08:00
Matteo Pagliazzi
c256295d6f fix tests, @lefnire not the best solution but it works 2013-11-14 14:48:36 +01:00
Matteo Pagliazzi
0c40d44de7 remove clientSideStrings part, stringNotFound added to locales/en/app.json, should be added to other languages, readme updated, $rootscope.translations removed 2013-11-14 14:41:42 +01:00
Matteo Pagliazzi
c75bfaa4d9 remove $rootScope.translations, it should not be necessary, update readme 2013-11-14 14:16:46 +01: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
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
153d1957a8 clean code from websites 
Need review !
 2013-11-14 15:20:35 +11:00
Matteo Pagliazzi
83d9368c2e translations: move some computations to server start-up, remove console.log, add translations to $rootScope, update readme, update user.preference.language if not set 2013-11-13 22:01:02 +01: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
Matteo Pagliazzi
8a2059ee2f typo 2013-11-12 16:24:22 +01:00
Matteo Pagliazzi
d797c21075 emit event when user is synced and update code to use it 2013-11-12 16:23:21 +01:00
Matteo Pagliazzi
5ddf54466c can change language from setting 2013-11-12 16:13:35 +01:00
Adrien Lemaire
4980a2e6b5 remove groups websites 2013-11-12 22:25:40 +11:00
Tyler Renelle
32a94871d2 Merge pull request #1796 from snicker/develop 
Autocompletion of nicknames in chat
 2013-11-12 00:17:29 -08:00
Nick Gordon
cd693835ce Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages 2013-11-11 22:32:52 -08:00
Tyler Renelle
ed8e749b11 Merge pull request #1778 from nafoster/develop 
Added even spacing between limited edition skins and rainbow skins
 2013-11-11 19:25:28 -08:00
Tyler Renelle
2978842d23 [#1781] challenges: select-all / select-none buttons 2013-11-11 19:00:43 -08:00
Tyler Renelle
bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle
e990850b01 mounts: new saddle logic. saddles don't drop, can only purchase for 
5G. Saddle instantly raises pet=>mount (full 50pts). Saddles no longer
required as "finisher" item. (@lemoness)
 2013-11-10 20:23:14 -08:00
Tyler Renelle
543635dd37 mounts: change growth-points requirement to 50 (@lemoness) 2013-11-10 19:20:34 -08:00
Tyler Renelle
05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle
4c15905cd9 mounts: block creating mount if they already have it 2013-11-10 15:13:50 -08:00
Tyler Renelle
cd79649100 mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount 2013-11-10 13:43:11 -08:00
Tyler Renelle
284114c056 mounts: counting bug fixes, put pets & mounts in tabs 2013-11-10 12:28:08 -08:00
Tyler Renelle
085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Nicole Foster
95031fb6ee Even space between limited edition skins and rainbow skins 2013-11-09 15:25:31 -05:00
Matteo Pagliazzi
daf33f9174 remove console.log 2013-11-08 22:37:40 +01:00
Matteo Pagliazzi
9f326e7433 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-08 22:34:28 +01:00
Matteo Pagliazzi
3a332c4c45 port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting 2013-11-08 22:33:48 +01:00
Tyler Renelle
4b35551afc confirm "trigger new day" 2013-11-08 09:18:03 -08:00
Matteo Pagliazzi
02651d52a4 solve conflict 2013-11-08 17:05:03 +01:00
Matteo Pagliazzi
a78297f129 update chat if necessary after new message posted or deleted 2013-11-08 17:03:10 +01:00
Tyler Renelle
06d1f77ce5 contribu: cleanup tavern, add legend for contrib tiers 2013-11-07 17:25:58 -08:00
Tyler Renelle
962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Tyler Renelle
d679fa1e62 contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor 2013-11-06 15:59:56 -08:00
Matteo Pagliazzi
3b18c322bc return whole group.chat after chat message is sent 2013-11-06 21:27:24 +01:00
Matteo Pagliazzi
36e45a36a2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-06 20:33:10 +01:00
Matteo Pagliazzi
a4951e151c use $resource class methods to avoid sending whole model to server & reduce some responses 2013-11-06 20:31:39 +01:00
Matteo Pagliazzi
21509047bb ops, jquery.cookie is used by bootstrap-tour! 2013-11-06 20:12:58 +01:00
Tyler Renelle
22b70b9a0a add message about clearing completed todos if length>100 2013-11-05 18:40:23 -08:00
Tyler Renelle
188db745fc allow users to trigger "missed day" manually from Restore modal 2013-11-05 17:43:43 -08:00
Matteo Pagliazzi
d0c29eba78 move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build 2013-11-04 22:13:03 +01:00
Matteo Pagliazzi
63b4e5152e better fix #1740 2013-11-04 15:21:05 +01:00
Matteo Pagliazzi
774ded9fb2 fix #1740 2013-11-04 15:17:09 +01:00
Tyler Renelle
4f52c7e15d [#1722] have to click twice for options.profile.profile 2013-11-04 00:41:16 -08:00
Tyler Renelle
de05d7dfda [#1735] fix to 6f6df94 2013-11-03 18:00:26 -08:00
Tyler Renelle
6f6df94ce7 [#1735] save timezone to userobj in browser as well as sending to server, 
so we don't hit an infinite loop
 2013-11-03 17:47:38 -08:00
Tyler Renelle
557ce59c71 back to non-halloween NPCs 2013-11-03 17:44:46 -08:00
Matteo Pagliazzi
33c78c7168 more fixes for guild leaving 2013-11-03 12:12:43 +01:00
Matteo Pagliazzi
126fd55ec6 update guild member count 2013-11-03 12:00:57 +01:00
Matteo Pagliazzi
06f6dc0a43 better guild join/leave 2013-11-03 11:58:42 +01:00
Tyler Renelle
646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't 
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
 2013-11-02 16:07:12 -07:00
Matteo Pagliazzi
d024470abe update gem count after guild creation 2013-11-02 10:04:31 +01:00
Matteo Pagliazzi
b08a30a76b Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-02 09:54:44 +01:00
Matteo Pagliazzi
5a103db716 upgrade lodash to 2.2.1 2013-11-02 09:52:48 +01:00
Tyler Renelle
08498e37ac [#1718] don't 404 for group not found 2013-11-02 01:38:51 -07:00
Matteo Pagliazzi
898adfdc13 fix when leaving public guild 2013-11-02 09:34:56 +01:00
Tyler Renelle
8ae75e09c5 [#1716] use ui-router to collapse challenge participants (WIP) 2013-11-01 23:46:14 -07:00
Tyler Renelle
87bc7fd722 [#1710] fix to party-in-header 2013-11-01 20:32:43 -07:00
Tyler Renelle
62b2d5780b [#1710] some simplification on Groups memoization. No need for all that 
special handling of Header Party, just have it's own controller and do
specific-handling. Also, removing MenuCtrl & StatsCtrl - they weren't
used TMK, I think twas a vestige of mobile. @paglias give that a gander
 2013-11-01 20:15:04 -07:00
Matteo Pagliazzi
03b945d755 update memberCount & typo 2013-11-01 21:18:31 +01:00
Matteo Pagliazzi
f7dba5f323 avoid reloading for group operations 2013-11-01 21:08:36 +01:00
Matteo Pagliazzi
2da33b0355 add loading bar to front page too 2013-11-01 21:07:44 +01:00
Matteo Pagliazzi
eccc9a7953 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-01 18:33:54 +01:00
Matteo Pagliazzi
3562079ba6 small design tweaks, fix #1682 2013-11-01 18:33:50 +01:00
Tyler Renelle
7037e1c8eb [#1672] don't allow clicking checkboxes on challenge-editing page 2013-11-01 10:20:14 -07:00
Tyler Renelle
dfeae89a07 challenges: minimum 1 gem for public challenges 2013-10-31 19:30:07 -07:00
Tyler Renelle
0ce76ee689 [#1673] challenges: better tag-syncing, show tag bull-horn 2013-10-31 17:49:51 -07:00
Tyler Renelle
baf52db594 [#1670] don't refresh on challenge create/join/leave (meh, workaround) 2013-10-31 16:39:26 -07:00
Tyler Renelle
d8218927e5 add debug buttons back in, including +10 gems (@sabrecat) 2013-10-31 15:14:19 -07:00
Tyler Renelle
39821752fa challenges: move options/challenges to options/social/challenges 2013-10-31 14:37:04 -07:00
Tyler Renelle
d5e78266e5 challenge prize: various fixes. Woo, challenge prizes work now! 
@sabrecat @lemoness @wc8 (still some bugs & cleanup, but it's mostly there)
 2013-10-31 14:06:18 -07:00
Tyler Renelle
693061c77b challenge prize: award winner 1 achievement and challenge.prize gems. then close challenge. 2013-10-31 13:57:12 -07:00
Tyler Renelle
f6ebd9997e challenge gems: popover for closing (delete or select winner) 2013-10-31 13:26:18 -07:00
Tyler Renelle
13fa947c57 challenge prize: add to challenge creation form (including min/max validation) 2013-10-31 11:44:50 -07:00
Tyler Renelle
7b15a0055a [#1680] fix tavern chat 2013-10-31 09:44:47 -07:00
Matteo Pagliazzi
70c630fcc9 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-10-31 17:35:20 +01:00
Matteo Pagliazzi
904677e3a6 try to limit need to refresh after party operations, @lefnire this is only for parties and I got it working only for removeMember and leave party because I could not get join & create working 2013-10-31 17:35:04 +01:00
Tyler Renelle
931e8125b4 [#1693] make revive available to /options too 2013-10-31 09:34:12 -07:00
Matteo Pagliazzi
fc10e9d6e6 move party.removeSelf to client side 2013-10-31 15:41:22 +01:00
Tyler Renelle
f5a1ec96f9 [#1679] wrong cancel check 2013-10-31 01:24:47 -07:00
Tyler Renelle
d2c50dc02f challenges: GET /groups now returns a merged array of groups, rather 
than structured object of {public,guilds,party,tavern}. I was having
trouble with ngResource without doing this, @paglias let me know what
you think
 2013-10-30 15:14:08 -07:00
Tyler Renelle
28cdeb0ac6 challenges: fixed joining / leaving groups. Back to the old method of Group.query({type:'public'}), etc - since ngResource can only work with top-level objects. This approach is bad performance (two calls), I'll fix when I can think of a better way of organizing groups requested at GET /groups 2013-10-30 14:50:49 -07:00
Matteo Pagliazzi
e2331e5194 added growl style notification for errors 2013-10-30 19:29:46 +01:00
Matteo Pagliazzi
1490380e53 @lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think 2013-10-30 19:13:21 +01:00