Commit graph

25741 commits

Author SHA1 Message Date
Tyler Renelle
0d8e1f2043 cleanup on end tour 2013-09-12 16:51:49 -04: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
J. Ozymandias Fallick
4d451265a0 Added Due Date as a basic label 2013-09-12 14:32:17 -04:00
J. Ozymandias Fallick
bace2f594e Fixed possible typo 2013-09-12 13:30:36 -04:00
Matteo Pagliazzi
e6021d9cf8 show tour only once 2013-09-12 19:24:04 +02:00
Matteo Pagliazzi
0786fe90f9 add market prices, fix #1511 2013-09-12 19:16:01 +02:00
Tyler Renelle
e754670733 small fix to `heroku[router]: at=error code=H17 desc="Poorly formatted
HTTP response" method=GET path=/splash.html host=habitrpg.com
fwd="" dyno=web.3 connect=1ms service=3ms status=503 bytes=0`
2013-09-11 17:47:51 -04: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
Tyler Renelle
2f8c9fea78 [#1516] fixes to handling user.invitations.guilds - both accept & reject 2013-09-11 17:16:23 -04:00
Tyler Renelle
9b78e4e7fa [#1520] add defaults to items.lastDrop date & count 2013-09-11 16:51:18 -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
48c078a6ea various fixed 2013-09-11 20:08:53 +02:00
Matteo Pagliazzi
1342a2cb89 fix reject guild function 2013-09-11 17:07:38 +02:00
Matteo Pagliazzi
46363785c8 rever to query 2013-09-11 16:51:39 +02:00
Matteo Pagliazzi
9966d06c5a use slice 2013-09-11 16:47: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
Matteo Pagliazzi
1bc5f0eb0c add margin to buttons in setting page 2013-09-11 15:42:11 +02:00
Tyler Renelle
01ac814b17 typo 2013-09-10 19:10:58 -04:00
Tyler Renelle
c46bfa64ea typo 2013-09-10 18:49:37 -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
964eb91799 update tour to conform to guidelines at #1507 2013-09-10 18:31:26 -04:00
Tyler Renelle
16a4e87fea [#1396] Add justin to tour bubbles 2013-09-10 18:20: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
Tyler Renelle
b7107aa874 Merge pull request #1507 from lefnire/paglias/build2
File caching & better compression for css
2013-09-10 14:00:11 -07:00
Matteo Pagliazzi
af910a5026 fix stylus watching 2013-09-10 22:57:34 +02:00
Matteo Pagliazzi
c9212d76d8 add padding to gem wallet 2013-09-10 15:30:38 +02:00
Matteo Pagliazzi
6e8a57004f exclude build in nodemonignore 2013-09-10 14:54:23 +02:00
Matteo Pagliazzi
940861ad67 small comment fix 2013-09-10 14:43:30 +02:00
Matteo Pagliazzi
21823564c2 add caching 2013-09-10 14:40:00 +02:00
Matteo Pagliazzi
f71590449c add hash to build files & correct minor fix 2013-09-10 12:39:17 +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
b123843837 [#1479] when clicking guild member name, replace their limited loaded data with
more full data from server
2013-09-09 17:39:26 -04:00
Tyler Renelle
87c2a5b57d [#1489] populate user to Members service on initial load, so it will show self
as leaderMessage if you're the leader of a group
2013-09-09 17:23:09 -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
41cc18c1db [#1442] hotfix - put user.tasks back into the api for now 2013-09-09 11:43:24 -04:00
Tyler Renelle
6591524079 fix to auth route to show if the problem was username, not just password 2013-09-09 11:01:57 -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
f5ecef7c34 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-09-09 09:12:18 -04:00