sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5246 commits 3 branches 0 tags 1.6 GiB
Commit graph

935 commits

Author SHA1 Message Date
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
0f5ef3a1ea finish applying new colours for tier 9 (staff) and tier 8 (mods) 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
6960a2ddad Merge pull request #3924 from breiste/develop 
Fix Play-Button width on frontpage
 2014-08-26 14:02:35 -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
breiste
229bdf3625 Fix Play-Button width on frontpage 
The Play-Button is too small, at least in german translation.
 2014-08-26 12:18:38 +02:00
Tyler Renelle
0b9c5271bb feat(newStuff): show newStuff modal on page load if present 2014-08-25 17:49:53 -06:00
Tyler Renelle
494e7eeff4 Merge pull request #3907 from Alys/notifHiding 
allow notifications icon to go grey when all messages have been seen - fixes https://github.com/HabitRPG/habitrpg/issues/3270
 2014-08-23 16:09:56 -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
1ca981d90a allow notification icon to go grey by deleting seen message data instead of setting to false 2014-08-23 14:51:34 +10:00
lynnyliz
7e9e00a593 fixed an issue where hovering over the last item in a column would cause the column to lengthen if the item contained an Extra Notes bubble 2014-08-20 21:11:28 -04: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
b85caaf248 Merge pull request #2079 from fmarier/optimized_images 
Optimized images
 2014-08-19 12:50:13 -06:00
Matteo Pagliazzi
6db5b53c81 fix(groupsServices): allow for direct modification of data @lefnire it is necessary for mobile but does not break anything 2014-08-18 13:48:01 +02:00
Tyler Renelle
890db5bd6d Merge pull request #3858 from pizzeys/develop 
Fix gem text alignment on the menubar.
 2014-08-15 20:07:22 -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
e5bb299ad0 Make tags sortable with drag&drop 2014-08-10 23:00:27 +09: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
dcbd460331 fix audio menu style 2014-08-09 16:58:49 +09:00
Sam Pizzey
da6f7a4418 Fix gem text alignment on the menubar. 
I'm not much of a frontend guy so I'm not sure if there was some reason
for this one being different, but it throws the alignment off so I
assume it was a mistake.

Fixes #3855
 2014-08-08 18:00:12 +01: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
benmanley
a6d101202c fix(avatar.jade): change .notBackground to .noBackgroundImage 
avatar.jade was applying a class of .notBackground, but the css in
avatar.styl used .noBackgroundImage.

* Changed .notBackground to .noBackgroundImage in avatar.jade and
avatar.styl
* Consolidated css and added more comments
* Amended spacing as Stylus wasn’t compiling correctly
* Removed #profileStable and .pet css as couldn’t find reference to
them anywhere else.
* Commented out styles indicating who is party leader for now. Need a
solution that doesn’t involve background color.
 2014-08-04 22:45:10 +01:00
benmanley
1ba80bd5ea refactor(filter.styl): move clearfix to global modules 
Make clearfix css globally available as an @extend.
 2014-08-04 14:06:53 +01: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
Alice Harris
46dbb0b78a Merge pull request #3799 from Alys/avatarNameContribColour 
apply contributor tier color to avatar name - fixes https://github.com/HabitRPG/habitrpg/issues/3735
 2014-08-02 13:08:20 +10:00
Alice Harris
2c70c25028 Merge pull request #3792 from Alys/showMoreBackground 
show more avatar background (remove Lvl, hide avatar name)
 2014-08-02 13:06:07 +10:00
Jeremy Lee
26741773c9 split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users) 2014-08-02 10:46:16 +10:00
Collin Styles
0b01ff2201 Don't display chart if history is empty. 2014-07-31 14:56:52 -07:00
Tyler Renelle
e10c04c9bc feat(contribs): start for #3801, update to new badge colors 2014-07-31 12:10:24 -06:00
Alice Harris
a87b651caf apply contributor tier color to avatar name 2014-07-29 08:53:23 +10:00
Blade Barringer
d7351932aa Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop 2014-07-27 19:56:09 -05:00
Alice Harris
1e797a0b05 show more avatar background (remove Lvl, hide avatar name) 2014-07-27 08:41:33 +10:00
Tyler Renelle
a4ae9332bb feat(block-user): show "blocked" status in an alert, log the user out 2014-07-25 12:14:48 -06: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