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
Tyler Renelle
67c7baab6f
Merge pull request #2902 from thepeopleseason/api-wiki-transfer
...
Transcribed old wiki information to api.jade
2014-02-19 09:26:46 -08:00
James Hsiao
db74c33af5
transcribed old wiki to api.jade
2014-02-19 12:08:12 -05:00
Matteo Pagliazzi
477937a72c
fix(i18n): add missing string
2014-02-19 17:27:07 +01:00
Tyler Renelle
a50f025132
feat(donations): add txnCount for each purchase
2014-02-18 17:17:56 -08:00
Matteo Pagliazzi
7baaf42884
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-02-18 20:31:14 +01:00
Matteo Pagliazzi
3cbe848f0c
fix(i18n): add string
2014-02-18 20:30:59 +01:00
Tyler Renelle
f25fd411df
chore(bailey): translations, bountysource
2014-02-18 11:11:35 -08:00
Tyler Renelle
55782512bf
feat(valentine): remove valentine event
2014-02-18 11:22:31 -07:00
Matteo Pagliazzi
9ba3362642
fix(css): remove padding for heroboxes in modals, fix #2872
2014-02-17 22:43:09 +01:00
deilann
8cf10d3c46
Merge pull request #2870 from denis-sokolov/patch-1
...
chore(docs): fix outdated links for code contributors
2014-02-17 06:50:46 -08:00
Denis
3c62388a67
chore(docs): fix outdated links for code contributors
2014-02-17 16:48:08 +02:00
Matteo Pagliazzi
705d8a3b1a
fix(css): fix chooseClass modal herobox padding
2014-02-16 19:58:53 +01:00
Matteo Pagliazzi
4018ec885b
fix(header): use strings and a small css fix
2014-02-16 14:51:48 +01:00
Tyler Renelle
94944f2cac
fix(quests): temp workaround for #2853 `Cannot read property 'collect'
...
of undefined`
2014-02-15 14:27:40 -07:00
Matteo Pagliazzi
8b2ea61461
Merge pull request #2850 from deilann/correct-toolbar
...
fix inventory dropdown for pets
2014-02-15 15:53:48 +01:00
deilann
a624ea702d
fix inventory dropdown for pets
2014-02-15 06:48:29 -08:00
Tyler Renelle
78fcdd20c9
chore(tests): tests to go along with #1883 challenges fix
2014-02-14 20:37:16 -07:00
Tyler Renelle
191b789d76
fix(bower): updated jquery directory
2014-02-14 20:04:59 -07:00
Tyler Renelle
33b326b596
fix(challenges): better handling of deleted challenges. If !chal, break the task.challenge. Move the function into userController#score so we have access to next, etc. fixes #1883
2014-02-14 19:49:34 -07:00
Matteo Pagliazzi
00bece28d4
chore(dependencies): update jquery path
2014-02-14 18:46:32 +01:00
Matteo Pagliazzi
e0193e36c3
chore(dependencies): update jquery parh
2014-02-14 18:43:18 +01:00
Matteo Pagliazzi
fb7b1dca17
Merge branch 'upgrade' into develop
2014-02-14 18:36:22 +01:00
Matteo Pagliazzi
8f19f225f1
fix(misc): some styles & translations
2014-02-14 18:35:21 +01:00
Tyler Renelle
850c4fda9a
fix(tags): span(type='submit') is invalid. But since you can't theme
...
input-groups with input.input-group-addon, let's just make this an
ng-click. fixes #2818
2014-02-14 10:33:26 -07:00
Sabe Jones
e241429cc3
fix(toolbar): Tweak Settings drop-down
...
"Site" was the best I could come up with for all the miscellany in Settings > Settings.
2014-02-14 08:14:02 -06:00
Tyler Renelle
a33eabf20b
chore(bower): angular upgrade => 1.2.12
2014-02-13 22:50:13 -07:00
Tyler Renelle
844dc93316
chore(jquery): use updated jquery directory location
2014-02-13 22:04:53 -07:00
Sabe Jones
4454204f47
fix(toolbar): Tweak icon popovers
...
Changed "Profile" toolbar icon popover to "User" and "Market" icon popover to "Inventory". Straightens out weird paths, so you don't go "Market > Market" or "Profile > Profile".
2014-02-13 20:39:22 -06: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
8ba12ef392
chore(contribs_plan): add migration so contribl.lvl >= 7 gets free
...
plan4life
2014-02-13 11:54:45 -07:00
Tyler Renelle
c8faffcc72
fix(css): temp fix for bailey height
2014-02-12 22:31:32 -07:00
Tyler Renelle
7456f00dc6
feat(toolbar): try with icons instead of text, test against prod / beta
...
& get a vote.
2014-02-12 22:17:26 -07:00
Tyler Renelle
5501d57e10
fix(toolbar): tweaks
2014-02-12 21:51:35 -07:00
Tyler Renelle
f6abfc67b3
feat(tracking): gems > toolbar separately from wallet
2014-02-12 21:44:27 -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
Tyler Renelle
f72cb21300
feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, &
...
chat / invite notifications
2014-02-12 21:21:36 -07:00
Tyler Renelle
ce82be637d
feat(groups): add group chat notifications
2014-02-12 21:21:30 -07:00
Matteo Pagliazzi
bb852ce9e5
Merge pull request #2827 from HabitRPG/paglias/optimizations
...
Optimizations
2014-02-12 19:21:10 +01:00
Matteo Pagliazzi
99474729aa
fix(typo)
2014-02-12 19:10:45 +01:00
Matteo Pagliazzi
bb6931fe83
refactor(grunt): cache gifs
2014-02-12 18:08:17 +01:00
Matteo Pagliazzi
fef858d555
refactor(caching): cache emojis and remove gemoji from bower
2014-02-12 15:21:40 +01:00
Matteo Pagliazzi
8fdc5327e9
refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification
2014-02-12 15:10:22 +01:00
Matteo Pagliazzi
fb496de42f
refactor(caching): only 1 css file, use grunt-contrib-cssmin to rewrite urls
2014-02-12 14:34:50 +01:00
Matteo Pagliazzi
fbe3ecc033
refactor(grunt): simplify run:dev task
2014-02-12 13:59:13 +01:00
Matteo Pagliazzi
aaa230790b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-02-12 10:49:30 +01:00
Matteo Pagliazzi
094a4be001
fix(i18n): do not save user language for now
2014-02-12 10:49:10 +01:00
