Commit graph

2111 commits

Author SHA1 Message Date
Alice Harris
9457c844cc move Community Guidelines from an included html page in a modal to a static page with no modal 2014-09-05 21:17:57 +10:00
Alice Harris
08c37a07a9 fix problem in chat of usernames hiding first part of message 2014-09-05 21:17:57 +10:00
Alice Harris
38ea43b7f1 remove admin checkbox from Hall - not needed now that level/tier 8 and 9 automatically turn on hero.contributor.admin 2014-09-05 21:17:57 +10:00
Alice Harris
d6ce6f8986 remove unnecessary style; fix spacing in tavern message 2014-09-05 21:17:56 +10:00
Alice Harris
8343a728c0 delete unnecessary views/static/community-guidelines.jade 2014-09-05 21:17:56 +10:00
Alice Harris
3b9b6b78bc add Community Guidelines document and its images; add jade modal for displaying it 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
0f5ef3a1ea finish applying new colours for tier 9 (staff) and tier 8 (mods) 2014-09-05 21:17:55 +10:00
Negue
042dabcae9 Markdown for Checklist Items 2014-09-04 22:32:54 +02:00
Alice Harris
371bae31b1 Merge pull request #3952 from negue/tooltip_fix_part2
2nd Try to fix Avatar tooltips
2014-09-03 12:03:55 +10:00
Tyler Renelle
5cc4bf8aca Merge pull request #3966 from Alys/questLeaderAndNotifications
mark Quest Owner in quest participants box on party page
2014-09-02 15:50:58 -06:00
Tyler Renelle
772ea500a3 feat(auth): allow logging in with either username or email address 2014-09-02 12:23:29 -06:00
Tyler Renelle
2fc0f24c19 bailey(backgrounds): september 2014 backgrounds 2014-09-02 12:03:03 -06:00
Alice Harris
fa96717175 mark quest owner in quest participants box on party page (in invitation stage and after quest started) 2014-09-02 17:33:26 +10:00
Alice Harris
679a120053 add Enable Class System button to User -> Stats ("Stats and Achievements") page when user has opted out 2014-09-02 14:56:14 +10:00
Tyler Renelle
72c6fd720a bailey(mystery): september mystery reminder 2014-09-01 12:25:01 -06:00
Tyler Renelle
ff0b8ad88b bailey(subscriptions): last day reminder @lemoness 2014-08-31 12:09:30 -06:00
Negue
f7d0c91471 fix tooltip .. again 2014-08-29 20:51:12 +02:00
Tyler Renelle
f981223153 fix(sortable): revert back to jqueryUI, fixes #3946 2014-08-28 16:32:05 -06:00
Nathaniel E Skiba
b9321807ca Completed tasks no longer display past dates in red 2014-08-28 11:21:58 -04:00
Tyler Renelle
76206e32d6 Merge pull request #3930 from ebiagogo/3477
Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the n...
2014-08-26 13:48:26 -06:00
Michael Looby
fd1cb82716 Fix for issue #3477, 'No "Contact Us" at Bottom of the page. Added the new link and used the existing env.t('contactUs') string so all the translations are correct. Also added the link to layout.jade because that was stubbed out there in comments. Both links go to a new page with other links as described in the issue. 2014-08-26 14:59:54 -04:00
Alice Harris
581b921ae1 revert https://github.com/HabitRPG/habitrpg/pull/3920 because it causes level tooltip to hide Buffed and Rebirth tooltips 2014-08-26 15:49:59 +10:00
Tyler Renelle
592ffd9818 feat(registration): show some basic registration information on Settings
> Site (if facebook, then "Registered with Facebook". If local, then
username & email)
2014-08-25 18:01:57 -06:00
Tyler Renelle
2cc251149c feat(mystery): august mystery 2014-08-25 17:16:41 -06:00
Tyler Renelle
13f6c5fddd Merge pull request #3913 from negue/pushToTopTooltip
Tooltip: Push to top
2014-08-25 12:22:52 -06:00
Negue
0ddcea95f1 fix level tooltip 2014-08-25 19:04:03 +02:00
Negue
c74f983c03 Tooltip: Push to top 2014-08-25 00:35:22 +02:00
Tyler Renelle
ef548ec9ed Merge pull request #3588 from negue/feat_pushToTop
feat(todolist): Push To Top Button
2014-08-23 17:05:32 -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
Alice Harris
fdf8aa696e add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892 2014-08-21 06:27:01 +10:00
Tyler Renelle
50a34eb6c7 fix(tags): fix sortable tags by separating edit & !edit into diff
<ul>s (cc @Fandekasp)
2014-08-19 15:21:39 -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
3ca84d8ef1 Merge pull request #3139 from mapleoin/partygems
fix Guild Gems strings on the party tab
2014-08-19 12:55:11 -06:00
Tyler Renelle
faed77f186 bailey(mobile): 2014-08-18 19:58:47 -06:00
Tyler Renelle
ab9393b694 bailey(audio): add bailey for audio 2014-08-18 19:12:05 -06:00
Tyler Renelle
a88fde9862 feat(quests): parrot quest 2014-08-18 19:04:31 -06:00
Matteo Pagliazzi
6d251aeb91 feat(mobile): adapt boss box to mobile 2014-08-17 15:39:12 +02:00
Matteo Pagliazzi
4c8309c8cc fix(jade): fix warings 2014-08-17 13:32:09 +02:00
Matteo Pagliazzi
0837f2c39b fix(mobile): start adapting boss to mobile 2014-08-17 13:29:40 +02: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
Tyler Renelle
fb16458efd bailey(quests): lvl 15 ATOM drop 2014-08-12 16:18:26 -07:00
Adrien Lemaire
e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +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
dcbd460331 fix audio menu style 2014-08-09 16:58:49 +09:00
Adrien Lemaire
2cf8083693 improving music menu 2014-08-08 23:37:04 +09:00