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

2850 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matteo Pagliazzi
5d160c7f21 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-09-08 11:59:35 +02:00
Shane Lister
790d1e460d Update README.md 2013-09-07 23:07:29 -07:00
Tyler Renelle
e2f951e138 userSchema.lastCron.default new Date => Date.now 2013-09-07 20:24:25 -04:00
Tyler Renelle
5cb6e7e0dd fixes to emailing errors 2013-09-07 20:13:02 -04:00
Tyler Renelle
08f4d5fe20 [#1470] set user.lastCron to type=Date in model 2013-09-07 20:00:39 -04:00
Tyler Renelle
0ccdb48751 [#1468] hatchingPotion purchasing fix. also some temp hacks to get the UI to update 2013-09-07 19:06:41 -04:00
Tyler Renelle
5cb8238b7c change badge from master => royal 2013-09-07 15:31:36 -04:00
Tyler Renelle
a960d310f7 [#1465] allow clicking self for modal 2013-09-07 13:59:49 -04:00
Tyler Renelle
b820417953 slight updates to chat colors 2013-09-07 13:44:08 -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
Tyler Renelle
28e2cb32f2 update procfile for heroku. @paglias this is the heroku script-runner btw 2013-09-07 10:54:03 -04:00
Tyler Renelle
796f29e014 Merge pull request #1462 from lefnire/paglias/grunt2 
Grunt v2
 2013-09-07 07:51:39 -07:00
Matteo Pagliazzi
d30d20d987 add margin to chat-btn 2013-09-07 15:16:49 +02:00
Matteo Pagliazzi
4f9cf94574 fix #1438 2013-09-07 13:56:33 +02:00
Matteo Pagliazzi
40d6df1776 grunt v2 2013-09-07 12:47:44 +02:00
Matteo Pagliazzi
4e10fc65cf remove old comment 2013-09-07 10:37:47 +02:00
Tyler Renelle
f1dc9e7f90 disable calendar for now 2013-09-06 22:59:36 -04:00
Tyler Renelle
6b960fba6a edit procfile (heroku Foreman) to run grunt start:production 2013-09-06 22:51:47 -04: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
b0bf1d4c58 finish 2013-09-06 22:33:00 +02:00
Matteo Pagliazzi
9046bd5041 css 2013-09-06 21:39:18 +02:00
Tyler Renelle
479cd16835 [#1448] add resting flag to users 2013-09-06 15:10:47 -04:00
Tyler Renelle
e10735d38e [#1448] add resting flag to users 2013-09-06 15:07:08 -04: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
Tyler Renelle
9da6ddc7c7 Merge pull request #1431 from lefnire/paglias/market 
Market (not working)
 2013-09-05 20:18:57 -07:00
Tyler Renelle
1359de0a90 [#1398] add facebook registration 2013-09-05 23:14:25 -04:00
Tyler Renelle
ab756a8634 #1422 force ssl 2013-09-05 22:53:35 -04:00
Tyler Renelle
86552c9296 Merge branch 'angular_rewrite' of github.com:lefnire/habitrpg into angular_rewrite 2013-09-05 22:33:41 -04:00
Tyler Renelle
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
 2013-09-05 22:33:31 -04:00
Tyler Renelle
d1aec6636d Merge pull request #1435 from Shaners/patch-1 
Update game-pane.styl
 2013-09-05 09:19:44 -07:00
Shane Lister
66182d9cdc Update game-pane.styl 
This had been bugging me...
Adds a 5px space between chat labels and chat text. Untested so probably should double check it first.
 2013-09-05 09:17:41 -07:00
Matteo Pagliazzi
9c6d4deb85 minor fix 2013-09-05 16:07:19 +02: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