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
2968 commits 3 branches 0 tags 1.6 GiB
Commit graph

1014 commits

Author SHA1 Message Date
Tyler Renelle
89fabc38cb add "member since" in modal 2013-09-09 18:56:46 -04:00
Tyler Renelle
ddf700d930 misc chat-box tweaks 2013-09-09 18:28:46 -04:00
Tyler Renelle
8cc96422f6 inline modal for tavern too 2013-09-09 18:04:42 -04:00
Tyler Renelle
e1828153dd [#1489] add edit-gropu server route, basic editing of group info for now (with markdown!) 2013-09-09 17:09:45 -04:00
Tyler Renelle
f5b1748d60 [#1489] use always-visible modals (what will be Panels in BS3) instead of 
accordion. Accordions giving me headache
 2013-09-09 16:34:41 -04:00
Tyler Renelle
09963ee30a [#1489] WIP start adding group edit. remove angular-ui-bootstrap accordion as it 
was causing problems.
 2013-09-09 16:15:57 -04:00
Tyler Renelle
774fa4f645 use marked instead of showdown, it's more performant and allows us to 
sanitize the content
 2013-09-09 14:06:36 -04:00
Tyler Renelle
6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky 
once everything's in markdown
 2013-09-09 13:27:25 -04:00
Tyler Renelle
3929c789d1 [#1479] fix to modals showing your own achievemetns (controller-scoping issue) 2013-09-09 10:30:17 -04:00
Tyler Renelle
4caec6f737 [#1444] implement delete-tag (incl server route). run tags-cleanup migration 2013-09-09 00:04:02 -04:00
Tyler Renelle
9690c7112f login form: set method='POST' & remove dymamic calculating of input 
fields, since we now have the facebook button #1464 #1446 #1246
 2013-09-08 22:49:13 -04:00
Tyler Renelle
55dffcc317 [#1476] re-order "you already have this combo" message to bail early 2013-09-08 22:42:59 -04:00
Tyler Renelle
a461bda7b8 [#1491] remove old.habit from bailey notif 2013-09-08 22:01:20 -04:00
Tyler Renelle
fb2f048890 add mobile links to footer 2013-09-08 19:11:08 -04:00
Tyler Renelle
52b7935b88 [#1477] modal buttons bug-fix 2013-09-08 16:23:30 -04:00
Tyler Renelle
5c5212eb0e [#1477] add delete account 2013-09-08 15:17:49 -04:00
Tyler Renelle
f250a98fb7 [#1477] add reset account 2013-09-08 15:11:04 -04:00
Tyler Renelle
5e51148f8e [#1477] port settings modals to jade, implemented restore 2013-09-08 13:23:37 -04:00
Tyler Renelle
aad034564e [#1459] add profile-editing (note, it requires bluring the input fields for 
changes to go through - this is a pretty assuming solution, but I doubt it
will cause problems)
 2013-09-08 12:28:06 -04:00
Tyler Renelle
0b34b41bbe fix to toggle helm 2013-09-08 11:39:30 -04:00
Matteo Pagliazzi
c9f3d3029c delete chat message 2013-09-08 17:22:03 +02:00
Tyler Renelle
d7b21eb32a typo fixes 2013-09-08 10:17:27 -04:00
Matteo Pagliazzi
5bd9d5f9d3 fix 2013-09-08 12:15:36 +02:00
Matteo Pagliazzi
75613b0508 add word-wrap to member modal, linky and <a> for website 2013-09-08 12:13:55 +02:00
Matteo Pagliazzi
5d160c7f21 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-09-08 11:59:35 +02:00
Tyler Renelle
a960d310f7 [#1465] allow clicking self for modal 2013-09-07 13:59:49 -04:00
Tyler Renelle
69faa27f68 [#1465] bug fixes to achievements listing 2013-09-07 13:38:43 -04:00
Tyler Renelle
a930d536f6 [#1465] add in some more missing member modal info.. still feel like i'm missing something.. 2013-09-07 12:55:15 -04:00
Tyler Renelle
91d1cdf361 [#1465] add member modals back in. Not all info is present, just a bit more 
work. Can now click guild & tavern members! does lazy-loading of members
so we don't have to load all their information at once
 2013-09-07 12:45:39 -04:00
Matteo Pagliazzi
dfa8dcba57 fix 2013-09-07 18:10:24 +02:00
Matteo Pagliazzi
4f9cf94574 fix #1438 2013-09-07 13:56:33 +02:00
Tyler Renelle
e23acc4c0a Merge branch 'paglias/grunt' into develop 2013-09-06 22:23:02 -04:00
Tyler Renelle
de0cdda833 remove extra "npc" from chat message 2013-09-06 21:18:41 -04:00
Tyler Renelle
5113ed192a add GET /groups/:gid, champ/elite/master tiers, chat sync button 2013-09-06 21:03:44 -04:00
Matteo Pagliazzi
9046bd5041 css 2013-09-06 21:39:18 +02:00
Matteo Pagliazzi
07ddd39856 fix for static pages 2013-09-06 19:50:14 +02:00
Matteo Pagliazzi
7cd075d787 initial grunt support, gzip enabled 2013-09-06 19:19:43 +02:00
Tyler Renelle
997b2b8ae4 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-06 09:55:36 -04:00
Tyler Renelle
e6d61d1145 [#1446] add change-password back in 2013-09-06 09:55:24 -04:00
Tyler Renelle
c12de954a4 [#1446] add password-reset (still need change password for this to be useful) 2013-09-06 09:33:23 -04:00
Matteo Pagliazzi
b477b0768a add space between user, message and data in tavern 2013-09-06 09:58:18 +02:00
Tyler Renelle
883d63aaaf [#1426] final touches to bailey notifs. 2013-09-06 01:05:23 -04:00
Tyler Renelle
4ea6a8e57f [#1439] target='_blank' on links 2013-09-06 00:39:29 -04:00
Tyler Renelle
56d44887d4 [#1439] add highlight back in for chat. use ngSanitize linky to add links in chat 2013-09-06 00:36:05 -04:00
Tyler Renelle
ef69309b0c [#1431] add temporary server-based pet-purchasing mechanism. Lotsa cleanup / 
refactoring to be had here
 2013-09-06 00:28:18 -04:00
Tyler Renelle
812ba3a339 [#1430] fix guild gems (math error) 2013-09-05 23:28:30 -04:00
Matteo Pagliazzi
bb4c0d2d69 non working market 2013-09-05 15:35:34 +02:00
Matteo Pagliazzi
f7d1159e06 fix inventory bugs 2013-09-05 14:26:35 +02:00
Tyler Renelle
512e891dc3 add cerberus to pets 2013-09-04 23:03:20 -04:00
Tyler Renelle
2f3da075f8 revive button name conflict! We gotta do somethign about shared/helpers 
exposed to the view
 2013-09-04 15:50:26 -04:00
Tyler Renelle
30da33d2f0 Merge pull request #1424 from lefnire/paglias/inventory 
Inventory (no market)
 2013-09-04 10:23:36 -07:00
Tyler Renelle
d7c6c15592 some more bailey updates 2013-09-04 13:13:23 -04:00
Matteo Pagliazzi
6b4d3db6bb delete old pets.html 2013-09-04 19:09:48 +02:00
Matteo Pagliazzi
ced69cb4d5 working inventory 2013-09-04 19:06:31 +02:00
Matteo Pagliazzi
a5e8817c85 initial inventory 2013-09-04 17:13:42 +02:00
Matteo Pagliazzi
16bc90acb1 remove moment and lodash, using from habitrpg-shared 2013-09-04 13:15:13 +02:00
Matteo Pagliazzi
cb350338ed manage local js with connect-assets 2013-09-04 12:54:15 +02:00
Tyler Renelle
f69abe4ca0 Merge pull request #1409 from lefnire/paglias/pets 
Stable
 2013-09-03 21:49:26 -07:00
Tyler Renelle
466c727d4e rewrite: facebook auth bug fixes. still not ideal solution, but it works 
for now
 2013-09-03 23:40:27 -04:00
Tyler Renelle
ceae8bf768 rewrite: start adding facebook auth. note, this isn't going to work properly due to issues outlined in http://stackoverflow.com/questions/14572600/passport-js-restful-auth . gotta figure something out here... 2013-09-03 23:20:31 -04:00
Tyler Renelle
e43740e939 update bailey notif 2013-09-03 20:08:49 -04:00
Tyler Renelle
5f2405a3f4 fix to #1401 "add task to empty list" 2013-09-03 19:48:10 -04:00
Tyler Renelle
16ee1c1d65 misc bug fixes 2013-09-03 19:11:52 -04:00
Tyler Renelle
6cd6c55e87 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-03 18:55:20 -04:00
Tyler Renelle
c2829382e8 small bailey pudate 2013-09-03 18:53:50 -04:00
Matteo Pagliazzi
dc96a97fe2 new path for habitrpg-shared 2013-09-03 17:12:17 +02:00
Matteo Pagliazzi
b69ce1b5d6 remove tooltip from rare pet 2013-09-03 12:08:54 +02:00
Matteo Pagliazzi
e41efa98e4 working stable 2013-09-03 12:05:54 +02:00
Matteo Pagliazzi
3fd290a3e1 non working stable choosePet 2013-09-03 10:32:06 +02:00
Tyler Renelle
3417e3a76b some NPC wording updates 2013-09-02 21:44:00 -04:00
Tyler Renelle
80fd023012 use cookieSession so we can launch in production mode 2013-09-02 21:38:05 -04:00
Tyler Renelle
d70c2c4040 coming soon notes 2013-09-02 20:16:08 -04:00
Tyler Renelle
62a10d4b28 cleanup 2013-09-02 19:03:45 -04:00
Tyler Renelle
4790e8442a fix up general bailey notifs 2013-09-02 17:31:44 -04:00
Tyler Renelle
7f68fd017a rewrite: add big update notification, small bug fixes 2013-09-02 17:15:12 -04:00
Tyler Renelle
687da68d52 rewrite: add read-only inventory. fix empty pet issue, it was the wrong 
casting type UserSchema.items.eggs.type
 2013-09-02 14:26:59 -04:00
Tyler Renelle
8482439617 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-02 12:05:46 -04:00
Matteo Pagliazzi
ddd312d530 enable rest 2013-09-02 15:47:44 +02:00
Tyler Renelle
b470abb441 small static-pages tweaks 2013-09-02 01:20:43 -04:00
Tyler Renelle
ef9e1f3444 rewrite: push login modal to the front page, don't allow anonymous 
usage.
 2013-09-02 01:08:28 -04:00
Tyler Renelle
834e2438b9 add a search option on guilds page 2013-09-01 22:32:32 -04:00
Tyler Renelle
f5f6c957de groups: try to update GroupsCtrl scope to notify of joined / left 
groups, not working
 2013-09-01 21:31:38 -04:00
Tyler Renelle
d0c915f58a fix create-guild 2013-09-01 21:03:05 -04:00
Tyler Renelle
010995b38b api: createGroup 2013-09-01 20:50:36 -04:00
Tyler Renelle
ac992ea865 groups: misc groups fixes 2013-09-01 20:24:44 -04:00
Tyler Renelle
872b834f07 rewrite: add sync button, menus now update when switching b/w options / tasks 2013-09-01 19:41:17 -04:00
Tyler Renelle
8142241544 rewrit: bug fix to chat not posting. this may cause perf issues, revisit 2013-09-01 19:23:16 -04:00
Tyler Renelle
6efd789e6d rewrite: fix user avatar stats 2013-09-01 13:55:45 -04:00
Tyler Renelle
3ba4330dfc rewrite: misc bug fixes 2013-09-01 13:44:52 -04:00
Tyler Renelle
fb0ffd075e rewrite: converted static pages, removed old unused static pages 2013-09-01 13:30:53 -04:00
Tyler Renelle
b22ccc0a23 app.js: intercept errors, show them on page, show loading screen in interceptor 2013-09-01 11:34:00 -04:00
Tyler Renelle
633d6fdb52 api: group invitations, leave, join 2013-09-01 11:33:39 -04:00
Tyler Renelle
2672b7f6ab rewrite: chat & leave-group bug fixes 2013-08-31 23:41:01 -04:00
Tyler Renelle
14ddad958e join & leave guilds 2013-08-31 23:35:53 -04:00
Tyler Renelle
bc4798b354 groups: big changes here i may decide to revert. GET /api/v1/groups 
optionally takes ?type=guilds (guilds, party, tavern, public). this
allows us to incrementally load the app as they click through the tabs,
because guilds is really large (1.5mb!) - gotta cut this down
somehow. The big issue is requireing return values as an array, so
ngResource can work with the response (subsequent group.$postChat(),
group.$join(), etc.). The array format doesn't really work out that
well, so I may scrap
 2013-08-31 22:59:35 -04:00
Tyler Renelle
524457b5d7 chat: keyup to trigger send message. ng-model on chat box is painfully 
slow! using jquery as workaround for now
 2013-08-31 20:52:41 -04:00
Tyler Renelle
e069718da7 rewrite: add basic chat functionality, `POST 
/api/v1/groups/:gid/chat` (which returns chat list). Some bugs present
 2013-08-31 19:14:58 -04:00
Tyler Renelle
62ebd9aae6 rewrite: misc. fixes, & back to bootstrap-vanilla tabs for 
options. angular-bootstrap tabs were too slow
 2013-08-31 18:17:57 -04:00
Tyler Renelle
45383a9630 rewrite & api: use mongoose populate to replace group.members array with 
popualte member objects. this puts a load on the front-end, we'll need
to optimize! also added some duplicates sanitization.
 2013-08-31 17:47:03 -04:00
Tyler Renelle
10ff61be91 rewrite: use vanilla bootstrap tabs for now, keep an eye on https://github.com/angular-ui/bootstrap/issues/783 2013-08-31 14:52:13 -04:00