Commit graph

433 commits

Author SHA1 Message Date
Alice Harris
eefdfe9234 automatically assign admin:true when contributor level/tier is greater than 7, and assign admin:false when less than 8 2014-09-05 21:17:56 +10:00
Alice Harris
c66d786f3e add fontello and change staff icon from tower to crown 2014-09-05 21:17:56 +10:00
Alice Harris
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
Alice Harris
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
Alice Harris
28505c139f allow newly created tag to have the same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856 2014-09-03 06:16:46 +10:00
Tyler Renelle
f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Tyler Renelle
4ba860ea8c fix(sortable): don't trigger sort when dragging in place, fixes #3926 2014-08-26 14:32:21 -06:00
Tyler Renelle
96532ed6bd Merge pull request #3925 from ebiagogo/develop
Fixed bug #3007 where using wrong "old password" when changing password ...
2014-08-26 14:00:18 -06:00
Michael Looby
e19aca0036 Fixed bug #3007 where using wrong "old password" when changing password results in "Password changed succesfully" message even though password change fails. 2014-08-26 15:33:36 -04:00
Tyler Renelle
ef322443f9 refactor(tags): small cleanup 2014-08-26 10:24:43 -06:00
Tyler Renelle
0b9c5271bb feat(newStuff): show newStuff modal on page load if present 2014-08-25 17:49:53 -06:00
Tyler Renelle
184e145914 Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop
Conflicts:
	views/options/settings.jade
2014-08-23 16:05:17 -06:00
Tyler Renelle
88d27e2153 Merge branch 'Fandekasp-sortable_tags' into develop
Conflicts:
	public/js/directives/directives.js
2014-08-19 15:00:36 -06:00
Tyler Renelle
750135b673 feat(sortable): use angular-ui-sortable instead of jqueryui directly 2014-08-19 14:35:10 -06:00
Tyler Renelle
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
Tyler Renelle
06b6b4cde0 Merge pull request #3856 from Fandekasp/add_audio
Add audio
2014-08-15 17:30:12 -06:00
Alice Harris
2566ddac94 fixes missing drop notifications - fixes https://github.com/HabitRPG/habitrpg/issues/3787 2014-08-12 07:14:50 +10:00
Adrien Lemaire
e00ea4c248 add missing sound actions 2014-08-09 19:09:58 +09:00
Adrien Lemaire
d7aaec2262 fix bug switch audio wasn't working 2014-08-09 18:57:17 +09:00
Adrien Lemaire
a5f1e30880 fix bug music not playing if music menu not open + integrate daily/todo/reward sounds 2014-08-09 17:29:56 +09:00
Adrien Lemaire
3d2d8fbfef clean branch from develop to add audio 2014-08-08 23:03:52 +09:00
Tyler Renelle
2d34c1cb9b Merge pull request #3818 from cstyles/null-history
Don't display chart if history is empty (#3691)
2014-08-06 18:38:30 -06:00
Matteo Pagliazzi
1d92ddd645 feat(i18n): add change language button on front page, fix #3530 2014-08-03 18:23:13 +02:00
Matteo Pagliazzi
176b39a1a0 fix(typo) 2014-08-03 12:55:17 +02:00
Matteo Pagliazzi
a30ee4368a fix(notifications): fix drop notifications 2014-08-03 12:28:29 +02:00
Collin Styles
0b01ff2201 Don't display chart if history is empty. 2014-07-31 14:56:52 -07:00
Tyler Renelle
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
Tyler Renelle
dda7f86433 Merge branch 'thedavemarshall-update_billing_info' into develop 2014-07-21 14:48:17 -06:00
David Marshall
5cc4c60329 Edit stripe cc subscriptions 2014-07-21 01:08:56 -07:00
Tyler Renelle
acc874c60d Merge pull request #3597 from 3onyc/feature/username-change
Implement "Change username" feature
2014-07-19 16:48:20 -06:00
Tyler Renelle
34236536df feat(admin): allow admins to update user's items (restoring lost items,
granting quest scrolls, etc). @deilann :)
2014-07-17 14:09:39 -06:00
Tyler Renelle
d848faee8e fix(quests): show completion dialog 2014-07-12 14:32:13 -06:00
Tyler Renelle
80dbc1111e fix(quests): when leaving group, if leader or quest.leader is leaving,
re-assign to most senior member. #3709
2014-07-11 16:29:42 -06:00
Tyler Renelle
c180d899c1 perf(groups): bindonce on guild listings for better performance guild
page. This requires refreshing when making changes to guilds. Fixes #3663
2014-06-29 13:33:40 -06:00
Nicolás Jones
9f8baa617e Update settingsCtrl.js 2014-06-18 00:03:45 -03:00
Nicolás Jones
f7727eef23 Update settingsCtrl.js 2014-06-18 00:03:21 -03:00
Tyler Renelle
3136b4cc2c feat(debug): debug buttons for NODE_ENV==test too 2014-06-16 13:25:51 -06:00
deilann
7ec679d11a Merge pull request #3609 from yafinee/chart
#1623 - charts: readable (vertical) labels on horizontal axis
2014-06-15 01:58:35 -07:00
vagrant
0d73330ab6 #1623 - charts: readable (vertical) labels on horizontal axis 2014-06-15 08:50:03 +00:00
3onyc
5025c4bac6 Implement "Change username" feature 2014-06-14 20:54:07 +02:00
Tyler Renelle
99fb9b0959 fix(backgrounds): 15G confirm dialog, fixes #3595 2014-06-12 12:37:57 -06:00
Tyler Renelle
2aacf63308 feat(backgrounds): bailey 2014-06-10 18:52:13 -06:00
Tyler Renelle
da4f51f049 feat(backgrounds): use nested backgrounds as {set:{bg1,bg2,bg3}} for
easier "purchase set". Refactor twoGem()
2014-06-10 17:05:44 -06:00
Tyler Renelle
c6232c2d1a feat(backgrounds): add backgrounds feature 2014-06-10 16:38:29 -06:00
Tyler Renelle
efc9a6e715 fix(pets): if !Content.hatchingPotions[x], use string passed for
displayname. Fixes #3575
2014-06-08 11:11:34 -06:00
Matteo Pagliazzi
df8eb107cd fix(i18n): use strings 2014-05-28 18:07:25 +02:00
Tyler Renelle
0dadc86a61 fix(subscriptions): expose cancelSubscription on $rootScope (don't know
why $scope doesn't work here). Fix UI bug
2014-05-12 12:18:53 -06:00
Matteo Pagliazzi
314497271a fix(i18n): group name 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi
d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
James Hsiao
70af0869c6 Avoid modals for streaks > 1 and beastmaster > 91 2014-04-22 13:54:52 -04:00