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

5204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 a2b0612212 allow bower install to run without asking for permission to collect stats 2014-08-25 12:32:15 +10: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 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
Alice Harris f307f5593c add migration script to remove undefined guild notifications and false guild notifications 2014-08-23 12:19:41 +10:00
Tyler Renelle 73ebdf01af Merge pull request #3898 from lynnyliz/develop 
Columns were made longer by hovering over the last task in the list
 2014-08-21 11:04:29 -06: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 2f6e49f8bb Merge pull request #3897 from Alys/questImage 
add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892
 2014-08-20 18:08:06 -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 ba8cda2e51 Merge pull request #3425 from denis-sokolov/user-findtask-patch 
chore(user): tiny cleanup in findTask function
 2014-08-19 13:12:51 -06:00
Tyler Renelle 978d0e0528 Merge remote-tracking branch 'remotes/denis-sokolov/patch-1' into develop 
Conflicts:
	README.md
 2014-08-19 13:05:43 -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 b85caaf248 Merge pull request #2079 from fmarier/optimized_images 
Optimized images
 2014-08-19 12:50:13 -06:00
Tyler Renelle cac37d75bf Merge pull request #3846 from titilambert/develop 
Add docker file
 2014-08-19 12:48:08 -06:00
Matteo Pagliazzi 6340312695 fix(fbAuth): get user email @lefnire this should be all we need but not having the keys i can not test before going live 2014-08-19 04:41:04 +02: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 81b96b0f7e fix(i18n): add support for latin american spanish 2014-08-18 19:17:40 +02: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
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
Matteo Pagliazzi 15641b5f37 fix(i18n): add moment support for chinese 2014-08-16 20:16:44 +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