Blade Barringer
|
052d031752
|
Corrected missing slash
|
2015-02-03 14:11:39 -06:00 |
|
Matteo Pagliazzi
|
fd900a5edc
|
disabling loggly here and via configuration
|
2015-02-03 21:11:02 +01:00 |
|
Blade Barringer
|
8a8ce8d80d
|
Moved folders to website directory
|
2015-02-03 14:10:55 -06:00 |
|
Blade Barringer
|
576eec77f7
|
Removed extraneous img folder
|
2015-02-03 14:08:17 -06:00 |
|
Blade Barringer
|
9f420d0e7a
|
Made symlink to audio folder
|
2015-02-03 14:06:04 -06:00 |
|
Blade Barringer
|
380dab7ae9
|
Moved audio out of common public folder
|
2015-02-03 14:04:53 -06:00 |
|
Blade Barringer
|
d2eafdd021
|
Started moving public folder stuff back to website
|
2015-02-03 14:02:34 -06:00 |
|
Matteo Pagliazzi
|
3cde2aa485
|
chore(i18n): update locales
|
2015-02-03 19:54:38 +01:00 |
|
Blade Barringer
|
1e642fa4a8
|
Closed #4616. Added modal attribute habitrpg-tasks directive to
determine whether modals should be appended to body or to the task
|
2015-02-03 10:29:36 -06:00 |
|
Alice Harris
|
1a8a688c61
|
add link variables to seasonalShopClosedText
|
2015-02-03 18:06:41 +10:00 |
|
Alice Harris
|
162ea2fc05
|
convert date strings or empty string to date objects for auth.timestamps.created
|
2015-02-03 17:43:07 +10:00 |
|
Alice Harris
|
f60cef4e16
|
updated for second phase of removal (commented-out code was first phase / notes)
|
2015-02-03 17:23:33 +10:00 |
|
Sabe Jones
|
e1b5655ae5
|
Merge pull request #4614 from SabreCat/end-event
End Winter event
|
2015-02-02 19:12:57 -06:00 |
|
Sabe Jones
|
43c9a020b6
|
Merge pull request #461 from SabreCat/end-event
End Winter event
|
2015-02-02 19:12:49 -06:00 |
|
Sabe Jones
|
c5691c6536
|
chore(grunt): grunt full
|
2015-02-02 19:09:00 -06:00 |
|
Sabe Jones
|
1b0cd6b073
|
chore(news): Feb 2 Bailey
|
2015-02-02 19:06:52 -06:00 |
|
Blade Barringer
|
e55b8dd5bc
|
Wrote first version of sprite gulp task
|
2015-02-02 19:00:51 -06:00 |
|
Sabe Jones
|
48246d6a72
|
feat(seasonal): Normal view
|
2015-02-02 18:55:06 -06:00 |
|
Sabe Jones
|
c9b81414a4
|
feat(seasonal): Normal view
|
2015-02-02 18:53:54 -06:00 |
|
Blade Barringer
|
5a61f30138
|
Removed test sprite files
|
2015-02-02 18:27:39 -06:00 |
|
Matteo Pagliazzi
|
6945fb5767
|
allow emails to non registered users
|
2015-02-02 18:41:42 +01:00 |
|
Matteo Pagliazzi
|
44f73f26cd
|
fix guilds email link
|
2015-02-02 17:51:51 +01:00 |
|
Matteo Pagliazzi
|
0c88d1fc11
|
fix gems amount
|
2015-02-02 17:27:58 +01:00 |
|
Matteo Pagliazzi
|
9018a45d91
|
fix emailType
|
2015-02-02 17:21:02 +01:00 |
|
Matteo Pagliazzi
|
ea04ebac4e
|
Merge pull request #4611 from HabitRPG/paglias/email-notifications
feat(email-notifications): implement email notifications for events
|
2015-02-02 17:02:22 +01:00 |
|
Matteo Pagliazzi
|
b0a2f1fcaa
|
check for subscription preferences when sending party invitations
|
2015-02-02 16:50:14 +01:00 |
|
Matteo Pagliazzi
|
d97432f18c
|
chore(i18n): update locales
|
2015-02-02 16:05:04 +01:00 |
|
Matteo Pagliazzi
|
d211bc7f86
|
feat(email-notifications): implement email notifications for events
|
2015-02-02 15:40:56 +01:00 |
|
Blade Barringer
|
f5f1964249
|
Started organizing common folder
|
2015-02-01 23:09:07 -06:00 |
|
Blade Barringer
|
e7b68c87ad
|
Wrote copy task, started sprite config
|
2015-02-01 17:38:13 -06:00 |
|
Blade Barringer
|
87d91b07be
|
Added clean task
|
2015-02-01 17:25:08 -06:00 |
|
Blade Barringer
|
70fdc73d8f
|
Started working on gulp file. First version of karma and stylus complete
|
2015-02-01 17:10:53 -06:00 |
|
Blade Barringer
|
403554ae3a
|
Users cannot block admins. Also corrected logic so user cannot block
themselves
|
2015-02-01 15:26:16 -06:00 |
|
Matteo Pagliazzi
|
0649599cfc
|
add string
|
2015-02-01 22:24:08 +01:00 |
|
Blade Barringer
|
ce2e88c6af
|
Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert
|
2015-02-01 14:08:19 -06:00 |
|
Blade Barringer
|
88be8f3274
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
common/img/sprites/spritesmith/npcs/npc_justin_broken.png
common/img/sprites/spritesmith/npcs/npc_matt_broken.png
img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
img/sprites/spritesmith/npcs/npc_bailey_broken.png
img/sprites/spritesmith/npcs/npc_justin_broken.png
img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
|
2015-02-01 14:07:18 -06:00 |
|
Blade Barringer
|
2313211d30
|
Merge branch 'develop' into common-convert
|
2015-02-01 11:55:17 -06:00 |
|
Blade Barringer
|
cbc4e1efea
|
Adjusted subscription page to use correct formatting with one time
bindings
|
2015-02-01 09:27:10 -06:00 |
|
Matt T Elliott
|
1da26acc93
|
fix jade vs angular
|
2015-02-01 09:27:10 -06:00 |
|
Matt T Elliott
|
f6aefa5cf4
|
fix spacing
|
2015-02-01 09:27:09 -06:00 |
|
Matt T Elliott
|
cec5797fc9
|
fix presskit and header
|
2015-02-01 09:27:09 -06:00 |
|
Matt T Elliott
|
978ba0186e
|
fix bg popover translations
|
2015-02-01 09:25:44 -06:00 |
|
Matt T Elliott
|
71436288ff
|
fix quest rewards translation
|
2015-02-01 09:25:44 -06:00 |
|
Matt T Elliott
|
0d08f3edb0
|
fix translations on presskt page
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
aefcd116ab
|
fix translations on coupon page
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
4ed80824bf
|
fix translations on task progress chart
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
026b4ed716
|
add translations to subscription page
|
2015-02-01 09:25:43 -06:00 |
|
Matt T Elliott
|
c31272a154
|
add subscriptitonRateText
|
2015-02-01 09:25:43 -06:00 |
|
Blade Barringer
|
692f968ea4
|
Added score string
|
2015-02-01 09:25:04 -06:00 |
|
Matt T Elliott
|
b6d4b7ea79
|
add translation strings
|
2015-02-01 09:25:04 -06:00 |
|