Tyler Renelle
|
bf032ce808
|
Merge branch 'origin-paglias-fix-guilds' into develop
Conflicts:
public/css/index.styl
|
2013-09-11 17:18:36 -04:00 |
|
Matteo Pagliazzi
|
dc96df43cc
|
add margin-right to all .btn, typo in stylus, add build to .nodemonignore
|
2013-09-11 20:36:57 +02:00 |
|
Matteo Pagliazzi
|
bf83291e0a
|
add fix for joining guild
|
2013-09-11 16:32:56 +02:00 |
|
Matteo Pagliazzi
|
8e377d7343
|
fix various guilds issues
|
2013-09-11 16:28:14 +02:00 |
|
Tyler Renelle
|
01ac814b17
|
typo
|
2013-09-10 19:10:58 -04:00 |
|
Tyler Renelle
|
a7e99d0ac0
|
[#1396] add ability to show tour at any time. Also add ability to show
Bailey at any time
|
2013-09-10 18:36:10 -04:00 |
|
Tyler Renelle
|
598c4445ff
|
[#1396] setup tour, using user.flags.showTour now instead of
localStorage. double check with #1507
|
2013-09-10 18:06:16 -04:00 |
|
Matteo Pagliazzi
|
21823564c2
|
add caching
|
2013-09-10 14:40:00 +02:00 |
|
Matteo Pagliazzi
|
9cc92ccb25
|
serve all css minimized & static files from /build
|
2013-09-10 12:29:43 +02:00 |
|
Tyler Renelle
|
a6590e7d84
|
[#1505] add memberServices into static. I'm adding way too many deps to the
static page, I need to separate out authServices bare-bones & only use
that in static
|
2013-09-09 21:25:45 -04:00 |
|
Tyler Renelle
|
23045fb72f
|
formatting
|
2013-09-09 19:12:16 -04:00 |
|
Tyler Renelle
|
20354c7d8a
|
member-since and last-logged-in
|
2013-09-09 19:04:46 -04:00 |
|
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 |
|