Commit graph

996 commits

Author SHA1 Message Date
Matteo Pagliazzi
8540e2f59b show group gems popover 2013-09-19 19:04:32 +02:00
Matteo Pagliazzi
86b3ca5d6b remove duplicate tooltip 2013-09-18 17:41:23 +02:00
Dušan Juretić
c6472bc615 fix hardcoded total pets count 2013-09-18 11:07:23 -03:00
Tyler Renelle
35945f0a44 change bailey links to her twitter 2013-09-17 15:40:20 -04:00
Tyler Renelle
e62007e74e add jquery.cookie for tour (suddenly required?) 2013-09-17 15:20:09 -04:00
Tyler Renelle
5006cda946 [#1394] fix customizationsNotification issue 2013-09-17 14:59:06 -04:00
Tyler Renelle
082bfd46da Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-17 14:16:11 -04:00
Tyler Renelle
36b3a77877 [#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes 2013-09-17 14:10:10 -04:00
Matteo Pagliazzi
66a8af5959 Merge pull request #1545 from djuretic/develop
Profile: allow deletion of websites
2013-09-17 10:50:04 -07:00
Tyler Renelle
f26b0a2cf5 [#1394] add drop notifications back in 2013-09-17 12:16:16 -04:00
Dušan Juretić
daa06943ab fix user profile websites show/hide conditions 2013-09-16 22:59:08 -03:00
Tyler Renelle
bb2b17b24e Merge pull request #1538 from djuretic/develop
Do not allow empty task names when editing tasks
2013-09-16 13:33:38 -07:00
Dušan Juretić
64edf31eb4 show hatching potion selector after buying an egg 2013-09-15 16:40:20 -03:00
Dušan Juretić
72c4733a0f do not allow empty task names when editing tasks 2013-09-14 21:38:50 -03:00
Matteo Pagliazzi
98fa007f36 do not trigger validation error on float number, fix #1463 2013-09-13 20:01:22 +02:00
Matteo Pagliazzi
2523643dd5 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-09-13 18:31:16 +02:00
Matteo Pagliazzi
89d102aa1f do not show border on if habit has only + action 2013-09-13 18:23:02 +02:00
Tyler Renelle
d3ddbae767 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-12 16:43:18 -04:00
Tyler Renelle
d432397c27 [#1514] missing veteran achievement 2013-09-12 16:42:48 -04:00
Matteo Pagliazzi
0786fe90f9 add market prices, fix #1511 2013-09-12 19:16:01 +02:00
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