From 5f726eadbf176856e358489a7e2606a3d4637e27 Mon Sep 17 00:00:00 2001 From: Daniel Hammond Date: Sat, 21 Mar 2015 22:54:28 -0400 Subject: [PATCH 1/4] Adding an extra check to disable "send" for private messages when textbox is empty. --- CHANGELOG.md | 281 +---------------------- website/views/shared/modals/members.jade | 2 +- 2 files changed, 2 insertions(+), 281 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bacc54d3f8..1064a7c09a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,282 +1,3 @@ My app - Changelog -# (2014-02-15) - - -## Documentation - -- **rebirth:** Bullet point about repurchase of limited ed gear after Rebirth - ([d3f4a561](watch/commits/d3f4a561fdf137e5d8f406bae03be4fef1caff22)) - - -## Bug Fixes - -- **#2003:** healer gear not showing - ([949cd97b](watch/commits/949cd97b91b42e9450eba559bbfea17e239ab100)) -- **#2375:** merge in @SabreCat's stats.jade changes "More elegant show/hide setup for attribute bonuses" - ([518f200a](watch/commits/518f200a8fc7373b44ed7d7b5f016d921b0746bd)) -- **allocateNow:** Send empty object to user.ops per @colegleason suggestion - ([f6e12fa2](watch/commits/f6e12fa25e4366622db3e6f1b6ab03e848b49e10)) -- **batch-update:** send errors to client if batch-update found an error, crash pid. - ([f9679629](watch/commits/f967962996be69a5335454610af76d10e1db08b8)) -- **beastmaster:** fixes #2557, adds opacity to previously-owned pets after they're mounted. You can earn them back again - ([5caaff1c](watch/commits/5caaff1cea1a68fe572e7ddf4aac50248b13df5d)) -- **bosses:** don't reset progress.up when starting a new quest. We want to be able to carry over damage from the same day a boss battle begins, even if the dailies were completed before battle-start. Fixes #2168 - ([4efd0f5e](watch/commits/4efd0f5ed8708f2491dd483f93e3d7a268a6337d)) -- **bower:** updated jquery directory - ([191b789d](watch/commits/191b789d760a7bdc7d1b53727f6127b677c78c94)) -- **bs3:** - - fix to MemberModalCtrl parameter - ([ebd1df93](watch/commits/ebd1df932e28263e5cc01e8a35f545ab26f1e8bd)) - - port pet feeding bar - ([5db96ebc](watch/commits/5db96ebca2fbd5b64f49af03a5137ea80f6b1673)) -- **buffs:** Move help bubble to left of special buffs - ([4f911a68](watch/commits/4f911a68d805742e6744383948eea6f224f2b0ea)) -- **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 - ([33b326b5](watch/commits/33b326b59685ea6e50f9950094d009460ce80094)) - - challenge csv export now has proper filename - ([36f21196](watch/commits/36f21196f466260b7cd52b283c50b9e16943f668), - [#2689](watch/issues/2689)) -- **classes:** - - misc fixes - ([d2121a85](watch/commits/d2121a858716cb5a532a53ee9c5a1adaa74a7f69)) - - misc class fixes (not @snicker, ng-if on item store since we dynamically swap it sometimes) - ([478be611](watch/commits/478be6111337cd200374f7f31b959725c6a0b945)) -- **css:** - - temp fix for bailey height - ([c8faffcc](watch/commits/c8faffcc7289090990c3a17ab8c07a00069f5ce4)) - - menu and gems wallet margin - ([975b5165](watch/commits/975b5165730477310aa64bac27ddc07a34ea6c1d)) - - lighter columns title - ([a22e2814](watch/commits/a22e28143f74302c8340c3d33b01af9714875523)) - - better food tray - ([1c41c4dd](watch/commits/1c41c4ddb9a5b04297a371bc4d6aba013ce33f17)) -- **errors:** - - `return next(err)` when experiencing errors, instead of res.json(500,{err:err}). Let the top-level error handler handle this (needed for upcoming versionerror discarding) - ([bf5e9016](watch/commits/bf5e9016a4cb7889b3a9e39b90eb35cb8f7f9ec8)) - - handle if err.message == undefined, send err - ([b42dacf2](watch/commits/b42dacf2035d62453b585cfcf453829a423b59de)) -- **event-tracking:** - - typo - ([ff9d4b88](watch/commits/ff9d4b886ef7a98da0514975441a8bb845496c31)) - - stripe sub, not pp - ([0c99976b](watch/commits/0c99976bf5a3c7f04f031d62a8b07c862c85a0a9)) -- **find_uniq_user:** fix - ([ecbe780e](watch/commits/ecbe780e70549b1470504efe052f238c89a9db14)) -- **footer:** ensure window.env is accessible from static pages, so we can get deferred scripts on frontpage (esp google analytics) - ([67ee011a](watch/commits/67ee011aa35969db93e2d7dc1cd1e1f587f146de)) -- **groups:** - - pass missing next into Like function - ([afee0968](watch/commits/afee0968f8f6923847e186d3e11b9745ced9606e)) - - send error if +1 errored - ([5b6c4427](watch/commits/5b6c4427b504b6143f24bfee314f562b9803c5a4)) -- **hall:** let's try $gt instead of $ne:null, the query is still slow - ([a72b0131](watch/commits/a72b013131cfc7fa5d3affdbfe59b5b3cb15ae89)) -- **i18n:** do not save user language for now - ([094a4be0](watch/commits/094a4be0015f0f0deaaf94a0734193eb40a8beae)) -- **misc:** - - some styles & translations - ([8f19f225](watch/commits/8f19f225f104960b3cf27e229a5571e014be697c)) - - isStaticPage and debug buttons - ([19139f56](watch/commits/19139f562b8e68ed43f4cab748920f1e0634e86e)) -- **missing-gems:** remove ad-removal from script, since ads are part of subscription - ([e1240dde](watch/commits/e1240dde1d3dcaca4235fad384fea5c07a3706bf)) -- **mongoose:** typo - ([2786b362](watch/commits/2786b362067efdd245c3efa3a4891021fcfaab2d)) -- **mounts:** - - fix pets & mounts css to position the user based on pet/mount equip - ([37340d23](watch/commits/37340d23180da02d3742dc9be40a5fb780ecb13b)) - - Move avatar upward when mounted regardless of pet - ([bc1adeb1](watch/commits/bc1adeb1277103a5ca1f756e175ed68bbe837a2f)) -- **nodemon:** - - Add another ignore for weirdsauce Windoze dev environments - ([3fda08c3](watch/commits/3fda08c366793c8fbcbf701a9594ae3b2fd8bbea)) - - ignore CHANGELOG.md on watch - ([d6c55952](watch/commits/d6c55952da8b49f36e9d8e4570d80931d081343d)) -- **party:** Round boss health up instead of to nearest integer - ([626da568](watch/commits/626da5681f5ea95700f8ddf40587c7184926971c), - [#2504](watch/issues/2504)) -- **paypal:** fixes #2492, remove environment check for now, only have production-mode option. revisit - ([1dc68112](watch/commits/1dc68112d131e4ebdec32ddff938eb6311d6565f)) -- **performance:** cache spritesmith image, fix #2633 - ([f03d7d7d](watch/commits/f03d7d7dde4f8cb39babd2b982d77e7f88f349b7)) -- **pets:** add questPets to UserSchema.items.mounts too fixes #2814 - ([42766125](watch/commits/42766125d5c8870f25c3a0a001473f700b8f6cc1)) -- **profile:** fix bug where empty profile displayed on username click - ([0579c432](watch/commits/0579c432489c4a038e8c9f95ea3b285f5abc146f), - [#2465](watch/issues/2465)) -- **quests:** - - quests with a level cap cannot be bought before that level. - ([dab9ddbd](watch/commits/dab9ddbda27f5e10e4545fea703deebfe2dd9975), - [#2707](watch/issues/2707)) - - bug fix to multi-drop - ([f478d10c](watch/commits/f478d10c20f816cd104b3f0da814c189957f45f5)) - - list multiple rewards in dialog - ([e48c7277](watch/commits/e48c7277f8256cf827790aece51e897fe0439374)) -- **readme:** remove text about translations wip - ([f2bb1fd2](watch/commits/f2bb1fd26e44a9eb0ba325776bf335e021beeece)) -- **settings:** - - remove unnecessary code - ([5f0cf657](watch/commits/5f0cf6575c0dc4cfc041956e3dc27898d8b4242d)) - - reintroduce space between captions and help bubbles stripped during localization - ([5ddf09fe](watch/commits/5ddf09fe13c7f8d844c8c47be0fb8f8b2fd1df33)) -- **spells:** - - temp workaround for spell & task being undefined. #2649 #2640 - ([241d0414](watch/commits/241d04140f5db77929d9f597d232f55843bb0f5d)) - - more $rootScope spell-casting bug fixes - ([47bd6dcb](watch/commits/47bd6dcb79778d90d6f3ddeb003c3d8e45433333)) - - add some spells tests, don't send up body to spell paths - ([e0646bb9](watch/commits/e0646bb98d44b6874b5259107c9be5fa34c58933)) - - some $rootScope.applying action fixes so cast-ending is immediate instead of waiting on response. Also, slim down party population to the essentials to avoid RequestEntityTooLarge - ([c6f7ab8a](watch/commits/c6f7ab8a5c6f4e382208a928b90ba5f4eba9cd37)) - - to cancel spell-casting - ([a1df41ad](watch/commits/a1df41ad8165cd9eb6d2d5d59c7fe404edde716c)) -- **stable:** show hatchable combo when petOwned>0 (fyi @deilann) - ([51bff238](watch/commits/51bff23885ca0080e7e71ff752daa0950ae923ae)) -- **stats:** Better layout for attribute point allocation - ([d782fc6b](watch/commits/d782fc6b6a3cd7e90d327c93a5764626b2990c74)) -- **swagger:** fix jade script warning in swagger - ([2e2fcfcf](watch/commits/2e2fcfcf464fbae21bff9e1be1ca915f071b976b)) -- **tests:** - - include select2 in test manifest - ([38b4cea7](watch/commits/38b4cea73299f51c4db7f6b2eb12533d219745f8)) - - don't use cluster in tests, else we get "connection refused" - ([7a479098](watch/commits/7a479098dc6535654e322c737d80813790967941)) -- **todos:** - - add migration for dateCreated & dateCompleted #2478 - ([4cc39f16](watch/commits/4cc39f16a13f5fb9f0e3ddde7d274c0f224f4a0e)) - - add dateCompleted to todos so they're archived 3 days after completion, not 3 days after creation. Fixes #2478 - ([b1afc177](watch/commits/b1afc177aa4bfc4cbd9b847e40431db91666d9c3)) -- **toolbar:** - - Tweak Settings drop-down - ([e241429c](watch/commits/e241429cc3d2eca18d2f5a9726f6caa6270a1b02)) - - Tweak icon popovers - ([4454204f](watch/commits/4454204f47f80e64119f7896bf246259173d115b)) - - tweaks - ([5501d57e](watch/commits/5501d57e107c0bc7085847b0c808f027360fa405)) -- **translation:** Fix #2585. - ([06200acc](watch/commits/06200accada462c3234ab407cfb0f6b684e5effe)) -- **translations:** - - fix #2564 and similar ones - ([42740902](watch/commits/42740902055a3807532028a5dfb39eff905c104f)) - - add env.t to rootScope - ([13131087](watch/commits/13131087ff9563d2d174b2c978102f0dc2b87387)) - - remove translations for privacy & terms - ([a9095f34](watch/commits/a9095f346479336be13b2bf341666b908fa30b3d)) - - merge @luveluen pull request, fix some syntax - ([a6c67f17](watch/commits/a6c67f17815558f19895b8f67d29c40c14689f09)) - - @lefnire now everything is ok - ([52decb7e](watch/commits/52decb7edeefb4755ea832b0cf63eaeea5e93259)) - - correct some variables - ([fba73953](watch/commits/fba739535bc1b630d73eb469448e9c3706043efd)) - - revert some views - ([d000c706](watch/commits/d000c70679ae0e13d9bec749295e42cc8e299c95)) -- **user:** - - make sure next is passed to all routes, and is available in err-back of batch updates - ([0c21f54c](watch/commits/0c21f54c67b52b07c417fd8216c6b04bce59d0ab)) - - if need to upgrade site, send 501, not 400 - ([ab86ba11](watch/commits/ab86ba11bdb3379a8d8fa1814879640d61c57227)) - - PUT user retricted path errors are 401, not 500 - ([0aec4caa](watch/commits/0aec4caa785c3b12e15f1c2e19c5b67b20d1a6e1)) -- **winston:** typo - ([83b3739f](watch/commits/83b3739f4671a08466e057242f936140d5c739ef)) - - -## Features - -- **administrators:** start adding features page for admin accounts - ([f7f4a0c1](watch/commits/f7f4a0c166558ba7e5461732f7bb6d7bcac25f88)) -- **attributes:** Add backfill button in flat and classbased allocation modes - ([76a7ab5b](watch/commits/76a7ab5bcce2d486dab3f447f0659ba870d1ff7e)) -- **bailey:** notif about STWC updates + scroll-purchase deadlines (@colegleason) - ([90176444](watch/commits/90176444e9c7a318040829e8b71d1493b5d58e9e)) -- **bug-crushing:** add the critical hammer of bug-crushing - ([00af5f7d](watch/commits/00af5f7d0258b0f7dddef8ede40bd825b057748a)) -- **challenges:** - - add angular-ui-select2 for simpler find/select challenge winner. - ([9fa45217](watch/commits/9fa452173989889c48ed696a45cf4a1dc16294a4)) - - add button for csv export - ([ae0d758d](watch/commits/ae0d758d8fc751219a693fee7f3e3ebcfbd67590)) - - add csv export for challenge progress. WIP, will refine this over time - but we need it something like this for the STWC come 1/31. - ([16a602f9](watch/commits/16a602f94c3b7c99d49e42b47b4835b65a243690)) - - markdown in challenge-descriptions - ([41233c7b](watch/commits/41233c7b167905eeccfdff5589789e002ec23f97)) -- **cheating:** prevent +habit spamming with a 10s timer - ([ad4ca665](watch/commits/ad4ca6655a3bdd870bb08173530372f81fdc9102)) -- **event-tracking:** - - better page-view tracking via ui-router - ([b093717b](watch/commits/b093717b8d54b61e5d4b44b0d56a1f43308f078c)) - - track registration count - ([72b6c9bc](watch/commits/72b6c9bc9189275909804f9ecab18e9fe1f69d27)) - - pass ga to server user.ops - ([9217b517](watch/commits/9217b5174ab9ab4754269263b214f6bfe45d4f1d)) - - track ecommerce events - ([d89fb17b](watch/commits/d89fb17b03b2e2c0fb1da77fb13cc660a5b6c9d1)) - - add server-side GA tracking for ecommerce events - ([f7b4a04a](watch/commits/f7b4a04a590ade26871abc726ade2c666176488e)) - - start adding some client-side GA event-tracking - ([ffb42906](watch/commits/ffb42906e1d7c6bd8f01e715d98d96426bc6d0de)) -- **groups:** add group chat notifications - ([ce82be63](watch/commits/ce82be637d1d707e899aeee5f315da69367fa367)) -- **habitBirthday:** add habitrpg birthday event. includes cakes for all pets, absurd party robes, npc swap, badge, etc. @lemoness - ([aff885c0](watch/commits/aff885c05c03bd70beeb0db8d68922671fc46309)) -- **homepage:** - - start cleaning up homepage, add navbar for play button & upcoming links - ([0ddaae4d](watch/commits/0ddaae4d7525277e696a57d20234e49cd6fd1cbc)) - - use .marketing for centering, add playbutton as static in footer. This is pretty ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28), let's iterate / prettify. @deilann - ([47bcaf83](watch/commits/47bcaf83e760dbb266ae7ff2f7299c2a1cdf3712)) -- **marketing:** - - more copy for mobile - ([cbb44847](watch/commits/cbb448478edfd0003c43d20ed216bab20d25dadd)) - - start fleshing out the about page with images, content, etc. Create separate videos page - ([cb079977](watch/commits/cb079977e6f35f9308ab28158373dd3e1de9f798)) - - add video tuts on "learn more" page until we have some copy - ([5028707c](watch/commits/5028707c7b174b5e050c7c1662155e781a6b415b)) - - some frontpage updates, a screenshot, & "contact us" button mods - ([a582a054](watch/commits/a582a0546d680d36a21c507deff725a6c38fdb28)) -- **premium:** - - subscriber mystery item (doesn't yet do anything) - ([d0342628](watch/commits/d0342628340ce7dce95fa20177ccbcfe1ebf93e6)) - - backport server code for premium subs (it's just ccard handling & uer model stuff) - ([3660f1a8](watch/commits/3660f1a85c1447de118f334a145d0d7698b93981)) - - updates to group plans info page - ([66f95cdd](watch/commits/66f95cdd4cfb698fddc765a77b66d29e31eb1361)) - - backport client-side premium code to public repo, it's client-side anyway (@colegleason @paglias) - ([2e18f0eb](watch/commits/2e18f0eb82f5efc77544d33d1db3fbb9cc583124)) -- **quests:** - - add flags.levelDrops for dropping items at certain levels - ([78315d82](watch/commits/78315d828ba9a1033526b9a72b7c385281e6ad0a)) - - allow dropping scrolls in quests - ([54064deb](watch/commits/54064debf3c95390b5507acd826f9db3339b9f09)) - - allow html in quest notes - ([800231cf](watch/commits/800231cf6481351032d4e5143edd54f5e7e3a179)) - - add level requirement for quests - ([9e69d795](watch/commits/9e69d7959f174955f44429a94f22ce40fc5f7861)) - - add canBuy so we can exclude certain items from the market (if you can only find them on quest-drop, etc). This isn't the prettiest, change? - ([f16654d2](watch/commits/f16654d2354dc86cc7c52e1cf0562f850cf203be)) - - allow quests to drop multiple items - ([d9e5725e](watch/commits/d9e5725ee13f7e9ad329fc548537d5265cf483ca)) -- **rainbow-hair:** add rainbow hair colors - ([82d9233d](watch/commits/82d9233d99167d6704c878884dcc49a55cc7d884)) -- **restore:** add restore-gp back in. Parly to end the winter event, partly due to the convo at #2681 regarding subscriptions. Fixes #2681 - ([179316e1](watch/commits/179316e10fa7597b08573d94721861baa3dbbb1c)) -- **toolbar:** - - try with icons instead of text, test against prod / beta & get a vote. - ([7456f00d](watch/commits/7456f00dc6122ad293652b7a32fb4ce671f75241)) - - add toolbar featuring navigation, gems / subs, bailey, & chat / invite notifications - ([f72cb213](watch/commits/f72cb21300c078b439b3334bfa3e205ba04dc949)) -- **tracking:** gems > toolbar separately from wallet - ([f6abfc67](watch/commits/f6abfc67b31808c0e2d325c235747260855338c9)) -- **valentine:** valentine event - ([fd6eb872](watch/commits/fd6eb8724eae38d02849ffccb09f1f9c7d8e490d)) -- **winter:** - - remove purchasable winter hair colors, keep available if they purchased during event - ([f8796e90](watch/commits/f8796e9028d4f4cd2b5c5ede1734d2876d174dc9)) - - remove winter scrolls & snowballs - ([52f8f0d5](watch/commits/52f8f0d5b0fdf4271fcb5f7d497ad3bf544c24e8)) - - -## Docs - -- **rebirth:** Bullet point about repurchase of limited ed gear after Rebirth +# (2015-03-21) diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index dc46f4bb43..bfb57ac814 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -48,7 +48,7 @@ script(type='text/ng-template', id='modals/private-message.html') .modal-body textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message') .modal-footer - button.btn.btn-primary(ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") + button.btn.btn-primary(ng-disabled='!_message',ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel') script(type='text/ng-template', id='modals/send-gift.html') From d3b92a0a6cbad331bc076761225d03bf5faba16c Mon Sep 17 00:00:00 2001 From: Daniel Hammond Date: Sun, 22 Mar 2015 12:37:32 -0400 Subject: [PATCH 2/4] Added a tooltip to make it clear to the user to type something in! --- CHANGELOG.md | 2 +- common/locales/en/groups.json | 3 ++- website/views/shared/modals/members.jade | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1064a7c09a..caee7d0227 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ My app - Changelog -# (2015-03-21) +# (2015-03-22) diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 94f6ca73a3..fdbad09d14 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -94,5 +94,6 @@ "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.", "abuseFlagModalButton": "Report", "abuseReported": "Thank you for reporting this violation. The moderators have been notified.", - "abuseAlreadyReported": "You have already reported this message." + "abuseAlreadyReported": "You have already reported this message.", + "needsText": "Type something in the box, then click this button." } diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index bfb57ac814..dffce21a7f 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -48,7 +48,10 @@ script(type='text/ng-template', id='modals/private-message.html') .modal-body textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message') .modal-footer - button.btn.btn-primary(ng-disabled='!_message',ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") + //- Due to a quirk in Bootstrap UI, we need to wrap this so the tooltip can + //- appear when disabled. + div(style='display:inline-block',tooltip="{{_message ? '' : env.t('needsText')}}") + button.btn.btn-primary(ng-disabled='!_message',ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel') script(type='text/ng-template', id='modals/send-gift.html') @@ -109,4 +112,4 @@ script(type='text/ng-template', id='modals/remove-member.html') textarea.form-control(type='text',rows='5',placeholder=env.t('optionalMessage'),ng-model='removeMemberData.message') .modal-footer button.pull-left.btn.btn-danger(ng-click='confirmRemoveMember(true); $close()')=env.t('yesRemove') - button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel') \ No newline at end of file + button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel') From d537a7fee4a24dc8b38fbbd58741bfef74ee2472 Mon Sep 17 00:00:00 2001 From: Daniel Hammond Date: Tue, 24 Mar 2015 00:10:44 -0400 Subject: [PATCH 3/4] Tweaked copy on "enter a message" text for private message button popup. Added placeholder text for empty private message box. --- CHANGELOG.md | 615 ++++++++++++++++++++++- common/locales/en/groups.json | 3 +- website/views/shared/modals/members.jade | 2 +- 3 files changed, 617 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caee7d0227..fe6304f5f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,616 @@ My app - Changelog -# (2015-03-22) +# (2015-03-24) + + +## Bug Fixes + +- **.task-filter:** force long words to wrap + ([9c2c08c0](watch/commits/9c2c08c03d8449db5e8b4474a4663e8011f3a6fd), + [#4308](watch/issues/4308)) +- **Bailey:** correct date + ([17138430](watch/commits/1713843067df6b40187755bc40c73da1ec6972e5)) +- **Gems:** Clarify badge count + ([f2c6c07f](watch/commits/f2c6c07ff87f9d90b710d64cb89dc150ecea8a4b)) +- **I18N:** + - Remove more hardcoded text + ([8cd1ea48](watch/commits/8cd1ea48dbc4eea07cd4822bd0743046cad00aba)) + - Remove hardcoded text + ([29f693cd](watch/commits/29f693cd246c20f0a85c644442566657e7a8fd93)) + - Translate TT in menu + ([506c396b](watch/commits/506c396baf0ee708026644ef49a2c52ec676f620)) + - Make Time Travel translatable + ([35b02cfd](watch/commits/35b02cfdd894a21f69175b81b5fefc74a0c35cda)) + - Translate Time Travelers + ([8d042745](watch/commits/8d042745bed9cff86b15987882f56a4a9214194f)) +- **NYE:** + - fix cards + ([ccfe4809](watch/commits/ccfe48099fda85f7af5c354533637c1c16b15b96)) + - Correct achievement badge + ([438516b2](watch/commits/438516b26f8d799de6401d359fc1d9f1c00614e4)) + - I18N for random text + ([e3572286](watch/commits/e35722865abad24f22bac9833a53f3bbd7d8e1ac)) + - I18N for random text + ([7a16c644](watch/commits/7a16c644c3b9946abffe3713178d60155af850e0)) + - t undefined + ([11beb14e](watch/commits/11beb14e1421e2376d22edcbed61b9272cf4bd60)) + - Card to self exploit + ([e7388822](watch/commits/e7388822f1d3c01350408778b4af6c33c49d7207)) + - I18N shop text + ([5623fb00](watch/commits/5623fb00780ec294b84ec04964254268a3bc8a06)) +- **analytics:** remove testing code + ([5de42b03](watch/commits/5de42b03c9b6500c26354e556c463becd58e2a93)) +- **auth:** + - upgrade facebook to Graph API 2, fixes #4832 + ([0c63f6cb](watch/commits/0c63f6cb7dbe741ffdbaef53a947c1ffb1138b0a)) + - search case-insensitive usernames when registering + ([c3bb42b1](watch/commits/c3bb42b1086fccfa955d87e9d37801eb979204da)) +- **avatar:** + - prevent avatar from obscuring name + ([8cf3cd66](watch/commits/8cf3cd66ccd35cf0171a08a696ff67b5243d4235)) + - Correct "Facial Hair" text + ([e4df3435](watch/commits/e4df3435e13690288c920236c039b70988bc24cf)) +- **avatar-sharing:** + - screw it, 1.3.3 backwards compat isn't working at the router level anyway. Besides, avatar sharing hasn't worked via addthis for a while, so we don't need this + ([a44e0f7c](watch/commits/a44e0f7c31dbb7f70c0a024a961ae10b7d5554e6)) + - angular@1.3.9 upgrade fixed the /#?memberId=x bug. Also, anon wasn't able to view avatar shares! + ([a053486f](watch/commits/a053486fcde200fb212e9863ffefe60f3a562600)) +- **avatar.styl:** improve label layout + ([0943a229](watch/commits/0943a229ec5cbb976e204ec7ec4641b138aea39b), + [#4349](watch/issues/4349)) +- **backgrounds:** Frigid, not Snowy, Peak + ([285ff622](watch/commits/285ff6228cd2b2b5d82a0f887b6ac3fc8530c1db)) +- **bailey:** mystery 3014 promo + ([bd5f8d79](watch/commits/bd5f8d79eaddcbcc42957f92c2e059da8b44979e)) +- **billing:** script to fix current_period_end, see #4420 + ([ca2d4511](watch/commits/ca2d45113c7f0d9ad5b59ac919355bb0d93737ef)) +- **cds:** max hour is 23 not 24 + ([193b92c1](watch/commits/193b92c16ba4a312d97194e7f2eba31a33acfd81)) +- **console:** remove console.log + ([c301bd3e](watch/commits/c301bd3e89e4fb0b02bc62b5b16356cf327f46c0)) +- **content:** Cannot call 'toString' of undefined + ([d5eb5bbf](watch/commits/d5eb5bbfe0416fbfa7270f371edc956c8c166c6b)) +- **date:** + - typo + ([756fa834](watch/commits/756fa83418e470578b0b43975a7c4e3d2e244284)) + - add YYYY/MM/DD format + ([cb13b5ac](watch/commits/cb13b5ac26c7bd43eb024679ca6083e328a2598c)) +- **db:** upgrade flags.recaptureEmailsPhase to new values + ([eb1ca43c](watch/commits/eb1ca43c44788ee8bf45d2bfe4f7874b0b24a213)) +- **emails:** + - send emails to new fb users + ([92a6af72](watch/commits/92a6af72cff29536985da2f3ef3f207d74842abb)) + - parse json + ([925bfe8a](watch/commits/925bfe8af44765ea05cef4a59a57b0eb88325c26)) + - remove unused variable + ([739d8885](watch/commits/739d8885a36057bbf2198e350d507e92f87503d4)) +- **event:** + - Card notif display + ([de21ec8c](watch/commits/de21ec8cf51c253a4eda21bf6fc70c64635d68f1)) + - Correct card notifs + ([37ae50a7](watch/commits/37ae50a77af4ca176d42a44efb3ae9b8c2109645)) + - Line breakage II + ([9a44ab76](watch/commits/9a44ab76ec3e093f093abee06475da998c8a23f0)) + - Line breakage II + ([281e3fdb](watch/commits/281e3fdbb54a1d1adb6709ca295a546153d6703b)) + - Line breakage + ([358b4213](watch/commits/358b42133080c897923043c899ad2ef4146fc8bd)) + - Localize poems + ([9fddb08a](watch/commits/9fddb08aebfca32deb9287a43fcc49fe32b5538b)) + - Valentine's strings + ([432eee75](watch/commits/432eee750f5bc31668a67b3b3b45b4f0fc3f5116)) + - Robes not for your head + ([7e0d8104](watch/commits/7e0d8104632539468d547aa1b9b66936088ddc92)) + - Party robes + ([51b2b9bd](watch/commits/51b2b9bda15b35eded359154888359396fb7f229)) + - Leave old achievement + ([efd1333c](watch/commits/efd1333c06bb5572147a8d10b9dba6f5fb9d1c7c)) + - Correct achievement award + ([a654d7ea](watch/commits/a654d7ea10748010885fdcf0f1845c63c985e6b9)) + - Robes shop icon + ([0cc819cc](watch/commits/0cc819cc646960e003ba182096aeeaafb6aa6618)) + - Mystery sprite error + ([37db763f](watch/commits/37db763fc28bc6db2b2dcb56eb2d18ede2f0c1b4)) + - Mystery typo + ([6c8f9e39](watch/commits/6c8f9e39b63d4a4475458b7a010b137fcb3820b5)) + - Better quest text placement + ([1b4843ff](watch/commits/1b4843ff586340abc51b3f45ccad0fe195fd6475)) + - quest syntax + ([f4c582eb](watch/commits/f4c582eb2475e6f1bb846aba44b3ad690c4fc0b7)) + - Better shop flow + ([1c908865](watch/commits/1c9088654881d91e3120dcc9729d6d0b2708db0b)) + - head, not helm + ([e62cb74a](watch/commits/e62cb74ad01cf7395b81abd2c3764548291a6455)) + - grunt + ([a4a94f79](watch/commits/a4a94f79734c136bdfd293d56c8a4dc473b93814)) + - Festify missed NPCs + ([d37dd904](watch/commits/d37dd90484c83200dd513f6596a8b78a3dd41919)) +- **flag-chat:** correct url for tavern flags + ([4c785e84](watch/commits/4c785e84590c2fa6d69e697e6240020152599346)) +- **flag-email:** correctly format date + ([635ebf62](watch/commits/635ebf626bdbef17531cd945726a9837457d598c)) +- **flag-message:** small refactor + ([948d5762](watch/commits/948d5762cd2c73179a77835bd22bb7fae76458d6)) +- **flags-emails:** + - allow arrays in FLAG_REPORT_EMAIL + ([9d22e65e](watch/commits/9d22e65e19ba63a5f91ae8cd03c2c1d3c655f552)) + - allow arrays in tnxEmails + ([065227fa](watch/commits/065227fa8c347d6a1643378edd9f1c29c33ccd6c)) +- **footerCtrl.js:** disable addThis hover + ([45d30ffe](watch/commits/45d30ffef56cdec74849448195e9cca02af58d7d)) +- **gem-cap:** use customerId in gem purchase + ([2018cc84](watch/commits/2018cc84ab9891d7ec32dd4dbae0cedfba7786b8)) +- **gifts:** + - $rootScope => Payments + ([3423e985](watch/commits/3423e9857d6a00f8305e7906f01ee5760650d8dc)) + - allow gifting 0local + ([5ec2c118](watch/commits/5ec2c118a5ab51b652915f1a9cfbe3c6ff98785d)) + - allow users to move from facebook=>local + ([a4c2bf61](watch/commits/a4c2bf61b26011765443c54481c065f475f675e4)) +- **flag-chat:** + - fetch author and add some group variables + ([2d4c5e7b](watch/commits/2d4c5e7b98152b215ac875acef919bc3ae3896de)) + - add some variables + ([7aff280a](watch/commits/7aff280a71b85d81daf47491cb4466e0f7c68879)) + - start implemnting email + ([652ce10e](watch/commits/652ce10e2246a7b7a9e699f9aa005999b40f69b4)) +- **flag-message:** + - add server methods + ([e84880d3](watch/commits/e84880d3e872e85af3e29e0a0381a6a4ad8b4551)) + - add server methods + ([ae6e0255](watch/commits/ae6e0255c69b4ecb60b0c3502840e875a9ff1085)) +- **gifts:** + - allow gifting subscriptions + ([5b01fff7](watch/commits/5b01fff70038886f470f2769235759ff29d7fcf5)) + - allow gifting gems from paypal/stripe + ([e8dbd5ca](watch/commits/e8dbd5ca1a89c45d1d63f2dfc714822bdc444a9d)) + - allow gifting from balance + ([7e9b92fc](watch/commits/7e9b92fcad3d2ad43da5395b34f580b8d961d648)) +- **google-discount:** add google discount + ([5fc001e4](watch/commits/5fc001e4f6bac35020dbe63667d034c2957a47d0)) +- **i18n:** + - add strings + ([09015370](watch/commits/09015370f0b9eef726ccf5dd3f695f2ea87d8f75)) + - add string + ([ff9280de](watch/commits/ff9280deea2326987c67c627cd622bf0925ca62a)) + - add string + ([bb855bf9](watch/commits/bb855bf9931dc127304e2c1e47394196fc25c937)) +- **iap:** ignore keys/ directory. upload any keys/iap-sandbox iap-live etc on a private branch + ([9d6caaa1](watch/commits/9d6caaa138d31d4c784737150ea313d68c69b745)) +- **interactive-tour:** disable ads till lvl 2 + ([d84549e2](watch/commits/d84549e2395046c4d94475778cf421eab0f720e5)) +- **loggly:** + - change tag based on base_url, logs internal server errors + ([dac2fc68](watch/commits/dac2fc682dfedbd9373b9d2695a857b1cf7afebb)) + - enable json loggin and start loggin errors during cron + ([8935538b](watch/commits/8935538b5351d8da9b0aee454b1444b63480932c)) + - add test log, use only in production and add sample config + ([af1ff6d7](watch/commits/af1ff6d74059e12683603ca89a55e5a12ff1a9e4)) + - add loggly + ([7356e0ba](watch/commits/7356e0bafeb3843d6c457c654abc7a68f999cf44)) +- **mystery:** + - Migration + ([55066480](watch/commits/55066480fb3685ae54ff637bfe470e1e257cdfa6)) + - February 2015 + ([d4f8acd0](watch/commits/d4f8acd0ef0879f0a0f459c0a79225b8e791313c)) + - January subscriber set + ([524761f1](watch/commits/524761f1cf4895b4a876ec696805c0f7c6998f21)) + - January subscriber set + ([e2f47651](watch/commits/e2f47651a4facc79afec1edfd8c2c76bafee1ed7)) +- **mystery items:** March subscriber sprites added + ([e918aa15](watch/commits/e918aa158d9d7835efcde86239919c7b830cda27)) +- **news:** + - Promo images + ([0ec9e5b1](watch/commits/0ec9e5b1e1edb86db3266e4cf633047d27d1dabf)) + - move old news to /static/old-news, better use of content space + ([66b4dae0](watch/commits/66b4dae0d98853edd67a117cc4a196f7bdce69f7)) +- **pie:** Add pie + ([1120d334](watch/commits/1120d334c31c8f3836d4a88b4e1a0a31cd2e48d1)) +- **plans:** + - time traveler - by full sets + ([bf7e1e66](watch/commits/bf7e1e66ed7ef4338d31807587ce6569eb06ef88)) + - add time traveler - buy individual mystery items + ([d81badde](watch/commits/d81badde69e5cd3c3b7ef4babc82337aec87c006)) + - add consecutive-month benefits for subscribers + ([76be625f](watch/commits/76be625f6dd86d82ad3a52fcf066c4670cd770ad)) + - cleanup plans' perks page, rename Time Trinket => Mystic Hourglass + ([8c5842eb](watch/commits/8c5842eb527632d2ffa30d2f01eb87ec09cf6609)) + - time travelers tab, 1 trinket to buy 1 set + ([0fffd665](watch/commits/0fffd66588e603513803967f1983797f530011a2)) + - allow block subscriptions from paypal/stripe + ([7f2b6b5c](watch/commits/7f2b6b5cfbff94dc7339126308428ee93e23e1a5)) + - consectuive-month subscription perks (gifting) + ([5fd805db](watch/commits/5fd805db881901df68b342fc66ec741bb85da581)) + - consecutive months & extra months (like a time-card) + ([57bfee02](watch/commits/57bfee02cf34b9b44f662f90328d2615cc8f4ebe)) +- **presskit:** add presskit page cc @lemoness + ([cba232ef](watch/commits/cba232ef83fb15c3fd74ed8eb535b5dc3d317bad)) +- **quest:** + - Bunny quest + ([4cb67835](watch/commits/4cb6783544b483865d008990e7e6f243e8339e52)) + - Pet Rocks + ([0608ac5c](watch/commits/0608ac5caa8e753ba4e9c3a92b5fb3c7424f4f30)) + - T-Rex pet + ([c260362d](watch/commits/c260362d96b629a47d0ce18bacfd7fcc9554b065)) + - T-Rex pet + ([0b63e48c](watch/commits/0b63e48c6e10478e1717f0ce132ceb0ade4ccb4d)) + - Implement Penguin pet quest + ([d25455fa](watch/commits/d25455fa5ad9f15815c3220f6bf292e868b57a00)) +- **quests:** + - Differentiated scrolls + ([41241750](watch/commits/412417505f2d84d049572a9bfc73d78c3f63c344)) + - Differentiated scrolls + ([2ca6636c](watch/commits/2ca6636c944c67f9e527d96cc41987dc83a718b2)) +- **seasonal:** + - Normal view + ([48246d6a](watch/commits/48246d6a7239687f3b44ad82c56aed8f6e625f4e)) + - Normal view + ([c9b81414](watch/commits/c9b81414a4079ee8a706d19971ac68e4aa26f856)) + - Implement Snowball + ([53fff0db](watch/commits/53fff0dbc61c2bb11bf21f1575c487ab05016214)) + - Implement snowball + ([f7d45c95](watch/commits/f7d45c951e24abf4cfe11804f8a53a85e31df573)) + - Seasonal Shop + ([a98a6859](watch/commits/a98a68597127f385c7729f25ff6f9f282ea20d0a)) + - Seasonal shop + ([c7ee171e](watch/commits/c7ee171ee415be5af0f090cffd8378f7890fea74)) +- **spring:** Fling + ([f3f5669a](watch/commits/f3f5669ab28e944e7c65deef256ac8248f98e4e5)) +- **subscriptions:** Show count of purchasable Gems + ([62e526f8](watch/commits/62e526f8dc7b490b969a7ee9afa2ddc9c41956b2)) +- **surveys:** + - Close out survey + ([7065b400](watch/commits/7065b400bc6c221641a57b8129f5ade5f9aded4c)) + - Survey achievement + ([9cfa27f0](watch/commits/9cfa27f08948a2b6b8773d6fa0d4d1bf0c36f9df)) +- **thanksgiving:** + - revert npcs back to normal + ([eb27a767](watch/commits/eb27a767093905ab045196f58c07389bf76eaf81)) + - add migration for turkey mounts / pets + ([a8cf1026](watch/commits/a8cf10261042a6925f4b4949313ba891a1ca5dd0)) +- **tour:** + - Early quit classes tour + ([18649144](watch/commits/18649144a8b47ac6822d19c40243b32566ceb573)) + - add the other tour entries @lemoness + ([1e8265a9](watch/commits/1e8265a9f13c364c7f2cdca1124cf2767c714926)) + - ESC to perma-close #4886 @lemoness @alys + ([cca2d81b](watch/commits/cca2d81bc3deb757d74c3ac3283ca45c52643034)) + - update habits step wording @lemoness + ([152853a8](watch/commits/152853a877afd1d59eb6e2c03f4a7c560f9a6283)) + - Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides + ([812493fe](watch/commits/812493fec5c5a15db3c2411df0ad64b30c8ceba1)) +- **world-boss:** + - Desperation move + ([3ee965d8](watch/commits/3ee965d8d25e896b942d8e1bfda796e83a0b0540)) + - Desperation move + ([7925935f](watch/commits/7925935ff5de77699df31da6369a74a78ef9bcfe)) + - Healing on rage + ([480b4e27](watch/commits/480b4e276435c93fcef31248430dee4dc3d2d1c7)) + - Healing on rage + ([ad7c02d5](watch/commits/ad7c02d50d5a62570b7ecf356c93930a9047fb15)) diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index fdbad09d14..c5c2cf8183 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -95,5 +95,6 @@ "abuseFlagModalButton": "Report", "abuseReported": "Thank you for reporting this violation. The moderators have been notified.", "abuseAlreadyReported": "You have already reported this message.", - "needsText": "Type something in the box, then click this button." + "needsText": "Please type a message.", + "needsTextPlaceholder": "Type your message here." } diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index dffce21a7f..4df7fedbef 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -46,7 +46,7 @@ script(type='text/ng-template', id='modals/private-message.html') .modal-header h4=env.t('pmHeading', {name: "{{profile.profile.name}}"}) .modal-body - textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message') + textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',placeholder=env.t('needsTextPlaceholder'),ng-model='_message') .modal-footer //- Due to a quirk in Bootstrap UI, we need to wrap this so the tooltip can //- appear when disabled. From cea97e4da824e4121356d6e0c99e2c13ad4d8b59 Mon Sep 17 00:00:00 2001 From: Daniel Hammond Date: Sat, 28 Mar 2015 01:21:39 -0400 Subject: [PATCH 4/4] Documenting the (Bootstrap recommended!) wrapper workaround for tooltips on disabled elements. Added code to prevent user from posting blank messages by using meta-enter as a workaround. --- CHANGELOG.md | 615 +------------------- website/public/css/global-modules.styl | 25 +- website/public/js/controllers/groupsCtrl.js | 7 +- website/views/shared/modals/members.jade | 8 +- 4 files changed, 26 insertions(+), 629 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe6304f5f2..28685fe452 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,616 +1,3 @@ My app - Changelog -# (2015-03-24) - - -## Bug Fixes - -- **.task-filter:** force long words to wrap - ([9c2c08c0](watch/commits/9c2c08c03d8449db5e8b4474a4663e8011f3a6fd), - [#4308](watch/issues/4308)) -- **Bailey:** correct date - ([17138430](watch/commits/1713843067df6b40187755bc40c73da1ec6972e5)) -- **Gems:** Clarify badge count - ([f2c6c07f](watch/commits/f2c6c07ff87f9d90b710d64cb89dc150ecea8a4b)) -- **I18N:** - - Remove more hardcoded text - ([8cd1ea48](watch/commits/8cd1ea48dbc4eea07cd4822bd0743046cad00aba)) - - Remove hardcoded text - ([29f693cd](watch/commits/29f693cd246c20f0a85c644442566657e7a8fd93)) - - Translate TT in menu - ([506c396b](watch/commits/506c396baf0ee708026644ef49a2c52ec676f620)) - - Make Time Travel translatable - ([35b02cfd](watch/commits/35b02cfdd894a21f69175b81b5fefc74a0c35cda)) - - Translate Time Travelers - ([8d042745](watch/commits/8d042745bed9cff86b15987882f56a4a9214194f)) -- **NYE:** - - fix cards - ([ccfe4809](watch/commits/ccfe48099fda85f7af5c354533637c1c16b15b96)) - - Correct achievement badge - ([438516b2](watch/commits/438516b26f8d799de6401d359fc1d9f1c00614e4)) - - I18N for random text - ([e3572286](watch/commits/e35722865abad24f22bac9833a53f3bbd7d8e1ac)) - - I18N for random text - ([7a16c644](watch/commits/7a16c644c3b9946abffe3713178d60155af850e0)) - - t undefined - ([11beb14e](watch/commits/11beb14e1421e2376d22edcbed61b9272cf4bd60)) - - Card to self exploit - ([e7388822](watch/commits/e7388822f1d3c01350408778b4af6c33c49d7207)) - - I18N shop text - ([5623fb00](watch/commits/5623fb00780ec294b84ec04964254268a3bc8a06)) -- **analytics:** remove testing code - ([5de42b03](watch/commits/5de42b03c9b6500c26354e556c463becd58e2a93)) -- **auth:** - - upgrade facebook to Graph API 2, fixes #4832 - ([0c63f6cb](watch/commits/0c63f6cb7dbe741ffdbaef53a947c1ffb1138b0a)) - - search case-insensitive usernames when registering - ([c3bb42b1](watch/commits/c3bb42b1086fccfa955d87e9d37801eb979204da)) -- **avatar:** - - prevent avatar from obscuring name - ([8cf3cd66](watch/commits/8cf3cd66ccd35cf0171a08a696ff67b5243d4235)) - - Correct "Facial Hair" text - ([e4df3435](watch/commits/e4df3435e13690288c920236c039b70988bc24cf)) -- **avatar-sharing:** - - screw it, 1.3.3 backwards compat isn't working at the router level anyway. Besides, avatar sharing hasn't worked via addthis for a while, so we don't need this - ([a44e0f7c](watch/commits/a44e0f7c31dbb7f70c0a024a961ae10b7d5554e6)) - - angular@1.3.9 upgrade fixed the /#?memberId=x bug. Also, anon wasn't able to view avatar shares! - ([a053486f](watch/commits/a053486fcde200fb212e9863ffefe60f3a562600)) -- **avatar.styl:** improve label layout - ([0943a229](watch/commits/0943a229ec5cbb976e204ec7ec4641b138aea39b), - [#4349](watch/issues/4349)) -- **backgrounds:** Frigid, not Snowy, Peak - ([285ff622](watch/commits/285ff6228cd2b2b5d82a0f887b6ac3fc8530c1db)) -- **bailey:** mystery 3014 promo - ([bd5f8d79](watch/commits/bd5f8d79eaddcbcc42957f92c2e059da8b44979e)) -- **billing:** script to fix current_period_end, see #4420 - ([ca2d4511](watch/commits/ca2d45113c7f0d9ad5b59ac919355bb0d93737ef)) -- **cds:** max hour is 23 not 24 - ([193b92c1](watch/commits/193b92c16ba4a312d97194e7f2eba31a33acfd81)) -- **console:** remove console.log - ([c301bd3e](watch/commits/c301bd3e89e4fb0b02bc62b5b16356cf327f46c0)) -- **content:** Cannot call 'toString' of undefined - ([d5eb5bbf](watch/commits/d5eb5bbfe0416fbfa7270f371edc956c8c166c6b)) -- **date:** - - typo - ([756fa834](watch/commits/756fa83418e470578b0b43975a7c4e3d2e244284)) - - add YYYY/MM/DD format - ([cb13b5ac](watch/commits/cb13b5ac26c7bd43eb024679ca6083e328a2598c)) -- **db:** upgrade flags.recaptureEmailsPhase to new values - ([eb1ca43c](watch/commits/eb1ca43c44788ee8bf45d2bfe4f7874b0b24a213)) -- **emails:** - - send emails to new fb users - ([92a6af72](watch/commits/92a6af72cff29536985da2f3ef3f207d74842abb)) - - parse json - ([925bfe8a](watch/commits/925bfe8af44765ea05cef4a59a57b0eb88325c26)) - - remove unused variable - ([739d8885](watch/commits/739d8885a36057bbf2198e350d507e92f87503d4)) -- **event:** - - Card notif display - ([de21ec8c](watch/commits/de21ec8cf51c253a4eda21bf6fc70c64635d68f1)) - - Correct card notifs - ([37ae50a7](watch/commits/37ae50a77af4ca176d42a44efb3ae9b8c2109645)) - - Line breakage II - ([9a44ab76](watch/commits/9a44ab76ec3e093f093abee06475da998c8a23f0)) - - Line breakage II - ([281e3fdb](watch/commits/281e3fdbb54a1d1adb6709ca295a546153d6703b)) - - Line breakage - ([358b4213](watch/commits/358b42133080c897923043c899ad2ef4146fc8bd)) - - Localize poems - ([9fddb08a](watch/commits/9fddb08aebfca32deb9287a43fcc49fe32b5538b)) - - Valentine's strings - ([432eee75](watch/commits/432eee750f5bc31668a67b3b3b45b4f0fc3f5116)) - - Robes not for your head - ([7e0d8104](watch/commits/7e0d8104632539468d547aa1b9b66936088ddc92)) - - Party robes - ([51b2b9bd](watch/commits/51b2b9bda15b35eded359154888359396fb7f229)) - - Leave old achievement - ([efd1333c](watch/commits/efd1333c06bb5572147a8d10b9dba6f5fb9d1c7c)) - - Correct achievement award - ([a654d7ea](watch/commits/a654d7ea10748010885fdcf0f1845c63c985e6b9)) - - Robes shop icon - ([0cc819cc](watch/commits/0cc819cc646960e003ba182096aeeaafb6aa6618)) - - Mystery sprite error - ([37db763f](watch/commits/37db763fc28bc6db2b2dcb56eb2d18ede2f0c1b4)) - - Mystery typo - ([6c8f9e39](watch/commits/6c8f9e39b63d4a4475458b7a010b137fcb3820b5)) - - Better quest text placement - ([1b4843ff](watch/commits/1b4843ff586340abc51b3f45ccad0fe195fd6475)) - - quest syntax - ([f4c582eb](watch/commits/f4c582eb2475e6f1bb846aba44b3ad690c4fc0b7)) - - Better shop flow - ([1c908865](watch/commits/1c9088654881d91e3120dcc9729d6d0b2708db0b)) - - head, not helm - ([e62cb74a](watch/commits/e62cb74ad01cf7395b81abd2c3764548291a6455)) - - grunt - ([a4a94f79](watch/commits/a4a94f79734c136bdfd293d56c8a4dc473b93814)) - - Festify missed NPCs - ([d37dd904](watch/commits/d37dd90484c83200dd513f6596a8b78a3dd41919)) -- **flag-chat:** correct url for tavern flags - ([4c785e84](watch/commits/4c785e84590c2fa6d69e697e6240020152599346)) -- **flag-email:** correctly format date - ([635ebf62](watch/commits/635ebf626bdbef17531cd945726a9837457d598c)) -- **flag-message:** small refactor - ([948d5762](watch/commits/948d5762cd2c73179a77835bd22bb7fae76458d6)) -- **flags-emails:** - - allow arrays in FLAG_REPORT_EMAIL - ([9d22e65e](watch/commits/9d22e65e19ba63a5f91ae8cd03c2c1d3c655f552)) - - allow arrays in tnxEmails - ([065227fa](watch/commits/065227fa8c347d6a1643378edd9f1c29c33ccd6c)) -- **footerCtrl.js:** disable addThis hover - ([45d30ffe](watch/commits/45d30ffef56cdec74849448195e9cca02af58d7d)) -- **gem-cap:** use customerId in gem purchase - ([2018cc84](watch/commits/2018cc84ab9891d7ec32dd4dbae0cedfba7786b8)) -- **gifts:** - - $rootScope => Payments - ([3423e985](watch/commits/3423e9857d6a00f8305e7906f01ee5760650d8dc)) - - allow gifting 0local - ([5ec2c118](watch/commits/5ec2c118a5ab51b652915f1a9cfbe3c6ff98785d)) - - allow users to move from facebook=>local - ([a4c2bf61](watch/commits/a4c2bf61b26011765443c54481c065f475f675e4)) -- **flag-chat:** - - fetch author and add some group variables - ([2d4c5e7b](watch/commits/2d4c5e7b98152b215ac875acef919bc3ae3896de)) - - add some variables - ([7aff280a](watch/commits/7aff280a71b85d81daf47491cb4466e0f7c68879)) - - start implemnting email - ([652ce10e](watch/commits/652ce10e2246a7b7a9e699f9aa005999b40f69b4)) -- **flag-message:** - - add server methods - ([e84880d3](watch/commits/e84880d3e872e85af3e29e0a0381a6a4ad8b4551)) - - add server methods - ([ae6e0255](watch/commits/ae6e0255c69b4ecb60b0c3502840e875a9ff1085)) -- **gifts:** - - allow gifting subscriptions - ([5b01fff7](watch/commits/5b01fff70038886f470f2769235759ff29d7fcf5)) - - allow gifting gems from paypal/stripe - ([e8dbd5ca](watch/commits/e8dbd5ca1a89c45d1d63f2dfc714822bdc444a9d)) - - allow gifting from balance - ([7e9b92fc](watch/commits/7e9b92fcad3d2ad43da5395b34f580b8d961d648)) -- **google-discount:** add google discount - ([5fc001e4](watch/commits/5fc001e4f6bac35020dbe63667d034c2957a47d0)) -- **i18n:** - - add strings - ([09015370](watch/commits/09015370f0b9eef726ccf5dd3f695f2ea87d8f75)) - - add string - ([ff9280de](watch/commits/ff9280deea2326987c67c627cd622bf0925ca62a)) - - add string - ([bb855bf9](watch/commits/bb855bf9931dc127304e2c1e47394196fc25c937)) -- **iap:** ignore keys/ directory. upload any keys/iap-sandbox iap-live etc on a private branch - ([9d6caaa1](watch/commits/9d6caaa138d31d4c784737150ea313d68c69b745)) -- **interactive-tour:** disable ads till lvl 2 - ([d84549e2](watch/commits/d84549e2395046c4d94475778cf421eab0f720e5)) -- **loggly:** - - change tag based on base_url, logs internal server errors - ([dac2fc68](watch/commits/dac2fc682dfedbd9373b9d2695a857b1cf7afebb)) - - enable json loggin and start loggin errors during cron - ([8935538b](watch/commits/8935538b5351d8da9b0aee454b1444b63480932c)) - - add test log, use only in production and add sample config - ([af1ff6d7](watch/commits/af1ff6d74059e12683603ca89a55e5a12ff1a9e4)) - - add loggly - ([7356e0ba](watch/commits/7356e0bafeb3843d6c457c654abc7a68f999cf44)) -- **mystery:** - - Migration - ([55066480](watch/commits/55066480fb3685ae54ff637bfe470e1e257cdfa6)) - - February 2015 - ([d4f8acd0](watch/commits/d4f8acd0ef0879f0a0f459c0a79225b8e791313c)) - - January subscriber set - ([524761f1](watch/commits/524761f1cf4895b4a876ec696805c0f7c6998f21)) - - January subscriber set - ([e2f47651](watch/commits/e2f47651a4facc79afec1edfd8c2c76bafee1ed7)) -- **mystery items:** March subscriber sprites added - ([e918aa15](watch/commits/e918aa158d9d7835efcde86239919c7b830cda27)) -- **news:** - - Promo images - ([0ec9e5b1](watch/commits/0ec9e5b1e1edb86db3266e4cf633047d27d1dabf)) - - move old news to /static/old-news, better use of content space - ([66b4dae0](watch/commits/66b4dae0d98853edd67a117cc4a196f7bdce69f7)) -- **pie:** Add pie - ([1120d334](watch/commits/1120d334c31c8f3836d4a88b4e1a0a31cd2e48d1)) -- **plans:** - - time traveler - by full sets - ([bf7e1e66](watch/commits/bf7e1e66ed7ef4338d31807587ce6569eb06ef88)) - - add time traveler - buy individual mystery items - ([d81badde](watch/commits/d81badde69e5cd3c3b7ef4babc82337aec87c006)) - - add consecutive-month benefits for subscribers - ([76be625f](watch/commits/76be625f6dd86d82ad3a52fcf066c4670cd770ad)) - - cleanup plans' perks page, rename Time Trinket => Mystic Hourglass - ([8c5842eb](watch/commits/8c5842eb527632d2ffa30d2f01eb87ec09cf6609)) - - time travelers tab, 1 trinket to buy 1 set - ([0fffd665](watch/commits/0fffd66588e603513803967f1983797f530011a2)) - - allow block subscriptions from paypal/stripe - ([7f2b6b5c](watch/commits/7f2b6b5cfbff94dc7339126308428ee93e23e1a5)) - - consectuive-month subscription perks (gifting) - ([5fd805db](watch/commits/5fd805db881901df68b342fc66ec741bb85da581)) - - consecutive months & extra months (like a time-card) - ([57bfee02](watch/commits/57bfee02cf34b9b44f662f90328d2615cc8f4ebe)) -- **presskit:** add presskit page cc @lemoness - ([cba232ef](watch/commits/cba232ef83fb15c3fd74ed8eb535b5dc3d317bad)) -- **quest:** - - Bunny quest - ([4cb67835](watch/commits/4cb6783544b483865d008990e7e6f243e8339e52)) - - Pet Rocks - ([0608ac5c](watch/commits/0608ac5caa8e753ba4e9c3a92b5fb3c7424f4f30)) - - T-Rex pet - ([c260362d](watch/commits/c260362d96b629a47d0ce18bacfd7fcc9554b065)) - - T-Rex pet - ([0b63e48c](watch/commits/0b63e48c6e10478e1717f0ce132ceb0ade4ccb4d)) - - Implement Penguin pet quest - ([d25455fa](watch/commits/d25455fa5ad9f15815c3220f6bf292e868b57a00)) -- **quests:** - - Differentiated scrolls - ([41241750](watch/commits/412417505f2d84d049572a9bfc73d78c3f63c344)) - - Differentiated scrolls - ([2ca6636c](watch/commits/2ca6636c944c67f9e527d96cc41987dc83a718b2)) -- **seasonal:** - - Normal view - ([48246d6a](watch/commits/48246d6a7239687f3b44ad82c56aed8f6e625f4e)) - - Normal view - ([c9b81414](watch/commits/c9b81414a4079ee8a706d19971ac68e4aa26f856)) - - Implement Snowball - ([53fff0db](watch/commits/53fff0dbc61c2bb11bf21f1575c487ab05016214)) - - Implement snowball - ([f7d45c95](watch/commits/f7d45c951e24abf4cfe11804f8a53a85e31df573)) - - Seasonal Shop - ([a98a6859](watch/commits/a98a68597127f385c7729f25ff6f9f282ea20d0a)) - - Seasonal shop - ([c7ee171e](watch/commits/c7ee171ee415be5af0f090cffd8378f7890fea74)) -- **spring:** Fling - ([f3f5669a](watch/commits/f3f5669ab28e944e7c65deef256ac8248f98e4e5)) -- **subscriptions:** Show count of purchasable Gems - ([62e526f8](watch/commits/62e526f8dc7b490b969a7ee9afa2ddc9c41956b2)) -- **surveys:** - - Close out survey - ([7065b400](watch/commits/7065b400bc6c221641a57b8129f5ade5f9aded4c)) - - Survey achievement - ([9cfa27f0](watch/commits/9cfa27f08948a2b6b8773d6fa0d4d1bf0c36f9df)) -- **thanksgiving:** - - revert npcs back to normal - ([eb27a767](watch/commits/eb27a767093905ab045196f58c07389bf76eaf81)) - - add migration for turkey mounts / pets - ([a8cf1026](watch/commits/a8cf10261042a6925f4b4949313ba891a1ca5dd0)) -- **tour:** - - Early quit classes tour - ([18649144](watch/commits/18649144a8b47ac6822d19c40243b32566ceb573)) - - add the other tour entries @lemoness - ([1e8265a9](watch/commits/1e8265a9f13c364c7f2cdca1124cf2767c714926)) - - ESC to perma-close #4886 @lemoness @alys - ([cca2d81b](watch/commits/cca2d81bc3deb757d74c3ac3283ca45c52643034)) - - update habits step wording @lemoness - ([152853a8](watch/commits/152853a877afd1d59eb6e2c03f4a7c560f9a6283)) - - Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides - ([812493fe](watch/commits/812493fec5c5a15db3c2411df0ad64b30c8ceba1)) -- **world-boss:** - - Desperation move - ([3ee965d8](watch/commits/3ee965d8d25e896b942d8e1bfda796e83a0b0540)) - - Desperation move - ([7925935f](watch/commits/7925935ff5de77699df31da6369a74a78ef9bcfe)) - - Healing on rage - ([480b4e27](watch/commits/480b4e276435c93fcef31248430dee4dc3d2d1c7)) - - Healing on rage - ([ad7c02d5](watch/commits/ad7c02d50d5a62570b7ecf356c93930a9047fb15)) +# (2015-03-28) diff --git a/website/public/css/global-modules.styl b/website/public/css/global-modules.styl index 45b0567d0a..e209b6406e 100644 --- a/website/public/css/global-modules.styl +++ b/website/public/css/global-modules.styl @@ -7,7 +7,7 @@ $clearfix // Text shadow mixin hrpg-text-shadow-mixin($hrpg-text-shadow-base-color) text-shadow: - -1px -1px 1px darken($hrpg-text-shadow-base-color,70%), + -1px -1px 1px darken($hrpg-text-shadow-base-color,70%), 1px -1px 1px darken($hrpg-text-shadow-base-color,70%), -1px 1px 1px darken($hrpg-text-shadow-base-color,70%), 1px 1px 1px darken($hrpg-text-shadow-base-color,70%); @@ -21,8 +21,8 @@ hrpg-button-color-mixin($hrpg-button-color) @media screen and (min-width:768px) &:hover background-color: darken($hrpg-button-color, 2.36%) !important - > a, > button, > input, textarea - color: darken($hrpg-button-color, 70%) !important + > a, > button, > input, textarea + color: darken($hrpg-button-color, 70%) !important border-color: darken($hrpg-button-color, 16.18%) !important > input, textarea &:hover @@ -43,7 +43,7 @@ hrpg-button-color-mixin($hrpg-button-color) @media screen and (min-width:768px) border:1px solid darken($hrpg-button-color, 16.18%) h4 - color: darken($hrpg-button-color, 61.8%) + color: darken($hrpg-button-color, 61.8%) background-color: $hrpg-button-color border-color: darken($hrpg-button-color, 16.18%) > ul:first-child:before, > div:first-child:before @@ -81,7 +81,7 @@ $hrpg-button-master .glyphicon position: relative top: 0.132em - > a, > button + > a, > button &:active background-color: #aaa !important $hrpg-button @@ -113,7 +113,7 @@ $hrpg-button-with-input height: auto input, textarea border: 1px solid #ccc - border-radius: 0.382em 0em 0em 0.382em !important + border-radius: 0.382em 0em 0em 0.382em !important padding-left: 0.618em background-color: #fff !important -webkit-appearance: none @@ -186,7 +186,7 @@ $hrpg-label > a color: #fff text-shadow: - -1px -1px 1px #333, + -1px -1px 1px #333, 1px -1px 1px #333, -1px 1px 1px #333, 1px 1px 1px #333; @@ -250,9 +250,9 @@ $hrpg-modal-dropdown z-index:2 width:16px height:16px - border-top-width: 1px + border-top-width: 1px border-top-style: solid - border-left-width: 1px + border-left-width: 1px border-left-style: solid transform: rotate(45deg) $hrpg-modal-dropdown-left @@ -270,7 +270,7 @@ $hrpg-modal-dropdown-right > ul:first-child:before, > div:first-child:before, h4:before left: 1em $hrpg-modal-controls - text-align: right + text-align: right border-radius:0px 0px 0.382em 0.382em background-color: #fff li @@ -317,6 +317,9 @@ hrpg-tag-color-mixin($hrpg-tag-color) background-color: darken($hrpg-tag-color,32.8%) &.active:hover > a:before border-right-color: darken($hrpg-tag-color,32.8%) +// Tooltips wrapper for disabled elements +.disabled-tooltip-wrapper + display: inline-block $hrpg-tag-master display: inline-block @@ -348,7 +351,7 @@ $hrpg-tag-master position: absolute top: 0 left: -1.5em - &:before + &:before width: 0; height: 0; border-top: 1em solid transparent diff --git a/website/public/js/controllers/groupsCtrl.js b/website/public/js/controllers/groupsCtrl.js index a87992f43d..a0e1331ac9 100644 --- a/website/public/js/controllers/groupsCtrl.js +++ b/website/public/js/controllers/groupsCtrl.js @@ -86,7 +86,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' }); }else{ $scope.removeMemberData = undefined; - } + } } $scope.openInviteModal = function(group){ @@ -118,7 +118,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' $rootScope.openModal('private-message',{controller:'MemberModalCtrl'}); }); } - + }]) .controller('InviteToGroupCtrl', ['$scope', 'User', 'Groups', 'injectedGroup', '$http', 'Notification', function($scope, User, Groups, injectedGroup, $http, Notification){ @@ -159,6 +159,9 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' $scope.profile = member; }); $scope.sendPrivateMessage = function(uuid, message){ + // Don't do anything if the user somehow gets here without a message. + if (!message) return; + $http.post('/api/v2/members/'+uuid+'/message',{message:message}).success(function(){ Notification.text(window.env.t('messageSentAlert')); $rootScope.User.sync(); diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index 4df7fedbef..e816af71ba 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -49,8 +49,12 @@ script(type='text/ng-template', id='modals/private-message.html') textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',placeholder=env.t('needsTextPlaceholder'),ng-model='_message') .modal-footer //- Due to a quirk in Bootstrap UI, we need to wrap this so the tooltip can - //- appear when disabled. - div(style='display:inline-block',tooltip="{{_message ? '' : env.t('needsText')}}") + //- appear when the button is disabled. + // + //- Source: http://getbootstrap.com/javascript/#tooltips + // "Tooltips on disabled elements require wrapper elements" + // + .disabled-tooltip-wrapper(tooltip="{{_message ? '' : env.t('needsText')}}") button.btn.btn-primary(ng-disabled='!_message',ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel')