1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
b4975bb8a4
Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting
...
Conflicts:
public/js/controllers/headerCtrl.js
views/options/social/group.jade
2014-12-30 12:57:32 -06:00
d8cfc1dd4b
WIP(NYE): New Year's cards
2014-12-29 20:58:28 -06:00
756fa83418
fix(date): typo
2014-12-29 22:26:12 +01:00
cb13b5ac26
fix(date): add YYYY/MM/DD format
2014-12-29 22:16:58 +01:00
4a37bec652
fix(pr): indentation and simplify
2014-12-29 21:21:54 +01:00
2de3e65043
Fix merge conflicts with test values
2014-12-26 16:00:45 -05:00
8852ad61b2
Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed
2014-12-26 15:52:42 -05:00
7297429888
Make it possible to choose between MM/dd and dd/MM date format
2014-12-26 15:52:42 -05:00
03f12a3718
Make it possible to choose between MM/dd and dd/MM date format
2014-12-24 22:18:50 -05:00
5fd805db88
feat(plans): consectuive-month subscription perks (gifting)
2014-12-03 14:17:07 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
57bfee02cf
feat(plans): consecutive months & extra months (like a time-card)
2014-12-03 14:17:07 -07:00
e63f2b6d97
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
48cfd1c2a1
convert JackOLantern-Base pumpkin pet code to commented-out example code for future use
2014-11-01 07:30:40 +10:00
b15e239601
Merge branch 'Alys-communityGuidelines' into develop
2014-10-27 16:20:30 -06:00
fd18232187
bailey(): mystery, costume challenge
2014-10-24 20:33:51 -06:00
ed15d0b1c7
Added setting for making the due tab default on dailies
2014-10-16 21:04:23 -05:00
d0caf5f69b
tmp(halloween): revert d5610ba , didn't work. Assign pumpkin on user.save()
2014-10-14 17:40:20 -06:00
d5610ba01f
tmp(halloween): grant pumpkin pet to all users through october,
...
REMEMBER revert on 11/1
2014-10-14 17:29:27 -06:00
ef83c9999b
fix(tests): snowball
2014-10-03 15:51:30 -06:00
0841cafd1f
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:18:13 -06:00
ee325ce27f
Merge pull request #4093 from deilann/release_pets
...
feat(pets): release pets
2014-10-01 06:35:36 +10:00
8427c53d90
release pets feature
2014-09-29 13:35:38 -07:00
562f593c8f
fix(spells): temp fix to #4067 , for some reason _v is undefined after
...
casting spells?
2014-09-24 13:07:40 -06:00
c68a061c0d
experimental changes for indicating acceptance of guidelines
2014-09-07 15:14:58 +10:00
87d8387640
change order of staff/moderator names at top of Tavern chat to staff, npc, moderator
2014-09-05 21:20:42 +10:00
cd7f87bbfe
add glyphicons to admin names, refactor code to reduce duplication of contrib.level style assignments, sort moderator name list sensibly
2014-09-05 21:17:56 +10:00
73cd71d74b
add star/tower glyphicons for mods/staff in Hall; in Hall, change admin's description of levels; create migration script for increasing admin tiers
2014-09-05 21:17:55 +10:00
95b16f8690
change headAccessory to eyewear
2014-08-29 18:51:28 +10:00
39911ef8e0
feat(audio): refactor user.preferences.{sound,soundTheme} into just
...
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
2014-08-15 18:13:59 -06:00
3d2d8fbfef
clean branch from develop to add audio
2014-08-08 23:03:52 +09:00
a8ad9f89e8
reinsert default blue flower https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-07 13:50:29 +10:00
33b2e8c4fe
fix(flower): remove default on flower for now, #1529 @Alys
2014-08-05 13:08:40 -06:00
4af860ea24
allow partymember sorting to be ascending or descending
2014-08-05 00:31:22 +02:00
1d92ddd645
feat(i18n): add change language button on front page, fix #3530
2014-08-03 18:23:13 +02:00
2c013ca73a
de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-03 13:20:51 +10:00
79bd088589
add correct styling to moderator names in message above Tavern chat
2014-08-02 07:28:29 +10:00
6e29facb98
feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness
2014-07-25 12:14:48 -06:00
7dfce54454
Revert "fix(quests): prevent very high damage for all quests" (@lemoness
...
@deilann - now it's just world boss, capped 900)
This reverts commit 89369e21a3
2014-07-12 16:13:27 -06:00
89369e21a3
fix(quests): prevent very high damage
2014-07-12 15:16:32 -06:00
e5c002bcdb
feat(chat): dynamic list of tavern mods (see http://goo.gl/9XhIZ6 )
2014-06-29 16:20:38 -06:00
9f1035c317
feat(dilatory): scene damage + boss def/str. bug fixes, tests
2014-06-25 14:12:30 -06:00
c6232c2d1a
feat(backgrounds): add backgrounds feature
2014-06-10 16:38:29 -06:00
c441ae418b
fix(accessories): add body accessory to user model, fixes #3346
2014-05-22 23:23:26 +02:00
af74ff9da0
feat(chat): allow banning problem users from chat rooms
2014-05-14 16:01:39 -06:00
a38f2354f5
fix(i18n): signup, clone default tasks
2014-05-14 20:01:31 +02:00
de47de0673
Merge pull request #3449 from deilann/removingthelevelcap
...
Removing level cap, free rebirth at 100
2014-05-11 16:30:41 -06:00
ce69b42b2b
fix(i18n): default tasks checklists
2014-05-11 17:11:57 +02:00
Blade Barringer