 Blade Barringer
|
ae8542eaf1
|
Removed extraneous console logs left while testing
|
2014-12-29 15:50:44 -06:00 |
|
|
Blade Barringer
|
efba545147
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2014-12-29 15:44:06 -06:00 |
|
|
Blade Barringer
|
b3025c36b1
|
Fixed checklist not advancing to next input. Closes #4430
|
2014-12-29 15:43:20 -06:00 |
|
|
Matteo Pagliazzi
|
756fa83418
|
fix(date): typo
|
2014-12-29 22:26:12 +01:00 |
|
|
Matteo Pagliazzi
|
cb13b5ac26
|
fix(date): add YYYY/MM/DD format
|
2014-12-29 22:16:58 +01:00 |
|
|
Matteo Pagliazzi
|
3105b61cb5
|
Merge branch 'Verabird-dateformat' into develop
|
2014-12-29 21:24:44 +01:00 |
|
|
Matteo Pagliazzi
|
4a37bec652
|
fix(pr): indentation and simplify
|
2014-12-29 21:21:54 +01:00 |
|
|
Blade Barringer
|
4e1b298a42
|
Corrected spelling error in comment
|
2014-12-29 14:16:25 -06:00 |
|
|
Matteo Pagliazzi
|
752161b284
|
Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat
|
2014-12-29 21:09:04 +01:00 |
|
|
Alice Harris
|
1ff19efac5
|
Merge pull request #4431 from andyzinsser/develop
Fix #4396 - Duplicate class tour dialogs
|
2014-12-28 12:07:47 +10:00 |
|
|
Andy Zinsser
|
1a4455550d
|
Remove duplicate equipment-tab classes
|
2014-12-27 17:49:58 -08:00 |
|
|
Negue
|
a082e88b5d
|
Filter Array only once and one time binding - closes #4429
|
2014-12-27 23:26:30 +01:00 |
|
|
Matteo Pagliazzi
|
85f4a2884a
|
add some more debugging for cron
|
2014-12-27 12:56:54 +01:00 |
|
|
Blade Barringer
|
2bb1e5cf7f
|
Merge branch 'confirm-delete' into develop
|
2014-12-26 21:04:48 -06:00 |
|
|
Blade Barringer
|
695c463b40
|
Added confirmation dialog before deleting message
|
2014-12-26 21:04:22 -06:00 |
|
|
Blade Barringer
|
72d4bf2bf5
|
Merge pull request #4423 from andyzinsser/fix-no-food-text-color
Add muted class when no food is in inventory
|
2014-12-26 20:47:15 -06:00 |
|
|
Andy Zinsser
|
db6f52e4b5
|
Add muted class when no food is in inventory
|
2014-12-26 18:31:21 -08:00 |
|
|
Alice Harris
|
af7e68259d
|
Merge pull request #4404 from sbreiler/develop
Fix #4296 (Subscription "Update Card" message is cut off)
|
2014-12-27 12:29:04 +10:00 |
|
|
Blade Barringer
|
ffbd3c703a
|
Merge pull request #4411 from crookedneighbor/seasonal-shop-indication-if-purchased
Added trasnparent class to seasonal items already owned
|
2014-12-26 16:35:53 -06:00 |
|
|
Verabird
|
9b10081117
|
Removed useless comment in task.jade
|
2014-12-26 16:07:54 -05:00 |
|
|
Verabird
|
2de3e65043
|
Fix merge conflicts with test values
|
2014-12-26 16:00:45 -05:00 |
|
|
Verabird
|
8852ad61b2
|
Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed
|
2014-12-26 15:52:42 -05:00 |
|
|
Verabird
|
7297429888
|
Make it possible to choose between MM/dd and dd/MM date format
|
2014-12-26 15:52:42 -05:00 |
|
|
Verabird
|
e391fc04f0
|
Add variables for medium-length date display
|
2014-12-26 15:52:42 -05:00 |
|
|
Verabird
|
13be267efb
|
added variable for date display and checking line ending issue
|
2014-12-26 15:52:41 -05:00 |
|
|
Blade Barringer
|
f5a0bd6903
|
Added trasnparent class to seasonal items already owned
|
2014-12-25 21:32:07 -06:00 |
|
|
Sabe Jones
|
a1eb4bfa5b
|
Merge pull request #4408 from SabreCat/seasonal
Winter Wonderland 2015 Cont'd
|
2014-12-25 17:47:50 -06:00 |
|
|
Sabe Jones
|
1b4843ff58
|
fix(event): Better quest text placement
|
2014-12-25 17:42:09 -06:00 |
|
|
Sabe Jones
|
f4c582eb24
|
fix(event): quest syntax
|
2014-12-25 17:40:49 -06:00 |
|
|
Sabe Jones
|
597793e3ca
|
feat(event): Quests and Bailey
|
2014-12-25 17:36:16 -06:00 |
|
|
Sabe Jones
|
6d4d9451a5
|
feat(event): Mystery migration
|
2014-12-25 17:09:06 -06:00 |
|
|
Sabe Jones
|
1c90886548
|
fix(event): Better shop flow
|
2014-12-25 15:52:26 -06:00 |
|
|
Sabe Jones
|
0e28f04c90
|
feat(event): Implement Seasonal Shop
|
2014-12-25 14:33:11 -06:00 |
|
|
Verabird
|
03f12a3718
|
Make it possible to choose between MM/dd and dd/MM date format
|
2014-12-24 22:18:50 -05:00 |
|
|
Blade Barringer
|
a8459c2f96
|
Changing button to a element fixed the delete on enter problem
|
2014-12-24 11:17:05 -06:00 |
|
|
Blade Barringer
|
0339bdf43f
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2014-12-24 09:02:20 -06:00 |
|
|
Blade Barringer
|
fdcc22bde9
|
Closes #4361
|
2014-12-24 09:02:03 -06:00 |
|
|
benmanley
|
118ba88d3d
|
fix(tasks): improve UI consistency and layout
* Match UI elements with rest of site
* Tidy up layout
|
2014-12-24 09:53:41 +00:00 |
|
|
benmanley
|
8cf3cd66cc
|
fix(avatar): prevent avatar from obscuring name
Increase z-index of avatar-name so that avatar image doesn’t obscure it
when riding a mount
|
2014-12-24 09:53:40 +00:00 |
|
|
breiste
|
e1eaefa943
|
Fix #4296 (Subscription "Update Card" message is cut off)
|
2014-12-24 00:14:08 +01:00 |
|
|
Matteo Pagliazzi
|
635ebf626b
|
fix(flag-email): correctly format date
|
2014-12-23 18:54:56 +01:00 |
|
|
Matteo Pagliazzi
|
c55ebf5c07
|
Merge pull request #4402 from HabitRPG/add-flag-to-chat
Add flag to chat
|
2014-12-23 18:36:23 +01:00 |
|
|
Blade Barringer
|
8e0358f7c7
|
Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat
|
2014-12-23 10:08:01 -06:00 |
|
|
Blade Barringer
|
84db289957
|
Merge branch 'develop' into add-flag-to-chat
|
2014-12-23 10:07:42 -06:00 |
|
|
Verabird
|
42cb93c673
|
Add variables for medium-length date display
|
2014-12-22 22:23:11 -05:00 |
|
|
Verabird
|
c4143c7805
|
added variable for date display and checking line ending issue
|
2014-12-22 15:19:53 -05:00 |
|
|
Matteo Pagliazzi
|
4c785e8459
|
fix(flag-chat): correct url for tavern flags
|
2014-12-22 21:09:27 +01:00 |
|
|
Blade Barringer
|
37b9e5012a
|
Added links to user modals
|
2014-12-22 13:22:42 -06:00 |
|
|
Matteo Pagliazzi
|
2d4c5e7b98
|
feat(flag-chat): fetch author and add some group variables
|
2014-12-22 20:02:22 +01:00 |
|
|
Matteo Pagliazzi
|
7aff280a71
|
feat(flag-chat): add some variables
|
2014-12-22 19:56:11 +01:00 |
|