Commit Graph

933 Commits

Author SHA1 Message Date
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