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
Dušan Juretić
602c78c1be
show egg and potion count in inventory
2013-09-28 11:52:51 -04: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
Shane Lister
91c9e5627f
Update profile.jade
...
Reorder and add new skin choices.
2013-09-26 23:23:30 -07:00
Tyler Renelle
b0f0ec39d6
Merge pull request #1563 from lefnire/paglias/big-response
...
Reduce response size
2013-09-26 16:44:41 -07:00
Andre Casey
92485a938e
Documentation configuration for Docker
...
Includes:
- Gruntfile config
- read me for docs (docs-home.md. maps to --> docs-home.md.html)
- updated package.json for docker dep
- updated .gitignore to not include generated files
2013-09-26 18:10:50 -04:00
Andre Casey
883646ddaa
Remove generated html files from repo.
2013-09-26 18:10:42 -04:00
Andre Casey
ac7aba4ce0
Fix spelling error on Mongoose
2013-09-26 18:10:35 -04:00
Andre Casey
784113e9c1
updated generated .html files of documentation.
2013-09-26 18:10:28 -04:00
Andre Casey
48602e4f91
Added FIXME line, since this commented code was confusing.
...
Not sure whether to comment it referring to doc.filters or if it is a legacy function.
2013-09-26 18:10:21 -04:00
Andre Casey
978497656b
add markdown to existing comments.
2013-09-26 18:10:11 -04:00
Andre Casey
cbc12b0077
Docoo stylesheets and fonts
2013-09-26 18:09:54 -04:00
Andre Casey
a119033763
oops. this was created by accidentally running docco in the wrong directly. removed.
2013-09-26 18:09:43 -04:00
Andre Casey
0296bb953f
changed default docco.css to line things up better with headings and comments.
2013-09-26 18:09:36 -04:00
Andre Casey
ab669ac3c5
Default docco.css file, for styling generated html pages
2013-09-26 18:09:25 -04:00
Tyler Renelle
8aefe96910
Merge branch 'master' of github.com:lefnire/habitrpg
2013-09-22 12:57:30 -04:00
Tyler Renelle
423170d0cf
Revert "Fixes the bower post install fail in windows. I think it should be fine on all other OS, but I don't have the environment set up to test it."
...
This reverts commit 219bb4e572
2013-09-22 12:57:00 -04:00
Matteo Pagliazzi
993a255c46
may be fix for #1560
2013-09-22 17:29:16 +02:00
Matteo Pagliazzi
6b87a2065e
readme typo
2013-09-22 13:26:45 +02:00
