Tyler Renelle
2209bd5a0c
chore(bower): back to angular-ui-router SHA, I'll explain on GH for this commit
2014-02-28 23:48:20 -07:00
Tyler Renelle
01180416ef
fix(ui-router): upgraded angular-ui-router, $anchorScroll no
...
longer supported. See https://github.com/angular-ui/ui-router/pull/715
for autoscroll attribute if we need to enable/disable ui-view
autoscrolling in certain locations (cc @paglias)
2014-02-28 22:42:27 -07:00
Tyler Renelle
4620dcebb9
chore(bower): remove SHA-based dependencies from bower.json, instead
...
using #master. Fixes #2682
2014-02-28 22:12:15 -07:00
Tyler Renelle
bb6f63710c
chore(bower): bowerrc (see https://github.com/bower/bower/issues/933 )
2014-02-28 22:12:15 -07:00
Sabe Jones
ff3f1c590c
fix(bosses): Use ceiling rounding for boss HP
...
Corrects the issue reported by some users where boss HP shows 0 but they're not actually defeated yet. Man, Angular "number" directive, why you gotta round like that?
2014-02-28 19:07:57 -06:00
Tyler Renelle
748f76b928
Merge pull request #2808 from deilann/createparty
...
adding pertinent info to create party
2014-02-27 09:35:55 -08:00
Tyler Renelle
1fa3d53514
Merge pull request #2926 from denis-sokolov/readme-improvements
...
Readme improvements
2014-02-27 09:31:48 -08:00
Matteo Pagliazzi
a32c17f590
Merge pull request #2954 from denis-sokolov/test-return-code
...
fix(tests): correctly return the exit code
2014-02-26 19:03:05 +01:00
Denis
28729cf71b
fix(tests): correctly return the exit code
2014-02-26 16:57:49 +02:00
Sabe Jones
39380507e7
fix(Market): Move Saddle back with food
...
Moves Saddle out of the Special category of the Market into the "Food and Saddles" group, to match up with the label and grouping used elsewhere.
Fixes #2937
2014-02-25 19:23:57 -06:00
Matteo Pagliazzi
c41097b6ec
fix(i18n): remove duplicate string
2014-02-24 18:35:48 +01:00
Matteo Pagliazzi
010883409d
fix(i18n): use string for new subscriber item
2014-02-23 12:12:00 +01:00
Tyler Renelle
fda191ffc2
chore(bailey): mystery item
2014-02-22 22:10:39 -08:00
Tyler Renelle
13094c127a
feat(premium): unlock mystery items within timeframe of sub sign-on
2014-02-22 21:43:44 -08:00
Tyler Renelle
a1e66ab99e
feat(premium): mystery item notif in toolbar
2014-02-22 21:00:10 -08:00
Tyler Renelle
91d8ebad6d
feat(premium): add mystery-item gear slot
2014-02-22 20:38:16 -08:00
Tyler Renelle
7311850d09
feat(accessories): add back accessory
2014-02-22 20:38:16 -08:00
Matteo Pagliazzi
35a997c690
Merge pull request #2917 from benmanley/stable-styles
...
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
2014-02-22 15:25:01 +01:00
Matteo Pagliazzi
4d6b83e0cc
Merge pull request #2925 from denis-sokolov/patch-1
...
fix(readme): build status for the develop branch
2014-02-22 15:00:10 +01:00
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
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