Tyler Renelle
6f32ac2a24
halloween: purchase full set
2013-10-22 13:59:30 -07:00
Tyler Renelle
619c00fb5c
halloween: some unlocking bug fixes (appears a markModified was required)
2013-10-22 13:37:55 -07:00
Tyler Renelle
d184237c79
halloween: begin adding mechanic for the special skins
2013-10-22 13:24:31 -07:00
Matteo Pagliazzi
18c06b5043
user top right button should not cover notifications, they can be closed with a click on the "x"
2013-10-21 20:44:31 +02:00
Matteo Pagliazzi
c4882942d6
fix chart shown below task edit form
2013-10-21 20:41:19 +02:00
Matteo Pagliazzi
cc05926e6b
do not log "Reply sent" after every user update
2013-10-21 17:51:14 +02:00
Tyler Renelle
00b47dfd35
Merge pull request #1622 from djuretic/develop
...
Add tests for memberServices
2013-10-20 00:27:22 -07:00
Tyler Renelle
b55cb1ccdb
bailey update for skin tones, 0.0.10, selling drops. @lemoness this is
...
the new format (jade), hit me offline for a tour
2013-10-20 00:13:50 -07:00
Tyler Renelle
2cf814acd6
drops: description on combining eggs/potions, selling to
...
alex. de-selectable drops. sell in a button of alex's dialog
2013-10-19 23:44:03 -07:00
Tyler Renelle
e4f2a4386d
eggs: bug fixes on selling potions
2013-10-19 20:22:12 -07:00
Tyler Renelle
c882525150
eggs: add ability to sell potions / eggs
2013-10-19 20:04:26 -07:00
Tyler Renelle
017398eb83
eggs: some cleanup and passing around of $index so we can retrieve
...
egg/pot value
2013-10-19 19:58:11 -07:00
Tyler Renelle
378d158a44
pegs: restructure inventory/market html so we market is aware of
...
inventory and we can sell items
2013-10-19 19:36:59 -07:00
Dušan Juretić
bb4350fb52
add tests for memberServices
2013-10-19 23:33:27 -03:00
Tyler Renelle
be624a03b0
pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs
2013-10-19 19:30:39 -07:00
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
609499a4c9
front-page: update promo video
2013-10-19 16:24:20 -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
Tyler Renelle
6d98194df2
fix #1619 (missing comma in config.example)
2013-10-17 01:06:21 +01:00
Matteo Pagliazzi
066364e3c9
fix refresh chat button sending message
2013-10-16 21:36:56 +02:00
Matteo Pagliazzi
a56242d1a7
working chat refresh button
2013-10-16 21:02:57 +02: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
Tyler Renelle
3d777372a1
Merge pull request #1609 from Shaners/patch-1
...
Quick Fix - Task Editing Cancel
2013-10-15 19:53:29 -07:00
Tyler Renelle
109d46b2ca
paypal: fix to #1615 , explicitly set rm variable to avoid POST / on
...
paypal redirect
2013-10-13 16:05:18 -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
Matteo Pagliazzi
c3086c6194
fix not showing veteran wolf
2013-10-13 19:40:07 +02:00
Tyler Renelle
33549971f9
paypal: fix retrying by responding to IPN with 200 first
2013-10-13 09:46:22 -07:00
Tyler Renelle
a53725da14
gems: add to tutorial on drop unlock
2013-10-12 20:22:56 -07:00
Tyler Renelle
890e8bf8b3
gems: can click main gem button, doens't require [+]
2013-10-12 20:08:06 -07:00
Tyler Renelle
81f9f9b4c5
gems: justin in gem-purchase dialog
2013-10-12 20:01:18 -07:00
Tyler Renelle
b4e5a1925b
add donate button
2013-10-12 19:47:40 -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
09cd132420
paypal: begin adding paypal alternative to credit-card payments
2013-10-12 15:24:35 -07:00
Shane Lister
6d259bdd48
Quick Fix - Task Editing Cancel
...
Temp fix for #1599
Hides the edit button on task editing.
Shows new cancel button on task editing.
Hides task notes on task editing.
Notes:
Still needs a save button up top, ```save(task)``` didn't seem to be working with ng-click (also tried a couple other things.) Will revisit.
'ng-if's could also work instead of 'ng-hide's.
Decided that we don't really need to have the task notes popover display while editing tasks since that stuff is already in the task editing pane.
2013-10-10 22:52:52 -07:00
Tyler Renelle
43be09a5d5
Merge pull request #1575 from Shaners/newSkin
...
New skin tones
2013-10-04 15:27:09 -07:00
Tyler Renelle
5464cdf34d
Merge pull request #1592 from onduhray/popover_fix
...
Removed HTML code in Guild Gems popover for now.
2013-10-03 19:55:01 -07:00
onduhray
327a454f61
Merge pull request #1583 from onduhray/remove_docker
...
Remove Docker from Gruntfile. Also rename Docs Readme.
2013-10-03 17:32:27 -07:00
Andre Casey
b3c3aeab05
Fixes #1556 . Removed HTML code in popover for now.
2013-10-03 16:49:15 -07:00
Andre Casey
730c82ccaf
Removes devDependecies for docker from Package.json.
2013-09-30 19:11:14 -07:00
Matteo Pagliazzi
bb8bbe4e0f
remove stable flickering, fixes #1557
2013-09-29 16:43:01 +02:00
Andre Casey
a1c4db8727
Updated DOCS-README.md for Docker
2013-09-28 14:59:34 -07:00
Andre Casey
7e056e5278
Removed Docker from Gruntfile. Changed Docs readme filename.
2013-09-28 11:43:01 -07:00
