Sabe Jones
1aa5ff2db2
Fix typos and update current-events notice on 500 error
...
Brings "Server restarting" message up to date re: Angular rewrite.
2013-08-01 13:41:39 -05:00
Tyler Renelle
1279b6ecb2
Merge pull request #1297 from SabreCat/master
...
Answer cron FAQ in settings text
2013-08-01 06:36:41 -07:00
Sabe Jones
f3982670fd
Answer cron FAQ in settings text
...
Update custom day start label to mention it works off user's time zone
2013-08-01 08:17:50 -05:00
Tyler Renelle
e9163f17da
Merge pull request #1296 from SabreCat/develop
...
Typo fixes
2013-07-31 15:36:45 -07:00
Tyler Renelle
0d2f9c9314
Merge pull request #11 from SabreCat/patch-1
...
Remove misleading "one day" from egg drop text
2013-07-31 15:34:23 -07:00
Sabe Jones
07907ae28f
Remove misleading "one day" from egg drop text
...
Pouring a potion on an egg hatches the pet instantly. Until such time as that feature is changed, I've removed the "one day" from the relevant string.
2013-07-31 16:19:16 -05:00
SabreCat
a471b629c3
Update app.json
...
Add'l English syntax fixes to Tavern description
2013-07-31 12:09:16 -05:00
SabreCat
c23a6cc8f0
Typo fixes
...
Corrected three typos in English app.json
"integrals" instead of "integral" in tour description of rewards
"effected" instead of "affected" in Tavern description
"Habit an open" instead of "Habit is an open" in Remove Ads
2013-07-31 11:52:17 -05:00
Tyler Renelle
b94ecf6002
new compile for mobile
2013-07-29 21:40:44 -04:00
Benny Powers
69785ce443
Gems and Eggs
2013-07-29 11:19:33 +03:00
Tyler Renelle
9e2ef95d84
apiv2: bugfix in handling doneCount (we really should move to Q instead)
2013-07-26 16:35:28 -04:00
Tyler Renelle
0ae0c57858
apiv2: reapplying cleanup fix of b88c2ad
2013-07-26 15:37:15 -04:00
Tyler Renelle
41ff34d1d6
Merge branch 'develop' into apiv2
2013-07-26 14:35:08 -04:00
Tomaž
a6f5821852
Merge branch 'apiv2' of https://github.com/lefnire/habitrpg into apiv2
2013-07-26 13:23:03 +02:00
Tomaž
42e32dfb21
reverting the api since its not ok
2013-07-26 13:22:57 +02:00
Benny Powers
36d87acc05
Footer and Misc
2013-07-25 23:24:26 +03:00
Benny Powers
f6a189e21d
Parties and Death
...
A familiar combo?
2013-07-25 23:00:02 +03:00
Benny Powers
7b0ef0deb4
Swords and Shields
...
Swords and Shields
2013-07-25 21:36:23 +03:00
Benny Powers
6edc0d7052
Update app.json
...
Armour and Headgear
2013-07-25 12:23:58 +03:00
Tyler Renelle
dab72e5865
cap items to maximum in their array, in case the user manually entered
...
a number larger than the max allowed item in the "restore" modal
2013-07-24 16:45:48 -04:00
Tyler Renelle
e180eb2b39
fix to delete paths['stats.hp'], hopefully fix #1279
2013-07-24 15:29:24 -04:00
Tyler Renelle
6ca4f4fcf0
Merge pull request #1280 from onduhray/TavernFix
...
Fix #1273 for scrollbars showing on every message in chats
2013-07-24 11:50:03 -07:00
Andre Casey
60c726ee76
Fix #1273 for scrollbars showing on every message in tavern/party/guild chats.
2013-07-24 07:39:04 -07:00
Benny Powers
e45ebf7686
Update app.json
...
replaced "partzuf" with more common "dmut"
2013-07-24 07:54:05 +03:00
Benny Powers
b179c26078
Update app.json
...
tavern, inventory translations
2013-07-24 07:49:30 +03:00
Tyler Renelle
078f13ea72
Merge branch 'apiv2' of github.com:lefnire/habitrpg into apiv2
2013-07-23 14:29:07 -04:00
Tomaž
01120a2b23
no message
2013-07-23 14:33:58 +02:00
Tyler Renelle
b79b38e502
Merge pull request #1274 from nafoster/develop
...
Extended short option box and removed labels on inventory items
2013-07-22 17:07:16 -07:00
Nicole Foster
c9807fd0c6
Extended short option box and removed labels on inventory items
2013-07-22 20:00:01 -04:00
Tyler Renelle
63866ddfc8
Merge pull request #1224 from onduhray/develop
...
Moar Inventory Layout Fixes in CSS & Tavern Chat Abuse Fix
2013-07-22 14:58:04 -07:00
Benny Powers
87651ff4d5
Update app.json
...
first two blocks translated
2013-07-21 15:29:33 +03:00
Tomaž
0c4efa3f8c
fixes
2013-07-20 03:23:41 +02:00
Tyler Renelle
592b890137
add in missing require('misc')
2013-07-19 17:27:29 -04:00
Tyler Renelle
b88c2ad1a3
apiv2 - much cleaned up, by re-using fucntions in api.coffee. misc.batchTxn takes an optional user param, in case we don't want to use private paths "_user" (which we don't want to do on the server!)
2013-07-19 17:22:22 -04:00
Tyler Renelle
4655b2fbc2
apiv2: remove some duplcation from api to apiv2
2013-07-19 15:19:50 -04:00
Tyler Renelle
91e686fd87
Merge branch 'develop' into apiv2
...
Conflicts:
src/server/apiv2.coffee
2013-07-19 14:59:09 -04:00
Benny Powers
73064584fa
Update app.json
...
Basic Hebrew Translations
2013-07-19 10:29:08 +03:00
Benny Powers
52d4bea9ab
Update app.json
2013-07-19 10:20:52 +03:00
Benny Powers
f6651e30fa
Update app.json
2013-07-19 09:36:25 +03:00
Tyler Renelle
5017be0984
API: remove all private paths from server ops, they're unecessary and might be causing issues
2013-07-16 18:30:43 -04:00
Øystein Blixhavn
e81a40d760
Revert "Fixed pandaEgg and whyAdsContent1"
...
Better to keep this branch pure
This reverts commit 2436db314f
2013-07-16 10:52:16 +02:00
Øystein Blixhavn
fa1b044293
Translation proof read and spell checked
2013-07-16 10:40:54 +02:00
Tyler Renelle
861c7a1aa1
Revert "add beta redirect to main site until we get a new beta up"
...
This reverts commit 2ec5a930a6
2013-07-15 23:07:58 -04:00
Tyler Renelle
2ec5a930a6
add beta redirect to main site until we get a new beta up
2013-07-15 21:52:00 -04:00
Øystein Blixhavn
9efac4398a
Completed the norwegian translation. Hold for spell check.
2013-07-15 19:08:30 +02:00
Øystein Blixhavn
2436db314f
Fixed pandaEgg and whyAdsContent1
2013-07-15 19:03:57 +02:00
Øystein Blixhavn
d415d3c05f
Re-renaming of TUTORIAL/TOUR
2013-07-15 16:01:39 +02:00
Øystein Blixhavn
78c491aedb
Started on norwegian translation based on english locale. HABITRPG FRONT PAGE, TUTORIAL/TOUR, DEFAULT TASKS, DEFAULT TAGS, HEADER, NOTIFICATIONS and TASK VIEW translated
2013-07-15 15:57:45 +02:00
Tyler Renelle
8e922bb151
API: add facebook auth route
2013-07-12 17:15:11 -04:00
Tyler Renelle
a5eb64f771
Merge branch 'master' of github.com:HabitRPG/habitrpg-shared
2013-07-12 16:56:47 -04:00
