Commit Graph

9193 Commits

Author SHA1 Message Date
Alice Harris 136408e885 add tooltip to Dated To-Dos tab to explain that To-Dos aren't sorted 2014-11-02 05:50:31 +10:00
Alice Harris 6d0f2ed0bf add tooltip to Dated To-Dos tab to explain that To-Dos aren't sorted 2014-11-02 05:49:49 +10:00
Tyler Renelle 51a850c766 fix(bailey) 2014-11-01 13:32:50 -06:00
Tyler Renelle 5e0f4e7823 bailey(mystery) 2014-11-01 13:31:08 -06:00
Tyler Renelle 8932db4cc9 feat(mystery): update box 2014-11-01 13:29:29 -06:00
Tyler Renelle 3132bbcb41 feat(fall): back to fall npcs 2014-11-01 13:28:32 -06:00
Tyler Renelle 89060c9561 feat(fall): turn off fall hair, skins, spookySparkles 2014-11-01 13:25:09 -06:00
Tyler Renelle 050acdc8f3 Merge pull request #4203 from Alys/revertPumpkin-2014-11-01
convert JackOLantern-Base pumpkin pet code to commented-out example code
2014-11-01 13:12:01 -06:00
Tyler Renelle 44aa1209cd Merge pull request #351 from spacetime/develop
Added space before "target=" when added to href
2014-11-01 13:06:58 -06:00
Rishab Arora a772c6dd8f Added space before "target=" when added to href
Fixes bug where the first links in markdown boxes don't work
2014-11-01 23:04:00 +05:30
Alice Harris 28e89b9bbd add Dated tab for To-Dos, and renamed other two To-Do tabs to save space 2014-11-01 20:35:11 +10:00
Alice Harris 3451315ef6 add Dated tab for To-Dos 2014-11-01 20:34:36 +10:00
Alice Harris 9ea0db88c1 remove previous method for hiding/showing remaining/completed To-Dos, and add new method 2014-11-01 19:54:41 +10:00
Alice Harris 246fa799b7 remove unnecessary commented-out code 2014-11-01 19:52:58 +10:00
Alice Harris ff962b5959 allow To-Do add form to appear even when viewing completed To-Dos 2014-11-01 19:46:50 +10:00
Alice Harris db411a440d remove previous method for hiding/showing remaining/completed To-Dos 2014-11-01 19:43:08 +10:00
Matteo Pagliazzi b858aece51 Merge pull request #4201 from crookedneighbor/href-to-nghref
Updated href with angular expression to ng-href
2014-11-01 10:19:38 +01:00
Alice Harris 876d1d435d change Fetch Recent Messages from tooltip to button text 2014-11-01 11:42:48 +10:00
Alice Harris 372869d709 enable feature to block chat until user agrees to guidelines 2014-11-01 11:03:01 +10:00
Alice Harris 0963f0fc0a Merge pull request #4114 from Alys/lynnyliz-develop
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
2014-11-01 10:25:38 +10:00
Alice Harris 48cfd1c2a1 convert JackOLantern-Base pumpkin pet code to commented-out example code for future use 2014-11-01 07:30:40 +10:00
Tyler Renelle d9cfe3c370 bailey(halloween) 2014-10-31 13:05:33 -06:00
Tyler Renelle 6f3c855db0 feat(halloween): halloween sprites 2014-10-31 13:05:22 -06:00
Blade Barringer 416058ffcf Updated href with angular expression to ng-href 2014-10-31 14:03:57 -05:00
Taldin 506ac6ebe7 added mountmaster support
inventoryCtrl: Changed Matt to show 90 mounts instead of 180
notificationCtrl: added mountmaster achievement test
userCtrl: added scope.profile.mountCount
user.js: added fields for mountMaster and mountMasterCount (not used
yet),  mountCount function
modals/achievements.jade - added modal dialog for mountmaster (note:
wolf graphic was not available locally)
profiles/achievements - jade  - mountmaster added
stats.jade -- uncommented broken Mounts Tamed section, since it works
now
2014-10-30 12:35:40 -07:00
Taldin 77d92b84dc added mountmaster support
pets: added language support - needs to be commuted to other languages'
content.coffee - added  api.mounts and api.questmounts index.coffee -
revised api.countMounts to remove quest mounts from the list
2014-10-30 12:35:14 -07:00
Tyler Renelle 9efaf39b2b feat(webhooks): add webhooks to user.preferences (API settings) so we can post to external services (eg, Beeminder) 2014-10-29 15:27:39 -06:00
Tyler Renelle 5e594b3197 Merge pull request #339 from negue/chat_mentions
highlight the current username
2014-10-29 14:35:49 -06:00
Tyler Renelle f9249ff488 Merge pull request #338 from gjoyner/languages
The language file for the Forgot Password fix
2014-10-29 14:30:06 -06:00
Tyler Renelle d45f40ca1f refactor(tags): simplify with ui-keyup, see #4141 2014-10-29 14:28:09 -06:00
Tyler Renelle c3a62096ad Merge pull request #4141 from gjoyner/tags
Tags (filters) saves when pressing Enter instead of deleting
2014-10-29 14:27:21 -06:00
Tyler Renelle 8423de287e Merge pull request #4142 from gjoyner/tasks
Popovers now disappear when clicking Save & Close
2014-10-29 14:22:21 -06:00
Tyler Renelle d11dd852c5 Merge pull request #4144 from gjoyner/front
Front page's Forgot Password will report an invalid email address instead of simply errorring. Does NOT include updated locals/en/front.json
2014-10-29 14:19:38 -06:00
Taldin e004452257 Revert "Revert "bailey(communityGuidelines): -breadstrings x1""
This reverts commit 93aae9a883.
2014-10-28 15:15:01 -07:00
Taldin 58e8a8ea9b Revert "Revert "bailey(communityGuidelines): -breadstrings x1""
This reverts commit 93aae9a883.
2014-10-28 12:56:31 -07:00
Taldin 93aae9a883 Revert "bailey(communityGuidelines): -breadstrings x1"
This reverts commit edc9382e99.
2014-10-28 12:23:00 -07:00
Alice Harris 7b2b287826 Merge pull request #4192 from Alys/quickfix1
change Heroic to Guardian for non-staff moderators
2014-10-28 11:37:51 +10:00
Alice Harris 7d817f1298 change Heroic to Guardian for non-staff moderators 2014-10-28 11:33:50 +10:00
Alice Harris 2d392be772 Merge pull request #4191 from Alys/quickfix
Community Guidelines date; wrapping in staff/mod names in Tavern
2014-10-28 11:17:21 +10:00
Alice Harris 0da873308d adjust last-updated date in Community Guidelines; add quick-and-dirty fix to allow staff/moderator names to wrap in message above Tavern chat 2014-10-28 11:05:18 +10:00
Alice Harris 354e8a8167 change mods@habitrpg.com to leslie@habitrpg.com 2014-10-27 18:07:15 -06:00
Tyler Renelle edc9382e99 bailey(communityGuidelines): -breadstrings x1 2014-10-27 17:43:36 -06:00
Tyler Renelle a394a1bc42 baily(communityGuidelines) 2014-10-27 16:51:42 -06:00
Tyler Renelle b15e239601 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:20:30 -06:00
Tyler Renelle c0a53740c4 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:19:14 -06:00
Tyler Renelle 5d67995458 Merge pull request #4177 from holyspecter/challenge-action-bacground-bug
Minor bug: In challenges area, Join button has a yellow background
2014-10-27 13:58:26 -06:00
Tyler Renelle b5fe46155b Merge pull request #4188 from tylerdmace/develop
removed broken img tag and added quotes to malformed a tags
2014-10-27 13:57:49 -06:00
Alice Harris 9de41cd259 Merge pull request #347 from Alys/task-column-Habits-Rewards-tabs
new tabs for Habits and Rewards columns on task page
2014-10-27 18:46:13 +10:00
Alice Harris 3d0f9c09bd Merge pull request #4167 from Alys/task-column-Habits-Rewards-tabs
new tabs for Habits and Rewards columns on task page
2014-10-27 18:46:08 +10:00
Alice Harris c156aaadee add compiled file 2014-10-27 18:39:33 +10:00