b50a78f0ea
add lib to gitignore for now, so we can compile. may want to remove
...
this ignore in the future
2013-08-04 16:08:40 -04:00
a8e0015cbb
apiv2: unshift to tasks, rather than push
2013-08-04 15:53:20 -04:00
38d57cbc87
possible better handling of empty POST, yan's weird User.log({}) thing.
2013-08-04 11:53:37 -04:00
1a08c7b084
change derby-ui-boot url to point to our fork, for #741
2013-08-04 09:57:31 -04:00
8760d07215
apiv2 fix to pending op (@litenull)
2013-08-03 14:06:57 -04:00
1096ae041a
Merge pull request #1299 from lefnire/sabe_fixes
...
Update to 500 error message
2013-08-01 11:47:17 -07:00
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
1279b6ecb2
Merge pull request #1297 from SabreCat/master
...
Answer cron FAQ in settings text
2013-08-01 06:36:41 -07:00
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
e9163f17da
Merge pull request #1296 from SabreCat/develop
...
Typo fixes
2013-07-31 15:36:45 -07:00
a471b629c3
Update app.json
...
Add'l English syntax fixes to Tavern description
2013-07-31 12:09:16 -05:00
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
69785ce443
Gems and Eggs
2013-07-29 11:19:33 +03:00
9e2ef95d84
apiv2: bugfix in handling doneCount (we really should move to Q instead)
2013-07-26 16:35:28 -04:00
0ae0c57858
apiv2: reapplying cleanup fix of b88c2ad
2013-07-26 15:37:15 -04:00
41ff34d1d6
Merge branch 'develop' into apiv2
2013-07-26 14:35:08 -04:00
a6f5821852
Merge branch 'apiv2' of https://github.com/lefnire/habitrpg into apiv2
2013-07-26 13:23:03 +02:00
42e32dfb21
reverting the api since its not ok
2013-07-26 13:22:57 +02:00
36d87acc05
Footer and Misc
2013-07-25 23:24:26 +03:00
f6a189e21d
Parties and Death
...
A familiar combo?
2013-07-25 23:00:02 +03:00
7b0ef0deb4
Swords and Shields
...
Swords and Shields
2013-07-25 21:36:23 +03:00
6edc0d7052
Update app.json
...
Armour and Headgear
2013-07-25 12:23:58 +03:00
e180eb2b39
fix to delete paths['stats.hp'], hopefully fix #1279
2013-07-24 15:29:24 -04:00
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
60c726ee76
Fix #1273 for scrollbars showing on every message in tavern/party/guild chats.
2013-07-24 07:39:04 -07:00
e45ebf7686
Update app.json
...
replaced "partzuf" with more common "dmut"
2013-07-24 07:54:05 +03:00
b179c26078
Update app.json
...
tavern, inventory translations
2013-07-24 07:49:30 +03:00
078f13ea72
Merge branch 'apiv2' of github.com:lefnire/habitrpg into apiv2
2013-07-23 14:29:07 -04:00
01120a2b23
no message
2013-07-23 14:33:58 +02:00
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
c9807fd0c6
Extended short option box and removed labels on inventory items
2013-07-22 20:00:01 -04:00
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
87651ff4d5
Update app.json
...
first two blocks translated
2013-07-21 15:29:33 +03:00
0c4efa3f8c
fixes
2013-07-20 03:23:41 +02:00
592b890137
add in missing require('misc')
2013-07-19 17:27:29 -04:00
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
4655b2fbc2
apiv2: remove some duplcation from api to apiv2
2013-07-19 15:19:50 -04:00
91e686fd87
Merge branch 'develop' into apiv2
...
Conflicts:
src/server/apiv2.coffee
2013-07-19 14:59:09 -04:00
73064584fa
Update app.json
...
Basic Hebrew Translations
2013-07-19 10:29:08 +03:00
52d4bea9ab
Update app.json
2013-07-19 10:20:52 +03:00
f6651e30fa
Update app.json
2013-07-19 09:36:25 +03:00
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
e81a40d760
Revert "Fixed pandaEgg and whyAdsContent1"
...
Better to keep this branch pure
This reverts commit 2436db314f
2013-07-16 10:52:16 +02:00
fa1b044293
Translation proof read and spell checked
2013-07-16 10:40:54 +02:00
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
2ec5a930a6
add beta redirect to main site until we get a new beta up
2013-07-15 21:52:00 -04:00
9efac4398a
Completed the norwegian translation. Hold for spell check.
2013-07-15 19:08:30 +02:00
2436db314f
Fixed pandaEgg and whyAdsContent1
2013-07-15 19:03:57 +02:00
d415d3c05f
Re-renaming of TUTORIAL/TOUR
2013-07-15 16:01:39 +02:00
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