Commit graph

4898 commits

Author SHA1 Message Date
benmanley
ea650c8acf Fix gap at bottom of toolbar and remove unused code 2014-03-18 20:14:29 +00:00
benmanley
a5bce9e8b6 Close submenu when a navigation link is clicked 2014-03-18 17:33:14 +00:00
benmanley
055c25fac3 Remove gold and silver totals from Reward list 2014-03-18 17:30:57 +00:00
benmanley
addb05686b Hide .navbar-info on mobile until toggled 2014-03-17 23:47:43 +00:00
benmanley
bd79234570 Hide toolbar-submenu until toggled 2014-03-17 23:42:04 +00:00
Tyler Renelle
7c531af4fc Merge pull request #3082 from Sepero/patch-1
Fix day start max hour
2014-03-17 17:27:28 -06:00
Sabe Jones
835be7f1e8 Merge pull request #3087 from HabitRPG/sabe/quests
Allow purchase of quest pet eggs in Market
2014-03-17 14:47:14 -05:00
Tyler Renelle
b8a6366d1a Revert "chore(cluster): set max #cores to 1 for now (we're maxing memory again)"
This reverts commit 3f5221755c.
2014-03-17 13:09:35 -06:00
sabrecat
7102943aa1 feat(quests): Allow purchase of quest pets
Implements purchase in the Market of the two currently available pet quest eggs, after the user has completed the corresponding quest at least twice. This is a hard-code solution; @lefnire or others a little more adept in Angular might be able to make this generic and extensible with an ng-repeat--I just couldn't get the expression quite right.
2014-03-17 12:20:27 +00:00
Tyler Renelle
5b3302202d Merge pull request #3045 from thepeopleseason/vagrant-setup
Vagrant configuration update
2014-03-16 22:58:59 -06:00
Sabe Jones
d62d94c4fc WIP: Enable quest eggs in Market after two runs 2014-03-16 22:23:23 -05:00
benmanley
1fc549e6c1 Add herobox background colour variables 2014-03-16 23:53:51 +00:00
benmanley
543e3695c2 Improve navbar layout
Make navbar fixed for desktop and static for mobile.
2014-03-16 23:53:15 +00:00
Sepero
974a840016 Fix day start max hour
A 24 hour clock goes from 0 to 23.

A friend of mine plays your game and referred me to your "dailies" bounty. This probably won't fix that issue, but I'll submit anyway.  :)
2014-03-16 10:22:58 -04:00
benmanley
6ca6bbedec Move sync button from submenu into navbar 2014-03-15 18:21:11 +00:00
benmanley
495e0fe60f Change hardcoded text to variable 2014-03-15 13:05:31 +00:00
benmanley
c63f4b7c4c Change navbar background-color
Correct navbar background-color and remove some redundant styles
2014-03-15 08:26:25 +00:00
benmanley
0ec5ca48f5 Remove flying pig custom styles
Remove styles that haven’t been pulled into habitrpg
2014-03-14 23:43:18 +00:00
benmanley
eef5e55ad9 Redesign navbar
Restyle navigation and improve mobile layout
2014-03-14 23:32:32 +00:00
Tyler Renelle
b8cd762de2 chore(package.json): upgrade karma-requirejs, fixes #3061 2014-03-14 11:40:12 -06:00
James Hsiao
66b0f87f65 added provisioning and removed need for direct DL 2014-03-14 09:18:16 -04:00
Tyler Renelle
3f5221755c chore(cluster): set max #cores to 1 for now (we're maxing memory again) 2014-03-13 10:10:45 -06:00
benmanley
b2e62f121f Merge remote-tracking branch 'upstream/develop' into develop 2014-03-13 13:11:47 +00:00
Tyler Renelle
35708ccc9c fix(seed): all groups must have a privacy 2014-03-12 18:42:49 -06:00
benmanley
e4e6100652 Merge branch 'develop' of https://github.com/benmanley/habitrpg into develop
Conflicts:
	public/css/inventory.styl
2014-03-10 20:20:58 +00:00
benmanley
db2ff45551 Add custom css to prevent Flying Pig progress bar being hidden 2014-03-10 19:06:41 +00:00
Matteo Pagliazzi
b20ed298dd Merge pull request #3044 from thepeopleseason/member-modal-spacing
Member modal spacing fix's fix.
2014-03-10 14:20:05 +01:00
James Hsiao
f192e2df39 fixed  /space issue 2014-03-10 08:57:41 -04:00
Tyler Renelle
4814f479a4 Merge pull request #2874 from lorian/inn-text
Added a second message under the "rest at the inn" button, explaining ho...
2014-03-09 16:51:28 -06:00
Tyler Renelle
7dcc9e29ea Merge pull request #2987 from thepeopleseason/member-modal-spacing
Member modal spacing
2014-03-09 16:48:55 -06:00
Tyler Renelle
cbd6e6f4e8 Merge pull request #3002 from Omnomnobot/patch-2
Update API footer link
2014-03-09 16:47:41 -06:00
Tyler Renelle
449001076c Merge pull request #2989 from thepeopleseason/vagrant-setup
Added Vagrant for unified, portable dev environment
2014-03-08 20:40:27 -07:00
Dušan Juretić
9995c255e3 Fix failing unit test 2014-03-08 23:37:37 -03:00
Sabe Jones
d3f755d30c fix(buffs): Even out spacing on level tag
Inline CSS is bad! Also the buff icon looked lopsided on a character who also had the Rebirth badge.
2014-03-08 17:15:33 -06:00
Tyler Renelle
658598f9ea fix(extensions): redirect extensions page to wikia, fixes #3022 2014-03-07 12:14:54 -07:00
Matteo Pagliazzi
acb31b99ad fix(stikyHeader): fix #2904 2014-03-06 14:47:35 +01:00
snicker
1968a22c04 fix(chat): autocomplete list aligns properly with the @ symbol again 2014-03-04 18:54:58 -08:00
Omnomnobot
9daf3c2f97 Update API footer link
The Wiki page here on Github is quite useless now, the most useful infos are in https://habitrpg.com/static/api an the official Wiki
2014-03-04 22:41:29 +01:00
Matteo Pagliazzi
2321b40753 fix(i18n): do not translate DELETE when used to delete account 2014-03-04 19:53:15 +01:00
James Hsiao
967b7d4898 updated to remove unnecessary init 2014-03-03 15:54:48 -05:00
James Hsiao
3abaf17026 Added Vagrant for unified development env. 2014-03-03 15:48:04 -05:00
Tyler Renelle
129189f033 chore(bailey): bailey for march mystery 2014-03-02 14:40:11 -07:00
James Hsiao
a5cdbcc158 added spacing for member modal 2014-03-02 09:38:01 -05:00
Matteo Pagliazzi
431c62b68f Merge pull request #2981 from TheSisb/patch-1
Fix alignment of buttons
2014-03-02 11:50:04 +01:00
Tyler Renelle
acc32473a4 chore(migration): fix users who subscribed but didn't get item 2014-03-01 18:05:34 -07:00
Tyler Renelle
2e4aa19ac8 fix(facebook): api facebook bug 2014-03-01 17:28:16 -07:00
TheSisb
2c8a43e248 Fixing buttons alignment in panel headings 2014-03-01 10:18:06 -08:00
TheSisb
42b6a5bc7c undoing inline style fix 2014-03-01 10:16:51 -08:00
TheSisb
49591ef527 Fix alignment of buttons
Simple fix
2014-03-01 10:00:32 -08:00
Tyler Renelle
82c6c14985 chore(bailey): hedgehog quest 2014-03-01 08:41:47 -07:00