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
SamuraiEtti
822b912c0d
No he revisado todo, pero he corregido algunos elementos
...
889cb42c-9552-4653-a05f-61d829b46c1c
2013-10-09 17:25:23 +02:00
SamuraiEtti
70497867eb
Update app.json
2013-10-09 15:59:30 +02:00
Dušan Juretić
6ef96c1f83
added drop system tests, stubbing Math.random with sinon
2013-10-05 22:12:42 -03:00
Tyler Renelle
43be09a5d5
Merge pull request #1575 from Shaners/newSkin
...
New skin tones
2013-10-04 15:27:09 -07:00
Arcklo
a3ed609b5a
Added Portuguese Translation
...
I am Arcklo, my UID is 6bb9d67a-675a-4391-bf0f-381f2749b764
A few comments:
Plate, directly translated, is hardly used. I did so anyways, but personally i think "Heavy Armor", "Heavy Helmet" and so on would sound better in portuguese.
The part where the code stated "Panda Egg" had "Wolf Cub" written on it. I translated as "Panda Cub", but if it was intended, i'll correct it.
Town crier was particularly hard to translate. I went with "arauto". If any other translators want to have at it, be my guests.
2013-10-04 17:45:29 -03:00
Arcklo
c979e04bbf
Update app.json
2013-10-04 17:31:37 -03: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
Dušan Juretić
479075ac21
add .travis.yml
2013-09-29 11:37:31 -03:00
Tyler Renelle
0c73790586
Merge pull request #23 from djuretic/rewrite
...
More unit tests
2013-09-29 06:37:11 -07:00
Dušan Juretić
f9d39103ed
add test of 'to next level' experience
2013-09-28 19:25:46 -03:00
Dušan Juretić
49d73543e0
add test for revival
2013-09-28 19:21:45 -03:00
Andre Casey
a1c4db8727
Updated DOCS-README.md for Docker
2013-09-28 14:59:34 -07:00
Dušan Juretić
db8723f0d2
add tests for store operations
2013-09-28 18:36:23 -03:00
Dušan Juretić
c9edf64d7f
remove console.log in test
2013-09-28 18:28:57 -03: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
Tyler Renelle
641c3de6ef
Merge pull request #22 from Shaners/rewrite
...
Adds new skin tones
2013-09-27 08:38:15 -07: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
315b70f294
Merge pull request #21 from djuretic/rewrite
...
Corrected rounding of gold & silver calculations
2013-09-26 18:38:33 -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
Shaners
a5c7578e6d
Adds new skin tones
2013-09-24 21:56:08 -07:00
Dušan Juretić
939bca1eb9
add silver leading zero
2013-09-23 23:30:13 -03:00
Dušan Juretić
c60f6f1c23
corrected rounding of gold & silver calculations
2013-09-23 23:03:11 -03:00
Tyler Renelle
d130989fd9
Merge pull request #20 from djuretic/rewrite
...
Tests now passing
2013-09-22 12:51:04 -07:00
Dušan Juretić
e664037fb9
tests now passing, fixes #18
2013-09-22 16:28:30 -03:00
Tyler Renelle
8aefe96910
Merge branch 'master' of github.com:lefnire/habitrpg
2013-09-22 12:57:30 -04:00
