Commit graph

  • 774fa4f645 use marked instead of showdown, it's more performant and allows us to sanitize the content Tyler Renelle 2013-09-09 14:06:36 -0400
  • 6e800ea2d9 use markdown for profile-editing. Add save button. will remove linky once everything's in markdown Tyler Renelle 2013-09-09 13:27:25 -0400
  • 41cc18c1db [#1442] hotfix - put user.tasks back into the api for now Tyler Renelle 2013-09-09 11:43:24 -0400
  • 6591524079 fix to auth route to show if the problem was username, not just password Tyler Renelle 2013-09-09 11:01:57 -0400
  • 3929c789d1 [#1479] fix to modals showing your own achievemetns (controller-scoping issue) Tyler Renelle 2013-09-09 10:30:17 -0400
  • f5ecef7c34 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-09-09 09:12:18 -0400
  • 2230b67857 tmp hotfix, people still have null tasks? Cannot read property 'tags' of undefined Tyler Renelle 2013-09-09 09:12:00 -0400
  • 8d8734d157 update bower resolution Matteo Pagliazzi 2013-09-09 11:29:12 +0200
  • 6ce3488e67 set bootstrap-tour version to 0.5.0 Matteo Pagliazzi 2013-09-09 11:27:54 +0200
  • e7dbd2f9cb Acheivements and Other Items Benny Powers 2013-09-09 09:38:45 +0200
  • 1bcdcf8590 [#1444] bug fix Tyler Renelle 2013-09-09 00:13:11 -0400
  • 4caec6f737 [#1444] implement delete-tag (incl server route). run tags-cleanup migration Tyler Renelle 2013-09-09 00:04:02 -0400
  • f99b496a29 [#1444] add filters back to use schema. Allow editing of top-level tags object in PUT /user, WARNING! We want to get away from that ASAP and instead have a nested resource for managing tags. Set default task tags if not present, will revisit after tasks are a subdoc too Tyler Renelle 2013-09-08 23:28:34 -0400
  • 9690c7112f login form: set method='POST' & remove dymamic calculating of input fields, since we now have the facebook button #1464 #1446 #1246 Tyler Renelle 2013-09-08 22:49:13 -0400
  • 55dffcc317 [#1476] re-order "you already have this combo" message to bail early Tyler Renelle 2013-09-08 22:42:59 -0400
  • a461bda7b8 [#1491] remove old.habit from bailey notif Tyler Renelle 2013-09-08 22:01:20 -0400
  • ecc442285b [#1491] add user.loggedin on cron, some comments on remove-staging-users Tyler Renelle 2013-09-08 21:45:46 -0400
  • cbe23f638a [#1491] remove preen_cron, we won't be needing that anymore. add migration to remove all staged accoutns Tyler Renelle 2013-09-08 21:15:57 -0400
  • 40b0e13112 add HISTORY_PREEN.js, a script we need to add to cron function (TODO) Tyler Renelle 2013-09-08 21:10:42 -0400
  • 1101a1c3f3 [#1491] some bug-fixes to corruption-cleanup, remove some unecessary return-values on user route Tyler Renelle 2013-09-08 20:56:28 -0400
  • 56080db5a1 [#1491] start adding corruption-cleanup migration, including egg cleanup & granting gems for all broken eggs #1386 Tyler Renelle 2013-09-08 20:23:57 -0400
  • cc732c53a7 Update app.json Lolo le 13 2013-09-09 01:58:44 +0200
  • fb2f048890 add mobile links to footer Tyler Renelle 2013-09-08 19:11:08 -0400
  • 52b7935b88 [#1477] modal buttons bug-fix Tyler Renelle 2013-09-08 16:23:30 -0400
  • 5c5212eb0e [#1477] add delete account Tyler Renelle 2013-09-08 15:17:49 -0400
  • f250a98fb7 [#1477] add reset account Tyler Renelle 2013-09-08 15:11:04 -0400
  • 5e51148f8e [#1477] port settings modals to jade, implemented restore Tyler Renelle 2013-09-08 13:23:37 -0400
  • d471688c54 Merge branch 'develop' of github.com:lefnire/habitrpg into develop Tyler Renelle 2013-09-08 12:29:37 -0400
  • 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) Tyler Renelle 2013-09-08 12:28:06 -0400
  • bfe7aec583 fix error code Matteo Pagliazzi 2013-09-08 18:02:28 +0200
  • 8fde22c0c4 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop Matteo Pagliazzi 2013-09-08 17:42:43 +0200
  • e67bb5b9e8 fix delete chat message Matteo Pagliazzi 2013-09-08 17:42:20 +0200
  • 0b34b41bbe fix to toggle helm Tyler Renelle 2013-09-08 11:39:30 -0400
  • c9f3d3029c delete chat message Matteo Pagliazzi 2013-09-08 17:22:03 +0200
  • d7b21eb32a typo fixes Tyler Renelle 2013-09-08 10:15:22 -0400
  • 838d41a94e [#1469] add seed.js to initialize new projects with tavern, and anything else we may need later Tyler Renelle 2013-09-08 10:14:10 -0400
  • 5bd9d5f9d3 fix Matteo Pagliazzi 2013-09-08 12:15:36 +0200
  • 1ab002b6d7 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop Matteo Pagliazzi 2013-09-08 12:14:31 +0200
  • 75613b0508 add word-wrap to member modal, linky and <a> for website Matteo Pagliazzi 2013-09-08 12:13:55 +0200
  • 7842b18242 Merge pull request #1474 from Shaners/patch-1 Matteo Pagliazzi 2013-09-08 03:11:09 -0700
  • 5d160c7f21 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop Matteo Pagliazzi 2013-09-08 11:59:35 +0200
  • 790d1e460d Update README.md Shane Lister 2013-09-07 23:07:29 -0700
  • e2f951e138 userSchema.lastCron.default new Date => Date.now Tyler Renelle 2013-09-07 20:24:25 -0400
  • 5cb6e7e0dd fixes to emailing errors Tyler Renelle 2013-09-07 20:13:02 -0400
  • 08f4d5fe20 [#1470] set user.lastCron to type=Date in model Tyler Renelle 2013-09-07 20:00:39 -0400
  • 0ccdb48751 [#1468] hatchingPotion purchasing fix. also some temp hacks to get the UI to update Tyler Renelle 2013-09-07 19:06:41 -0400
  • 5cb8238b7c change badge from master => royal Tyler Renelle 2013-09-07 15:31:36 -0400
  • a960d310f7 [#1465] allow clicking self for modal Tyler Renelle 2013-09-07 13:59:49 -0400
  • b820417953 slight updates to chat colors Tyler Renelle 2013-09-07 13:44:08 -0400
  • 69faa27f68 [#1465] bug fixes to achievements listing Tyler Renelle 2013-09-07 13:38:43 -0400
  • a930d536f6 [#1465] add in some more missing member modal info.. still feel like i'm missing something.. Tyler Renelle 2013-09-07 12:55:15 -0400
  • 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 Tyler Renelle 2013-09-07 12:45:39 -0400
  • dfa8dcba57 fix Matteo Pagliazzi 2013-09-07 18:10:24 +0200
  • 28e2cb32f2 update procfile for heroku. @paglias this is the heroku script-runner btw Tyler Renelle 2013-09-07 10:54:03 -0400
  • 796f29e014 Merge pull request #1462 from lefnire/paglias/grunt2 Tyler Renelle 2013-09-07 07:51:39 -0700
  • d30d20d987 add margin to chat-btn Matteo Pagliazzi 2013-09-07 15:16:49 +0200
  • 4f9cf94574 fix #1438 Matteo Pagliazzi 2013-09-07 13:55:48 +0200
  • 40d6df1776 grunt v2 Matteo Pagliazzi 2013-09-07 12:47:44 +0200
  • 4e10fc65cf remove old comment Matteo Pagliazzi 2013-09-07 10:37:47 +0200
  • f1dc9e7f90 disable calendar for now Tyler Renelle 2013-09-06 22:59:36 -0400
  • 6b960fba6a edit procfile (heroku Foreman) to run grunt start:production Tyler Renelle 2013-09-06 22:38:40 -0400
  • e23acc4c0a Merge branch 'paglias/grunt' into develop Tyler Renelle 2013-09-06 22:23:02 -0400
  • de0cdda833 remove extra "npc" from chat message Tyler Renelle 2013-09-06 21:18:41 -0400
  • 5113ed192a add GET /groups/:gid, champ/elite/master tiers, chat sync button Tyler Renelle 2013-09-06 21:03:44 -0400
  • b0bf1d4c58 finish Matteo Pagliazzi 2013-09-06 22:33:00 +0200
  • 9046bd5041 css Matteo Pagliazzi 2013-09-06 21:39:18 +0200
  • 479cd16835 [#1448] add resting flag to users Tyler Renelle 2013-09-06 15:10:47 -0400
  • e10735d38e [#1448] add resting flag to users Tyler Renelle 2013-09-06 15:07:08 -0400
  • 07ddd39856 fix for static pages Matteo Pagliazzi 2013-09-06 19:50:14 +0200
  • 7cd075d787 initial grunt support, gzip enabled Matteo Pagliazzi 2013-09-06 19:19:43 +0200
  • 997b2b8ae4 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite Tyler Renelle 2013-09-06 09:55:36 -0400
  • e6d61d1145 [#1446] add change-password back in Tyler Renelle 2013-09-06 09:55:24 -0400
  • c12de954a4 [#1446] add password-reset (still need change password for this to be useful) Tyler Renelle 2013-09-06 09:33:23 -0400
  • b477b0768a add space between user, message and data in tavern Matteo Pagliazzi 2013-09-06 09:58:18 +0200
  • 883d63aaaf [#1426] final touches to bailey notifs. Tyler Renelle 2013-09-06 01:05:23 -0400
  • 4ea6a8e57f [#1439] target='_blank' on links Tyler Renelle 2013-09-06 00:39:29 -0400
  • 56d44887d4 [#1439] add highlight back in for chat. use ngSanitize linky to add links in chat Tyler Renelle 2013-09-06 00:36:05 -0400
  • ef69309b0c [#1431] add temporary server-based pet-purchasing mechanism. Lotsa cleanup / refactoring to be had here Tyler Renelle 2013-09-06 00:28:18 -0400
  • 812ba3a339 [#1430] fix guild gems (math error) Tyler Renelle 2013-09-05 23:28:30 -0400
  • 9da6ddc7c7 Merge pull request #1431 from lefnire/paglias/market Tyler Renelle 2013-09-05 20:18:57 -0700
  • 1359de0a90 [#1398] add facebook registration Tyler Renelle 2013-09-05 23:14:25 -0400
  • ab756a8634 #1422 force ssl Tyler Renelle 2013-09-05 22:46:02 -0400
  • 86552c9296 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite Tyler Renelle 2013-09-05 22:33:41 -0400
  • 336c147dcb #1398 some more hackery to handling facebook auth. I really don't like this client-side return approach, but it's probably the only thing we can do sans a stateful server, which we're trying to avoi Tyler Renelle 2013-09-05 22:33:31 -0400
  • d1aec6636d Merge pull request #1435 from Shaners/patch-1 Tyler Renelle 2013-09-05 09:19:44 -0700
  • 66182d9cdc Update game-pane.styl Shane Lister 2013-09-05 09:17:41 -0700
  • 9c6d4deb85 minor fix Matteo Pagliazzi 2013-09-05 16:07:19 +0200
  • bb4c0d2d69 non working market Matteo Pagliazzi 2013-09-05 15:35:34 +0200
  • f7d1159e06 fix inventory bugs Matteo Pagliazzi 2013-09-05 14:26:35 +0200
  • 512e891dc3 add cerberus to pets Tyler Renelle 2013-09-04 23:03:20 -0400
  • 9a99cd430d rewrite: save task.tags Tyler Renelle 2013-09-04 17:54:07 -0400
  • 2f3da075f8 revive button name conflict! We gotta do somethign about shared/helpers exposed to the view Tyler Renelle 2013-09-04 15:50:26 -0400
  • 1e9ef6d2e2 re-build. was getting revive errors for some reason Tyler Renelle 2013-09-04 15:49:39 -0400
  • 7c6174e218 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite Tyler Renelle 2013-09-04 13:23:58 -0400
  • 30da33d2f0 Merge pull request #1424 from lefnire/paglias/inventory Tyler Renelle 2013-09-04 10:23:36 -0700
  • 2d53844984 add note about populate + match in chatc Tyler Renelle 2013-09-04 13:22:22 -0400
  • 6b338da1f9 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite Tyler Renelle 2013-09-04 13:14:05 -0400
  • 41255dcc20 groups: return group members on chat Tyler Renelle 2013-09-04 13:13:43 -0400
  • d7c6c15592 some more bailey updates Tyler Renelle 2013-09-04 13:13:23 -0400
  • 6b4d3db6bb delete old pets.html Matteo Pagliazzi 2013-09-04 19:09:48 +0200