Commit Graph

4837 Commits

Author SHA1 Message Date
deilann 18328f6a4e Merge pull request #3421 from tjwds/wiki2
Wiki, now with added locales
2014-05-05 20:05:57 -07:00
joe woods e7094fd9bd Update tavern.jade 2014-05-05 22:53:12 -04:00
Tyler Renelle 21f79a8139 chore(bailey): mobile + chrome ext. update 2014-05-05 14:13:04 -06:00
Tyler Renelle 6d00289d99 Merge pull request #3304 from jbutz/todo_archive_flag_ui
feat(archive_todo): Update batchUpdate
2014-05-03 21:44:24 -06:00
Tyler Renelle 5733a23c46 Merge pull request #3302 from jbutz/todo_archive_flag
feat(todo_archive): add archive flag
2014-05-03 21:41:18 -06:00
Tyler Renelle 24b05e9106 Merge pull request #3341 from kitsully/develop
Spelling Fix
2014-05-03 21:34:28 -06:00
Tyler Renelle 6757a46afc feat(spring): remove limited pastel hair colors 2014-04-30 22:33:38 -06:00
Tyler Renelle befde8ccda chore(bailey): bailey for may 2014-04-30 22:33:12 -06:00
deilann 8e83064ebb fix subscribe cancel button not appearing
Fixes #3383

Show unsubscribe button logic was nested within the non-subscriber text.
2014-04-30 13:02:54 -07:00
Tyler Renelle 540431ee8b chore(bailey): mobile, spring fling, stwc 2014-04-30 00:28:16 -06:00
SabreCat 3f5e130552 feat(tooltips): Add expand/collapse cues
Some users (@fragmental) didn't realize that you could click the checklist badge to expand or collapse checklists. This commit adds a tooltip to the badge, as well as to a couple other not-obviously-clickable spots, to cue the user that they can be expanded and collapsed.

BREAKING CHANGE: Will result in "String not found" errors until all locales have an "expandCollapse" string available.
2014-04-28 20:44:16 -05:00
SabreCat ef5b7deff3 fix(achievements): Differentiate singular and plural
Allows Streak and Perfect Day achievements to dynamically show a singular or plural version of their text based on how many achievements the viewed profile has stacked.

BREAKING CHANGE: Will lead to 'string not found' errors until the singular version strings are implemented in all locales on habitrpg-shared.
2014-04-27 21:36:21 -05:00
Tyler Renelle da548ff43f chore(env.t): expose basic env.t() implementation for 'en' so mobile app
can use the function
2014-04-27 17:30:39 -06:00
James Hsiao c5bfe57344 Merge pull request #3358 from ninjaflame555/patch-1
Further explainations of software installation during provision of vagrant virtual machine
2014-04-27 10:07:55 -04:00
benmanley 7f984c859c fix(settings.jade): amend inconsistent html
Correct spelling error
Add .container-fluid to subscriptions view
2014-04-27 13:02:28 +01:00
Tyler Renelle 82eb9a0632 refactor(profile): character customizations as mixin so can be used on mobile 2014-04-27 00:21:27 -06:00
ninjaflame555 ee94b69d8d Further explains what the installation is doing. 2014-04-27 02:03:05 -04:00
Tyler Renelle 3a7c994f1a refactor(avatar): support minimal avatar displays (using for mobile sidebar) 2014-04-26 18:46:26 -06:00
Tyler Renelle 979d7d85a4 refactor(avatar): avatar separated into two mixins: +heroBox() and
+avatar(). Mobile will be sharing jade files with web, we'll need more
modular markup
2014-04-26 15:12:03 -06:00
Tyler Renelle 61649d1e5a fix(bower): pin ngIninfiteSroll, fix location in bower_components 2014-04-24 21:39:36 -06:00
Tyler Renelle 09c8687958 feat(mystery): missing promo piece 2014-04-24 17:49:12 -06:00
Tyler Renelle 425218d9a7 feat(mystery): april mystery item 2014-04-24 17:48:21 -06:00
Kristopher Sullivan 9c046577de Spelling Fix
Fixes the misspelling of accommodate as per #2582

Signed-off-by: Kristopher Sullivan <kris@kristophersullivan.com>
2014-04-23 17:10:41 -04:00
Tyler Renelle 20b2fb9fd2 Merge pull request #3339 from thepeopleseason/blank-notifications
fix(notifications): eliminate blank notifications
2014-04-23 14:50:26 -06:00
benmanley aeb205b8ad fix(toolbar): change "noNotifications" text to string 2014-04-23 21:39:56 +01:00
benmanley e830419234 fix(toolbar): use :before to prevent popover conflict
Use :before instead of :after to prevent custom styles conflicting with
Bootstrap popovers.
2014-04-23 21:39:55 +01:00
Tyler Renelle 51a6062837 Merge pull request #3333 from denis-sokolov/customization-fix-hair-layout-code
fix(profile): body and facial hair elements fix
2014-04-23 14:29:30 -06:00
Tyler Renelle 82fdf1bace Merge pull request #3334 from denis-sokolov/customization-fix-body-size-code
fix(profile): body size elements consistent with the rest
2014-04-23 14:28:21 -06:00
Tyler Renelle d28d15e87c Merge pull request #3335 from denis-sokolov/customization-fix-rainbow-skin-code
fix(profile): rainbow skin elements consistent with the rest
2014-04-23 14:27:37 -06:00
James Hsiao 32cd7ca7cf eliminate blank notifications 2014-04-23 16:24:53 -04:00
benmanley 254ac3d510 fix(toolbar): improve layout and fix scrolling bug
Consolidate styles from menu.styl into global-modules.styl
Mobile: Remove glyphicons to give more space
Mobile: Fix notif scrolling behaviour
Mobile: Move subscribe button from toolbar to menu modal
2014-04-23 18:39:55 +01:00
Denis Sokolov 9fefe73650 fix(profile): rainbow skin elements consistent with the rest 2014-04-23 23:33:34 +09:00
Denis Sokolov c3d2b66b41 fix(profile): body size elements consistent with the rest
Before this change body size selector had inconsistent code
with the rest of the profile customization.
This also led to an inconsistent styling of the menu label.
2014-04-23 23:27:34 +09:00
Denis Sokolov 191f177fe5 fix(profile): body and facial hair elements fix
New structure is valid HTML.
It makes more semantic sense, as the selection
of all hair is a single list-item, and can possibly
be styled as a group, consider adding a "well" class
on the container to group bangs and base menus together.
2014-04-23 23:22:46 +09:00
Tyler Renelle 7ab0c9fc82 feat(wondercon): apply extra.wondercon for coupon signups 2014-04-22 12:30:53 -06:00
Tyler Renelle 803c0ae659 Merge pull request #3186 from denis-sokolov/customization-unlock-set-placement
improve(profile): reposition the "unlock set" button to the "2 gem/locked" string
2014-04-22 12:10:06 -06:00
Tyler Renelle 208d2a6bc4 Merge pull request #3298 from thepeopleseason/streaks-updates
Achievement modal updates (Streak/Beastmaster)
2014-04-22 12:04:29 -06:00
Tyler Renelle fce6ec3eed Merge pull request #3329 from thepeopleseason/fix_tests
Updated tests to account for new todos
2014-04-22 12:01:24 -06:00
James Hsiao 70af0869c6 Avoid modals for streaks > 1 and beastmaster > 91 2014-04-22 13:54:52 -04:00
James Hsiao 6010540dc5 Updated tests to account for new todos 2014-04-22 12:18:54 -04:00
Matteo Pagliazzi a9f80bd860 fix(notifications): check for group id to be sent with seenMessage 2014-04-22 14:19:56 +02:00
Jason Butz 601e94cb43 feat(archive_todo): Update batchUpdate
This is part 3 of habitrpg#3062. It makes batchUpdate look at the archived flag
not the completed date

Part 1: habitrpg/habitrpg#3302
Part 2: habirrpg/habitrpg-shared#198
2014-04-18 12:36:22 -04:00
Tyler Renelle 1067c82418 feat(convention): temporary solution to disable dailies for signups
during conventions (have to be on con.habitrpg.com)
2014-04-18 08:58:45 -07:00
Tyler Renelle 9f9b0e9eee feat(user): add 'extra' property for misc. stuff 2014-04-18 08:52:51 -07:00
Jason Butz 53877ff1c0 feat(todo_archive): add archive flag
This is part 1 of habitrpg#3062 It MUST be merged prior to parts 2 and 3
2014-04-18 11:49:29 -04:00
Tyler Renelle 16ac06c4c9 refactor(user): set tags & tasks defaults in the schema 2014-04-18 08:07:05 -07:00
Tyler Renelle 8d4652b6b9 feat(coupons): better formatting for wondercon 2014-04-17 21:38:38 -07:00
Tyler Renelle 39b5176c1c feat(coupons): cleaner lookup/validation of coupon code 2014-04-17 17:36:10 -06:00
Tyler Renelle 5af5314a8d fix(express): express: 3.5.x (from 3.5.0), due to https://github.com/visionmedia/express/issues/1979 2014-04-17 17:32:37 -06:00
Matteo Pagliazzi 81ef26087f fix(toolbar): enlarged menu only when not collapsed 2014-04-17 22:12:45 +02:00