Commit graph

4929 commits

Author SHA1 Message Date
Tyler Renelle
5a73923d0a Merge pull request #3540 from vIiRuS/patch-1
Update API Parameter documentation for Equip call
2014-06-04 14:56:28 -04:00
Tyler Renelle
f4022f692a Merge pull request #3190 from denis-sokolov/jshintrc
feat(jshint): add initial config
2014-06-04 14:44:38 -04:00
deilann
f290840995 Merge pull request #3554 from Gaelan/dry_routes
DRY up src/routes/pages.js.
2014-06-03 23:29:03 -07:00
Bob Example
1b3521e3b3 DRY up src/routes/pages.js. 2014-06-01 23:03:33 -07:00
Matteo Pagliazzi
f10b9cbfc6 feat(i18n): support british english 2014-05-29 18:20:40 +02:00
Matteo Pagliazzi
df8eb107cd fix(i18n): use strings 2014-05-28 18:07:25 +02:00
Phillip Thelen
d86f3caeaa Update API Parameter documentation for Equip call
the function that is called actually expects different values than specified in the documentation.

This is related to #3525.
The API itself works, it just does no validation of the input and the documentation is wrong, which is why I used it wrong.

Having some kind of validation would probably still a good idea.
2014-05-27 23:54:58 +02:00
Matteo Pagliazzi
b2ef756443 Merge pull request #3527 from OverloadUT/locale.ignore.system.files
Translation loader now ignores non-directories
2014-05-26 17:27:48 +02:00
Greg Laabs
11595caeb5 Only load .json files from locale directories
This opens up the possibility of putting READMEs or what have you
inside locale directories, and will avoid problems if system files or
folders end up in the locales.
2014-05-26 08:18:48 -07:00
Greg Laabs
84e1223809 Locale loader now ignores non-directories
Locales must be stored in directories and the code previously crashed
if there were any unexpected files in the locale folder. Now the code
simply ignores all non-directories.
2014-05-25 09:13:23 -07:00
Greg Laabs
49772bb571 Translation loader now ignores system files
I was having an issue with habitrpg failing to load when OSX created a
.DS_Store file in the locales directory. This code fixes that by
ignoring all hidden files (files that start with “.”)
2014-05-24 18:04:32 -07:00
Tyler Renelle
29be5d6e3e feat(mystery): may 2014 mystery item 2014-05-23 00:34:32 +02:00
Tyler Renelle
c72cbb014e Merge pull request #3467 from dmonllao/ignore-vim-tmp
chore(nodemon): ignore Vim temp files
2014-05-22 15:59:03 -06:00
Tyler Renelle
4c6fea4fd5 Merge pull request #3511 from thepeopleseason/vagrant_update_140520
fix(vagrant): explicitly call bower install
2014-05-22 15:55:04 -06:00
Tyler Renelle
c441ae418b fix(accessories): add body accessory to user model, fixes #3346 2014-05-22 23:23:26 +02:00
James Hsiao
bbd14bd47c fix(vagrant): explicitly call bower install 2014-05-21 23:11:19 -04:00
deilann
c879f46c07 Merge pull request #3507 from yafinee/no_bubble_if_mount
#3054 - When feeding/saddling, ineligible pets should not get the green ...
2014-05-21 13:40:10 -07:00
Yafinee
ff612555ea #3054 - When feeding/saddling, ineligible pets should not get the green bubble 2014-05-21 19:54:20 +00:00
deilann
020f278577 fix(footer): update github link
Link updated to https://github.com/HabitRPG/habitrpg/issues/2760
2014-05-18 04:25:15 -07:00
Tyler Renelle
ef166a9a10 feat(hall): click hero name for modal. fixes #3478 2014-05-16 20:15:59 -06:00
Tyler Renelle
e77f667a98 Revert "feat(todo_archive)" (see http://goo.gl/mCygbz) 2014-05-15 23:47:38 -06:00
Matteo Pagliazzi
01c9307cd1 fix(i18n): fix /content api call 2014-05-15 23:15:57 +02:00
benmanley
eedb1d147c fix(filters.jade): prevent duplication of new tags
Remove ng-submit='createTag(_newTag)' as it duplicates the action of
ng-click='createTag(_newTag)’ resulting in two new tags being created.
2014-05-15 12:10:38 +01:00
David Monllao
ba4fb956d9 chore(nodemon): ignore Vim temp files 2014-05-15 17:31:06 +07:00
Tyler Renelle
af74ff9da0 feat(chat): allow banning problem users from chat rooms 2014-05-14 16:01:39 -06:00
Tyler Renelle
96c9c7f101 chore(bailey): bailey on level-100 cap 2014-05-14 12:14:46 -06:00
Matteo Pagliazzi
56c54cfa6a Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-05-14 20:01:52 +02:00
Matteo Pagliazzi
a38f2354f5 fix(i18n): signup, clone default tasks 2014-05-14 20:01:31 +02:00
Tyler Renelle
50f28d4478 fix(i18n): callback => next 2014-05-14 11:39:49 -06:00
Tyler Renelle
35ef88c6c0 fix(quests): temporarily send error email on questStart (if already
started), see #3451. Revert later
2014-05-14 10:29:14 -06:00
Tyler Renelle
9a4e8d38b4 fix(quests): don't allow questStart on already-started quests 2014-05-14 10:21:15 -06:00
Tyler Renelle
598c6a43f1 refactor(quests): cleaner buyable quest eggs html 2014-05-14 10:09:18 -06:00
Matteo Pagliazzi
8c6564b0f5 fix(i18n): fix #3461 2014-05-14 17:00:34 +02:00
Tyler Renelle
8506db9849 feat(rat): add rat quest 2014-05-14 08:54:24 -06:00
deilann
a56b1eec12 fix(filters): use k not K for thousand 2014-05-12 23:05:43 -07:00
benmanley
0d15006123 refactor(menu): add total gold to gold popover 2014-05-12 21:19:27 +01:00
Tyler Renelle
0dadc86a61 fix(subscriptions): expose cancelSubscription on $rootScope (don't know
why $scope doesn't work here). Fix UI bug
2014-05-12 12:18:53 -06:00
Matteo Pagliazzi
c2aed860db fix(modules): load i18n 2014-05-12 17:22:55 +02:00
Matteo Pagliazzi
304beb6482 fix(i18n): use strings 2014-05-12 17:15:38 +02:00
Matteo Pagliazzi
4ac10585bb fix(i18n): use everywhere i18n.getUserLanguage middleware - part 2 2014-05-12 16:56:39 +02:00
Matteo Pagliazzi
9aa118e334 fix(i18n): use everywhere i18n.getUserLanguage middleware 2014-05-12 16:52:11 +02:00
Tyler Renelle
de47de0673 Merge pull request #3449 from deilann/removingthelevelcap
Removing level cap, free rebirth at 100
2014-05-11 16:30:41 -06:00
Matteo Pagliazzi
ce69b42b2b fix(i18n): default tasks checklists 2014-05-11 17:11:57 +02:00
deilann
d801ece19d adding flag, allowing free rebirth purchase, adding modal 2014-05-11 08:01:15 -07:00
Matteo Pagliazzi
f29eaab719 fix(shared): use develop branch 2014-05-11 16:55:12 +02:00
benmanley
58ba84945b refactor(tasks): restyle task column color scheme 2014-05-09 16:53:41 +01:00
benmanley
1ff77932ff feat(filters): add button to hide tags and restyle
**filters.styl**
* restyle tags and filter controls using global styles
**filter.jade**
* add button to toggle visibility
* change controls from icons to text
**global-modules**
* add new extends and mixins for button bar and tags
**global-colors.styl**
* add tag colours
2014-05-09 16:53:41 +01:00
Tyler Renelle
e60cf01b6f feat(stats): expos stats jade files to mobile 2014-05-08 16:04:36 -06:00
Tyler Renelle
311586e5a3 fix(profile): fix profile classes for mobile include 2014-05-08 15:26:21 -06:00
Tyler Renelle
3edd37f537 fix(mobile): export i18n for mobile so it can temporarily use en translations 2014-05-08 13:56:01 -06:00