Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,743 Commits 64 Branches 1,256 Tags
dc034e4ab5e0c694de7f8a2ff6447fb6c4eec2bb
Commit Graph

5743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathaniel E Skiba b9321807ca Completed tasks no longer display past dates in red 2014-08-28 11:21:58 -04:00
Tyler Renelle 3a4e9b135f chore(packages): upgrade newrelic 2014-08-27 19:10:04 -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 a98b49a461 Merge pull request #3884 from Alys/reportCountOwnedGear 
count how many users own specified gear with mongodb JavaScript
 2014-08-26 14:11:26 -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
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 34aec9ea82 Merge branch 'develop' of https://github.com/ebiagogo/habitrpg into develop 2014-08-26 15:35:45 -04:00
Michael Looby 1fd27b0302 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 15:33:36 -04: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
Michael Looby 6d1afe53c8 Merge branch 'develop' of https://github.com/ebiagogo/habitrpg into develop 2014-08-26 15:10:49 -04:00
Michael Looby 5f8a76e579 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 15:10:33 -04:00
Michael Looby 77a06655b6 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:10:32 -04:00
Michael Looby 121d9f822d Merge branch '3477' into develop 2014-08-26 15:09:16 -04: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
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
Alice Harris 1beda6987a change order of staff/moderator names at top of Tavern chat to staff, npc, moderator 2014-08-26 20:10:12 +10:00
Alice Harris 040352f434 add intro image and Bailey as a moderator to Community Guidelines 2014-08-26 19:38:51 +10:00
Alice Harris 44f6a9491a add Intro image by Luciferian to Community Guidelines 2014-08-26 17:56:02 +10:00
Alice Harris 840696336b Merge pull request #3922 from Alys/levelHoverFix 
move Level tooltip back to Level element to avoid Buffed/Rebirth tooltip glitches
 2014-08-26 17:09:44 +10: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
Michael Looby 5655bd59bd 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 00:27:42 -04: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 0b9c5271bb feat(newStuff): show newStuff modal on page load if present 2014-08-25 17:49:53 -06:00
Tyler Renelle 2cc251149c feat(mystery): august mystery 2014-08-25 17:16:41 -06:00
Tyler Renelle 8d0611e888 Merge pull request #3919 from negue/getBuyableGear 
API: get a list of buyable gear
 2014-08-25 16:55:31 -06:00
Tyler Renelle 37be3032d8 Merge pull request #3915 from Alys/bowerInteractiveOff 
allow bower install to run without asking for permission to collect stats
 2014-08-25 12:24:18 -06:00
Tyler Renelle 13f6c5fddd Merge pull request #3913 from negue/pushToTopTooltip 
Tooltip: Push to top
 2014-08-25 12:22:52 -06:00
Tyler Renelle 6af2eb2fc7 Merge pull request #3920 from negue/fixLevelTooltip 
fix level tooltip
 2014-08-25 12:19:34 -06:00
Negue 0ddcea95f1 fix level tooltip 2014-08-25 19:04:03 +02:00
Negue 8fa565e9a0 get a list of buyable gear 2014-08-25 18:23:04 +02:00
Alice Harris 900bddb5bc move community-guidelines styles from static.style to community-guidelines.jade (new extraHead block in layout.jade); improve clearing of floats for pulled images 2014-08-25 17:29:51 +10:00
Alice Harris a2b0612212 allow bower install to run without asking for permission to collect stats 2014-08-25 12:32:15 +10:00
Alice Harris a8ef7923b7 adjust community guidelines modal for new static location and comment it out because not currently needed 2014-08-25 11:54:57 +10:00
Alice Harris 087d8e0804 use localisation strings for Wiki Administrators Emeritus and month names 2014-08-25 11:44:35 +10:00
Alice Harris e54ab0a11a remove test code that made the avatar names always visible in the header 2014-08-25 11:38:53 +10:00
Negue c74f983c03 Tooltip: Push to top 2014-08-25 00:35:22 +02:00
Alice Harris 5cc587b08f add comment to explain the invisible username label (it confused the heck out of me until I realised) 2014-08-24 18:54:01 +10:00
Alice Harris 815c013282 do proper fix for problem in chat of usernames hiding first part of message 2014-08-24 18:45:46 +10:00
Alice Harris d102a64bfc Revert "fix problem in chat of usernames hiding first part of message" 
This reverts commit 910e4ac0f9e9886a8d3439e197eae3b5c30848ad.
 2014-08-24 18:15:20 +10:00
Alice Harris 3f89b272a4 adjust layout of images in Community Guidelines 
Alys TODO: replace paddedImage style and in-page clear:both style attributes  with styles that already exist elsewhere
 2014-08-24 18:15:20 +10:00
Alice Harris 0e801e47e4 fix community guidelines title tag 2014-08-24 18:15:20 +10:00
Alice Harris 1b1f4f0fa9 complete the first draft of the Community Guidelines static page, with images renamed 2014-08-24 18:15:20 +10:00
Alice Harris 654ad71b17 move Community Guidelines from an included html page in a modal to a static page with no modal 2014-08-24 18:15:20 +10:00
Alice Harris e8aab2daf1 fix problem in chat of usernames hiding first part of message 2014-08-24 18:15:19 +10:00
Alice Harris bfc446c41e remove admin checkbox from Hall - not needed now that level/tier 8 and 9 automatically turn on hero.contributor.admin 2014-08-24 18:15:19 +10:00
Alice Harris a745673961 automatically assign admin:true when contributor level/tier is greater than 7, and assign admin:false when less than 8 2014-08-24 18:15:19 +10:00
Alice Harris 8888ebf55a remove unnecessary style; fix spacing in tavern message 2014-08-24 18:15:19 +10:00
Alice Harris a9fd364868 delete unnecessary views/static/community-guidelines.jade 2014-08-24 18:15:19 +10:00