 James Hsiao
|
f192e2df39
|
fixed /space issue
|
2014-03-10 08:57:41 -04:00 |
|
|
Tyler Renelle
|
7dcc9e29ea
|
Merge pull request #2987 from thepeopleseason/member-modal-spacing
Member modal spacing
|
2014-03-09 16:48:55 -06:00 |
|
|
Matteo Pagliazzi
|
2321b40753
|
fix(i18n): do not translate DELETE when used to delete account
|
2014-03-04 19:53:15 +01: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 |
|
|
Tyler Renelle
|
82c6c14985
|
chore(bailey): hedgehog quest
|
2014-03-01 08:41:47 -07:00 |
|
|
Tyler Renelle
|
fda191ffc2
|
chore(bailey): mystery item
|
2014-02-22 22:10:39 -08:00 |
|
|
James Hsiao
|
9fe8da3c12
|
fix space issues: contrib modal, challenge list
|
2014-02-20 20:33:10 -05:00 |
|
|
Tyler Renelle
|
f25fd411df
|
chore(bailey): translations, bountysource
|
2014-02-18 11:11:35 -08:00 |
|
|
Tyler Renelle
|
677c83c592
|
chore(bailey): valentine
|
2014-02-13 18:45:36 -07:00 |
|
|
Tyler Renelle
|
fd6eb8724e
|
feat(valentine): valentine event
|
2014-02-13 18:40:33 -07:00 |
|
|
Tyler Renelle
|
2750548d35
|
chore(bailey): bailey for chat notifs & toolbar
|
2014-02-12 21:37:14 -07:00 |
|
|
Tyler Renelle
|
c95c6a4c3b
|
chore(modals): remove mathUpdates modal (no longer in use). reference
this commit for any future emergency updates
|
2014-02-12 21:24:50 -07:00 |
|
|
Matteo Pagliazzi
|
fa2c64d2d8
|
chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings
|
2014-02-11 19:30:55 +01:00 |
|
|
Tyler Renelle
|
2480591444
|
refactor(bs3): put paypal button back in, use javascript API to
construct button on `ng-init` (since you can't nest script tags)
|
2014-02-10 13:28:16 -07:00 |
|
|
Tyler Renelle
|
ffb42906e1
|
feat(event-tracking): start adding some client-side GA event-tracking
|
2014-02-10 11:33:40 -07:00 |
|
|
Matteo Pagliazzi
|
3f28d16478
|
refactor(bs3): add fixed height modals & panels
|
2014-02-09 16:25:10 +01:00 |
|
|
Matteo Pagliazzi
|
1a44c3cf0c
|
refactor(bs3): css
|
2014-02-09 16:16:43 +01:00 |
|
|
Matteo Pagliazzi
|
0fe0cb4f2d
|
refactor(bs3): labels style and text, buttons classes
|
2014-02-08 16:27:34 +01:00 |
|
|
Tyler Renelle
|
3473b73452
|
chore(Merge): branch 'develop' into bs3
Conflicts:
views/options/inventory/inventory.jade
|
2014-02-07 17:42:12 -07:00 |
|
|
Tyler Renelle
|
5d0ef55429
|
chore(bailey): update with stability info & subscriber links
|
2014-02-07 13:43:41 -07:00 |
|
|
Tyler Renelle
|
677d23939d
|
chore(bailey): add images for previous commit
|
2014-02-07 11:53:01 -07:00 |
|
|
Tyler Renelle
|
82241634b3
|
chore(bailey): bailey re: rainbow hair, critical hammer, mystery item
|
2014-02-07 11:42:05 -07:00 |
|
|
Matteo Pagliazzi
|
ce5edbee58
|
refactor(bs3): consistent style for modals
|
2014-02-05 16:51:35 +01:00 |
|
|
Matteo Pagliazzi
|
3f4d266b00
|
refactor(bs3): sync with develop
|
2014-02-04 19:59:48 +01:00 |
|
|
deilann
|
1a652eefd6
|
pull correct information for member modal class
|
2014-02-03 12:42:09 -08:00 |
|
|
Matteo Pagliazzi
|
07593dc122
|
refactor(bs3): port quests modals, fix restore modal and various bugs
|
2014-02-02 16:43:58 +01:00 |
|
|
Matteo Pagliazzi
|
571954b5cf
|
refactor(bs3): misc fixes, port restore, delete and reset modals
|
2014-02-02 16:06:30 +01:00 |
|
|
Matteo Pagliazzi
|
317a148760
|
refactor(bs3): port newStuff and member modals, misc fixes
|
2014-02-02 15:55:01 +01:00 |
|
|
Matteo Pagliazzi
|
3e077fea6d
|
refactor(bs3): port rebirth and reroll modals, misc fixes
|
2014-02-02 13:52:42 +01:00 |
|
|
Matteo Pagliazzi
|
211be37cfc
|
refactor(bs3): fix classes modal
|
2014-02-02 13:42:29 +01:00 |
|
|
Matteo Pagliazzi
|
f31723b0ab
|
refactor(bs3): sync with develop
|
2014-02-02 13:26:35 +01:00 |
|
|
Tyler Renelle
|
527f230ee5
|
Merge pull request #2701 from deilann/wizardtomage
Change "Wizard" to "Mage" in member modal & inventory
|
2014-02-01 16:21:32 -08:00 |
|
|
deilann
|
8843577858
|
show mage not wizard in inventory and member modal
|
2014-02-01 15:17:14 -08:00 |
|
|
Matteo Pagliazzi
|
8b29eb530a
|
refactor(bs3): port drops modals
|
2014-02-01 19:39:05 +01:00 |
|
|
Matteo Pagliazzi
|
f6a8b9e4cb
|
refactor(bs3): port some modals & css fixes
|
2014-02-01 19:19:48 +01:00 |
|
|
Matteo Pagliazzi
|
af42ec263e
|
refactor(bs3): port several modals & css fixes
|
2014-02-01 17:04:21 +01:00 |
|
|
Matteo Pagliazzi
|
0a047f5b2f
|
Merge branch 'develop' into paglias/bs3
|
2014-02-01 16:47:32 +01:00 |
|
|
Matteo Pagliazzi
|
ff49695635
|
refactor(bs3): misc fixes & port death modal
|
2014-02-01 16:46:48 +01:00 |
|
|
Tyler Renelle
|
a9d7add1e3
|
chore(bailey): baconsaur update
|
2014-01-31 22:03:52 -07:00 |
|
|
Tyler Renelle
|
b29231056b
|
chore(bailey): vice notif
|
2014-01-31 15:36:47 -07:00 |
|
|
Tyler Renelle
|
800231cf64
|
feat(quests): allow html in quest notes
|
2014-01-31 15:06:56 -07:00 |
|
|
Matteo Pagliazzi
|
49e1bf1ba4
|
refactor(bs3): fix
|
2014-01-31 22:05:09 +01:00 |
|
|
Matteo Pagliazzi
|
823296fc41
|
refactor(bs3): sync with develop
|
2014-01-31 21:56:39 +01:00 |
|
|
Tyler Renelle
|
179316e10f
|
feat(restore): add restore-gp back in. Parly to end the winter event,
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
|
2014-01-31 12:54:37 -07:00 |
|
|
Tyler Renelle
|
4ba5a9cf26
|
refactor(restore): remove restore-gear commented-out code, that stuff is
incompatible with new gear setup (circa class system)
|
2014-01-31 12:50:13 -07:00 |
|
|
Matteo Pagliazzi
|
cc348b2f11
|
refactor(bs3): sync with develop & misc
|
2014-01-31 20:04:40 +01:00 |
|
|
Tyler Renelle
|
0a0c6c73a5
|
chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness
|
2014-01-30 21:34:06 -07:00 |
|
|
Tyler Renelle
|
aff885c05c
|
feat(habitBirthday): add habitrpg birthday event. includes cakes for all
pets, absurd party robes, npc swap, badge, etc. @lemoness
|
2014-01-30 19:20:07 -07:00 |
|
|
Matteo Pagliazzi
|
c7c6181bbc
|
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
|
2014-01-30 22:26:28 +01:00 |
|