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

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alice Harris 3c06987a0a add Community Guidelines document and its images; add jade modal for displaying it 2014-08-24 18:15:18 +10:00
Alice Harris 678b439cc2 add fontello and change staff icon from tower to crown 2014-08-24 18:15:18 +10:00
Alice Harris e3b803e581 add glyphicons to admin names, refactor code to reduce duplication of contrib.level style assignments, sort moderator name list sensibly 2014-08-24 18:15:18 +10:00
Alice Harris 94a8ebbb02 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-08-24 18:15:18 +10:00
Alice Harris 9e0213b0b8 finish applying new colours for tier 9 (staff) and tier 8 (mods) 2014-08-24 18:15:17 +10: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
Tyler Renelle fb16458efd bailey(quests): lvl 15 ATOM drop 2014-08-12 16:18:26 -07:00
Alice Harris 2ad5d4b00b Merge pull request #3870 from Alys/dropNotifications 
adds drop notifications for eggs, food - partial? fix for https://github.com/HabitRPG/habitrpg/issues/3787
 2014-08-12 07:29:41 +10: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 46809f1f3e remove migration script 2014-08-09 20:01:24 +09:00