 Tyler Renelle
|
c52bbc8f0d
|
graphs: hack 300px width on charts because I can't figure out how to
make 100% work
|
2013-10-19 16:42:29 -07:00 |
|
|
Tyler Renelle
|
cef8431af0
|
charts: port toggleChart back in (functional, but it's not getting the
right width)
|
2013-10-19 16:15:48 -07:00 |
|
|
Matteo Pagliazzi
|
08fd4a865a
|
better code for last fix
|
2013-10-16 20:24:32 +02:00 |
|
|
Matteo Pagliazzi
|
28e8955379
|
do not reset user\ eggs if they are already there
|
2013-10-16 20:22:22 +02:00 |
|
|
Matteo Pagliazzi
|
285362de6f
|
remove console.log for syncing
|
2013-10-16 20:19:42 +02:00 |
|
|
Tyler Renelle
|
5d46793373
|
Merge pull request #1591 from djuretic/develop
Tests for AuthCtrl
|
2013-10-15 19:59:47 -07:00 |
|
|
Dušan Juretić
|
6830a9281d
|
add tests for userServices, changed alert to $window.alert in userServices
|
2013-10-13 19:01:46 -03:00 |
|
|
Matteo Pagliazzi
|
68426c7ccb
|
profile edits saved only on click
|
2013-10-13 20:47:59 +02:00 |
|
|
Matteo Pagliazzi
|
4e56df0e82
|
restore values saved only when Save is clicked
|
2013-10-13 19:58:13 +02:00 |
|
|
Tyler Renelle
|
a53725da14
|
gems: add to tutorial on drop unlock
|
2013-10-12 20:22:56 -07:00 |
|
|
Tyler Renelle
|
81f9f9b4c5
|
gems: justin in gem-purchase dialog
|
2013-10-12 20:01:18 -07:00 |
|
|
Tyler Renelle
|
4c018d84c1
|
Merge branch 'paypal' into develop
Conflicts:
bower.json
|
2013-10-12 19:23:44 -07:00 |
|
|
Tyler Renelle
|
f8328d3eeb
|
paypal: add configurable merchant and sandbox/production environment
|
2013-10-12 19:22:06 -07:00 |
|
|
Dušan Juretić
|
89b4d2ece0
|
authCtrl tests now working, replaced window for $window
|
2013-10-12 22:46:13 -03:00 |
|
|
Tyler Renelle
|
5de0c928fe
|
paypal: conslidate buy gems modals
|
2013-10-12 16:51:01 -07:00 |
|
|
Tyler Renelle
|
43be09a5d5
|
Merge pull request #1575 from Shaners/newSkin
New skin tones
|
2013-10-04 15:27:09 -07:00 |
|
|
Matteo Pagliazzi
|
bb8bbe4e0f
|
remove stable flickering, fixes #1557
|
2013-09-29 16:43:01 +02:00 |
|
|
Shane Lister
|
ab9d6a53fe
|
Update customizer.styl
Add new skin types to customizer style. Add shirts to cropped images for customizer to fit with other customization options.
|
2013-09-26 23:25:50 -07:00 |
|
|
Matteo Pagliazzi
|
993a255c46
|
may be fix for #1560
|
2013-09-22 17:29:16 +02:00 |
|
|
Matteo Pagliazzi
|
3fb6f25c42
|
set reorder distance to 5px
|
2013-09-21 16:50:14 +02:00 |
|
|
Matteo Pagliazzi
|
332b4bd899
|
allow header to be scrolled horizontally
|
2013-09-21 16:25:17 +02:00 |
|
|
Matteo Pagliazzi
|
93aab9d459
|
typo
|
2013-09-21 16:14:19 +02:00 |
|
|
Matteo Pagliazzi
|
55661a6659
|
typo
|
2013-09-20 18:05:01 +02:00 |
|
|
Matteo Pagliazzi
|
2c2367cf7c
|
update store, fix #1553
|
2013-09-20 18:04:20 +02:00 |
|
|
Matteo Pagliazzi
|
2c32095924
|
confirmation when leaving party or guilds, fix #866
|
2013-09-18 20:09:35 +02:00 |
|
|
Matteo Pagliazzi
|
190c617d4c
|
fix #1045
|
2013-09-18 17:02:17 +02:00 |
|
|
Dušan Juretić
|
c6472bc615
|
fix hardcoded total pets count
|
2013-09-18 11:07:23 -03:00 |
|
|
Tyler Renelle
|
9ec3c4aaed
|
fix so admins can delete chat msgs
|
2013-09-18 09:06:51 -04:00 |
|
|
Tyler Renelle
|
5006cda946
|
[#1394] fix customizationsNotification issue
|
2013-09-17 14:59:06 -04:00 |
|
|
Tyler Renelle
|
402e2aedb0
|
[#1397 #1543 #1540] misc bug fixes
|
2013-09-17 14:44:02 -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
|
5ab3ea7311
|
[#1397 #1543 #1540]use justin in popovers instead of indicator icons (may want to revisit)
|
2013-09-17 14:15:57 -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
|
1c7081495f
|
misc cleanup
|
2013-09-17 12:52:51 -04:00 |
|
|
Tyler Renelle
|
f26b0a2cf5
|
[#1394] add drop notifications back in
|
2013-09-17 12:16:16 -04:00 |
|
|
Tyler Renelle
|
9d633eceaf
|
[#1394] bug fixes
|
2013-09-17 12:04:46 -04:00 |
|
|
Tyler Renelle
|
0fc413f3b7
|
[#1394] move notifications from controller to service, lots of notification
fixes, put streak notification back in
|
2013-09-17 11:43:05 -04:00 |
|
|
Tyler Renelle
|
1d3728ea77
|
spacing cleanup
|
2013-09-17 10:50:24 -04:00 |
|
|
Dušan Juretić
|
2c8a5b5ff8
|
remove website in edit profile page works
|
2013-09-16 22:58:20 -03:00 |
|
|
Tyler Renelle
|
dc303f83c1
|
[#1221] misc bug fixes on backer.* doesn't exist in chat, default backer &
preference attrs in user model
|
2013-09-13 15:10:47 -04:00 |
|
|
Tyler Renelle
|
0d8e1f2043
|
cleanup on end tour
|
2013-09-12 16:51:49 -04:00 |
|
|
Matteo Pagliazzi
|
e6021d9cf8
|
show tour only once
|
2013-09-12 19:24:04 +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 |
|
|
Tyler Renelle
|
2f8c9fea78
|
[#1516] fixes to handling user.invitations.guilds - both accept & reject
|
2013-09-11 17:16:23 -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
|
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 |
|