2b085b8803
Merge pull request #4220 from Alys/commGuide-translation-fix-2014-11-04
...
merge strings to ease translations
2014-11-04 19:15:10 +01:00
62f71fbdb8
merge strings to ease translations
2014-11-04 16:43:27 +10:00
16fff701d4
Merge pull request #4212 from Alys/mountsFix
...
fix decapitated mount head - fixes https://github.com/HabitRPG/habitrpg/issues/4209
2014-11-02 19:16:30 +10:00
b79118c976
fix decapitated mount head
2014-11-02 18:54:33 +10:00
51a850c766
fix(bailey)
2014-11-01 13:32:50 -06:00
5e0f4e7823
bailey(mystery)
2014-11-01 13:31:08 -06:00
89060c9561
feat(fall): turn off fall hair, skins, spookySparkles
2014-11-01 13:25:09 -06:00
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
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
876d1d435d
change Fetch Recent Messages from tooltip to button text
2014-11-01 11:42:48 +10:00
372869d709
enable feature to block chat until user agrees to guidelines
2014-11-01 11:03:01 +10:00
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
48cfd1c2a1
convert JackOLantern-Base pumpkin pet code to commented-out example code for future use
2014-11-01 07:30:40 +10:00
d9cfe3c370
bailey(halloween)
2014-10-31 13:05:33 -06:00
416058ffcf
Updated href with angular expression to ng-href
2014-10-31 14:03:57 -05:00
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
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
d45f40ca1f
refactor(tags): simplify with ui-keyup, see #4141
2014-10-29 14:28:09 -06:00
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
8423de287e
Merge pull request #4142 from gjoyner/tasks
...
Popovers now disappear when clicking Save & Close
2014-10-29 14:22:21 -06:00
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
e004452257
Revert "Revert "bailey(communityGuidelines): -breadstrings x1""
...
This reverts commit 93aae9a883
2014-10-28 15:15:01 -07:00
58e8a8ea9b
Revert "Revert "bailey(communityGuidelines): -breadstrings x1""
...
This reverts commit 93aae9a883
2014-10-28 12:56:31 -07:00
93aae9a883
Revert "bailey(communityGuidelines): -breadstrings x1"
...
This reverts commit edc9382e99
2014-10-28 12:23:00 -07:00
7b2b287826
Merge pull request #4192 from Alys/quickfix1
...
change Heroic to Guardian for non-staff moderators
2014-10-28 11:37:51 +10:00
7d817f1298
change Heroic to Guardian for non-staff moderators
2014-10-28 11:33:50 +10:00
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
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
354e8a8167
change mods@habitrpg.com to leslie@habitrpg.com
2014-10-27 18:07:15 -06:00
edc9382e99
bailey(communityGuidelines): -breadstrings x1
2014-10-27 17:43:36 -06:00
a394a1bc42
baily(communityGuidelines)
2014-10-27 16:51:42 -06:00
b15e239601
Merge branch 'Alys-communityGuidelines' into develop
2014-10-27 16:20:30 -06:00
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
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
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
5a4aee90ed
removed broken img tag and added quotes to malformed a tags
2014-10-26 06:14:31 -06:00
f8a975d4ea
Merge pull request #4180 from jklein/fixing_alignment
...
Fixing alignment for invited party members
2014-10-26 12:44:53 +01:00
85aef2dd27
fix(communityGuidelines): modify script query to use collection indexes
...
first for better perf
2014-10-25 16:26:57 -06:00
fd18232187
bailey(): mystery, costume challenge
2014-10-24 20:33:51 -06:00
3a3066cf08
Merge branch 'Alys-gemsIncrease' into develop
2014-10-24 18:56:49 -06:00
35308853a5
feat(contributors): small update to alys's script
2014-10-24 18:56:11 -06:00
623175c312
tmp(memleak): try working with apdex score to restart, rather than
...
response time
2014-10-24 18:42:07 -06:00
87273ec680
bailey(quests): moonstone chain quest
2014-10-23 10:57:09 -06:00
c790e2bf5b
Fixing alignment for invited party members
2014-10-23 10:03:29 -04:00
76de909683
Minor bug: In challenges area, Join button has a yellow background
2014-10-22 01:45:37 +03:00
5e89d07e07
add tabs to Habits (All, Yellow-Red, Green-Blue) and to rewards (All, Equipment & Skills)
2014-10-21 15:39:46 +10:00
3dc6d6385c
Merge pull request #4166 from Alys/task-column-tabs-to-top
...
put Daily and To-Do tabs at top and bottom - fixes https://github.com/HabitRPG/habitrpg/issues/3827
2014-10-21 15:37:21 +10:00
58c031fba4
Merge pull request #4169 from Alys/option
...
move Dailies default setting to bottom to keep together the three settings about task edit mode
2014-10-21 07:44:11 +10:00
8d87ce6c1b
moved new Dailies default setting to bottom of list to keep together the three settings about task edit mode
2014-10-20 05:49:50 +10:00
739e7d3d76
Merge pull request #4157 from crookedneighbor/add-setting-for-due-view
...
Added setting for making the due tab default on dailies
2014-10-20 05:34:40 +10:00
Matteo Pagliazzi