Commit graph

4929 commits

Author SHA1 Message Date
Denis
59dc47298b chore(readme): cleanup general installation process 2014-02-22 09:40:04 +02:00
Denis
3fe2ea9ea3 chore(readme): switch to a simpler checkout command 2014-02-22 09:24:29 +02:00
Denis
40f9637f55 chore(readme): add links to 3rd party projects 2014-02-22 09:21:50 +02:00
Denis
613622bc8a fix(readme): build status for the develop branch
Your main development branch is `develop`.
It is usually only interesting to follow the status of the branch in development.
Of course `master` branch will almost always be passing.
Ironically, now it isn't, because our build fixes are on `develop`,
so it's another reason to switch.
2014-02-22 09:11:21 +02:00
Tyler Renelle
df95c9e808 chore(mobile): add mobileChat flag for grandfathering 2014-02-21 18:31:53 -08:00
Tyler Renelle
b95056606a Merge pull request #2869 from denis-sokolov/travis
chore(travis): remove travis config until the issues are resolved
2014-02-21 18:05:03 -08:00
Tyler Renelle
aaa38a5070 fix(static): move About => Features 2014-02-21 17:58:43 -08:00
Tyler Renelle
a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
benmanley
e050bed42c Remove obsolete comment 2014-02-21 22:25:31 +00:00
benmanley
598088df03 Delete -ms-filter value as it is automatically added when compiled 2014-02-21 21:25:46 +00:00
Tyler Renelle
7651dbee58 fix(groups): err:400 when already in a party, not 500 2014-02-21 10:36:57 -08:00
Matteo Pagliazzi
d70b6fca17 Merge pull request #2875 from thepeopleseason/challenges_spacing_fix
Challenges spacing fix
2014-02-21 19:35:19 +01:00
Tyler Renelle
9da5d4d6d4 fix(challenges): when unlinking tasks, sometimes the challenge no longer exists 2014-02-21 09:36:30 -08:00
Tyler Renelle
87f8a4774b fix(groups): don't show 404 for solo users (not trying to fetch party in
the first place), fixes #2919
2014-02-21 08:24:13 -08:00
benmanley
def83b089a Add custom css to prevent Flying Pig progress bar being hidden 2014-02-21 13:28:27 +00:00
benmanley
1214828a35 Merge branch 'stable-styles' of https://github.com/benmanley/habitrpg into stable-styles 2014-02-21 12:50:39 +00:00
benmanley
8c2c940d88 Move styles from stable.jade to inventory.styl file 2014-02-21 12:49:46 +00:00
benmanley
c04caefaac Fix positioning of paw sprites 2014-02-21 12:49:46 +00:00
benmanley
03a23d81e4 Move styles from stable.jade to inventory.styl file 2014-02-21 12:14:58 +00:00
Tyler Renelle
c2ac90f341 refactor(groups): more res.json(500) => next(err) conversions, for
unified error-handling in express middleware
2014-02-20 22:54:47 -08:00
Tyler Renelle
c13b18030b fix(rewards): hide special event spells section if empty, fixes #2909 2014-02-20 17:52:46 -08:00
James Hsiao
9fe8da3c12 fix space issues: contrib modal, challenge list 2014-02-20 20:33:10 -05:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
Tyler Renelle
67876d6306 fix(views): indentation issue, fixes #2913 2014-02-20 12:27:59 -08:00
Tyler Renelle
efb0a3f092 fix(groups): default group.privacy='private'. Starting now,
group.privacy is a required field due to certain queries
2014-02-20 12:10:21 -08:00
Tyler Renelle
f736de3497 Merge pull request #2911 from thepeopleseason/github-2832
Updated subscriptions to include Mystery Item perk
2014-02-20 11:19:26 -08:00
Tyler Renelle
312685118d perf(challenges): use proper elemMatch in challenge.getMember so we
don't have to sift through which tasks are challenge tasks
2014-02-20 11:18:33 -08:00
Tyler Renelle
bf878d0693 refactor(groups): re-rig group.get query compound-index order, so we can
make use of only one compound index
2014-02-20 11:03:25 -08:00
Tyler Renelle
aa9059cb2d fix(groups): use proper mongo queries to handle guild/party access in
groups.get, fixes #2664
2014-02-20 10:48:06 -08:00
Tyler Renelle
4f426b9d24 perf(challenges): use some query & elemMatch magic on memberCount to reduce challenges.list overhead. memberCount is now updated when leaving/joining challenges 2014-02-20 10:43:41 -08:00
Hsiao, James (CMG-Atlanta)
0690e1db5a added mysteryItem listing under subscriptions 2014-02-20 11:28:01 -05:00
Tyler Renelle
8de204dfc6 fix(swagger): let's add bootstrap.css for now, fixes some description
theming. If it breaks anything else, revert this
2014-02-19 09:35:22 -08:00
Tyler Renelle
67c7baab6f Merge pull request #2902 from thepeopleseason/api-wiki-transfer
Transcribed old wiki information to api.jade
2014-02-19 09:26:46 -08:00
James Hsiao
db74c33af5 transcribed old wiki to api.jade 2014-02-19 12:08:12 -05:00
Matteo Pagliazzi
477937a72c fix(i18n): add missing string 2014-02-19 17:27:07 +01:00
Tyler Renelle
a50f025132 feat(donations): add txnCount for each purchase 2014-02-18 17:17:56 -08:00
Matteo Pagliazzi
7baaf42884 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-02-18 20:31:14 +01:00
Matteo Pagliazzi
3cbe848f0c fix(i18n): add string 2014-02-18 20:30:59 +01:00
Tyler Renelle
f25fd411df chore(bailey): translations, bountysource 2014-02-18 11:11:35 -08:00
Denis
7d17752fa8 fix(travis): disable selenium tests on Travis 2014-02-18 20:44:28 +02:00
Denis
13f8e55dce fix(tests): set a proper environment for tests 2014-02-18 20:44:06 +02:00
Tyler Renelle
55782512bf feat(valentine): remove valentine event 2014-02-18 11:22:31 -07:00
benmanley
977aeec27f Merge remote-tracking branch 'upstream/develop' into develop 2014-02-18 15:55:33 +00:00
Lorian
94480d8cdb Added a second message under the "rest at the inn" button, explaining how the inn interacts with boss fights. 2014-02-17 13:43:27 -08:00
Matteo Pagliazzi
9ba3362642 fix(css): remove padding for heroboxes in modals, fix #2872 2014-02-17 22:43:09 +01:00
deilann
8cf10d3c46 Merge pull request #2870 from denis-sokolov/patch-1
chore(docs): fix outdated links for code contributors
2014-02-17 06:50:46 -08:00
Denis
3c62388a67 chore(docs): fix outdated links for code contributors 2014-02-17 16:48:08 +02:00
Matteo Pagliazzi
705d8a3b1a fix(css): fix chooseClass modal herobox padding 2014-02-16 19:58:53 +01:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Matteo Pagliazzi
4018ec885b fix(header): use strings and a small css fix 2014-02-16 14:51:48 +01:00