Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,982 Commits 64 Branches 1,256 Tags
c52bbc8f0da472248b381a6e09bb3c8bb9643b60
Commit Graph

86 Commits

Author SHA1 Message Date
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 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
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 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
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 2f8c9fea78 [#1516] fixes to handling user.invitations.guilds - both accept & reject 2013-09-11 17:16:23 -04: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
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 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 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 89fabc38cb add "member since" in modal 2013-09-09 18:56:46 -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 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