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
10080 commits 3 branches 0 tags 1.6 GiB
Commit graph

10080 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Gisi
be420a67a0 Remove apdex check from middleware until NR is back 2015-07-12 13:39:16 -04:00
Blade Barringer
add35bc17c Correct names of sprites 2015-07-12 12:21:12 -05:00
Blade Barringer
6ac049cc71 Allow animal ears to be added to costume or equipped gear 2015-07-12 09:23:03 -05:00
Blade Barringer
d09b24e1a5 Add sprites to website 2015-07-12 08:24:03 -05:00
Alys
92bfc66c67 fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear 2015-07-12 18:18:31 +10:00
Alys
18db504d2a allow Trivial priority (difficulty) to cause a tiny amount of damage from a boss 2015-07-12 11:05:01 +10:00
Blade Barringer
87dddb178f Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop 2015-07-11 16:53:09 -05:00
Blade Barringer
18ebbdac67 Remove extra class 2015-07-11 16:52:55 -05:00
Blade Barringer
c9ac32231d Remove inventory again 2015-07-11 16:37:26 -05:00
Blade Barringer
4a9ea83d6b Added whale quest back in, refactor 2015-07-11 16:35:16 -05:00
Blade Barringer
4acc0c03a8 Add in changes to equipment and seasonalshop 2015-07-11 16:16:29 -05:00
Blade Barringer
b71f68ef32 Merge branch 'develop' into equipment-refactor-merge-into-develop 2015-07-11 15:55:53 -05:00
Blade Barringer
74dee2727e Remove out of date todo 2015-07-11 15:54:09 -05:00
Blade Barringer
dccc10aa4d Refactor 2015-07-11 15:05:58 -05:00
Blade Barringer
ba13f2d9aa Add locale strings 2015-07-11 15:05:32 -05:00
Blade Barringer
eeae12b002 Refactore inventory pages 2015-07-11 13:50:30 -05:00
Blade Barringer
066206f41c Refactored inventory into separate files 2015-07-11 13:13:00 -05:00
Blade Barringer
c33a22ceb3 Put locale key creation into private function 2015-07-11 12:07:20 -05:00
Blade Barringer
94cd0bb852 Use user variable 2015-07-11 11:18:19 -05:00
Blade Barringer
d2e61bf5ef Change string to str 2015-07-11 11:15:04 -05:00
Blade Barringer
cb4b2e43bf Change variable name to itemList 2015-07-11 11:14:50 -05:00
Alys
ef496525a1 change white "Report" button to red "Report Violation" button in chat message flag modal 2015-07-11 21:23:39 +10:00
Joe Gallo
aabc50e992 surround tables in table-responsive class 2015-07-11 01:19:47 -04:00
Blade Barringer
305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth 
maxHealth refactor
 2015-07-11 00:18:15 -05:00
Arbixal
48b520509c fixes https://github.com/HabitRPG/habitrpg/issues/5555 2015-07-11 00:15:55 -05:00
Blade Barringer
c941511d11 Merge branch 'barbourkd-develop' into develop 2015-07-11 00:11:23 -05:00
Blade Barringer
50a924e470 Add space 2015-07-11 00:11:02 -05:00
Blade Barringer
09d85f39fc Merge pull request #5586 from GitHubSphinx/Sphinx-entry2 
Introducing a class for buttons allowing wrapping
 2015-07-11 00:07:26 -05:00
Blade Barringer
ddf2489664 Merge pull request #5581 from barbourkd/bugfix/5552 
Show Extra Notes icon regardless of task ownership.
 2015-07-11 00:05:04 -05:00
Blade Barringer
2722651cc8 Merge branch 'GitHubSphinx-Sphinx-entry3' into develop 2015-07-10 23:47:42 -05:00
Blade Barringer
3644d43f0a Remove unnecessary duplication 2015-07-10 23:47:23 -05:00
Blade Barringer
ab1870c1aa Merge branch 'TheHollidayInn-groups-remove-message-when-kick' into develop 2015-07-10 23:24:20 -05:00
Blade Barringer
cdcc085530 Adjust test 2015-07-10 23:21:23 -05:00
TheHollidayInn
acb82f99ce Remove user's group msg notification when they are kicked from the group 2015-07-10 22:39:17 -05:00
GihHubSphinx
cc00bd17b3 Don't show unneeded spaces between buttons in chat 
Don't show spaces in front of a button in a chat message if button
itself is not shown
 2015-07-10 20:47:24 +05:00
Joe Gallo
9367ff80b6 Use bootstrap table-responsive class instead of inline css. 2015-07-10 11:23:33 -04:00
Matteo Pagliazzi
5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Joe Gallo
b708095472 make sure hall of heroes table contents fit as table is resized 2015-07-10 00:23:07 -04:00
GihHubSphinx
00f7af7807 Introducing a class for buttons allowing wrapping 
New .btn-wrap class for buttons with long text allowing wrapping
 2015-07-10 02:33:09 +05:00
Sabe Jones
44bcb1c233 Merge pull request #5584 from HabitRPG/sabrecat/derby-day 
Derby Day
 2015-07-09 12:32:40 -07:00
Sabe Jones
d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Sabe Jones
353dcff908 fix(Market): Sell whale eggs 2015-07-09 13:27:16 -05:00
Sabe Jones
6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -05:00
Kevin Barbour
5a57895077 Show Extra Notes icon regardless of task ownership. 
fixes #5552
 2015-07-08 20:48:42 -04:00
Kevin Barbour
d6aef8ee24 Prevent "Resting in the Inn" message when viewing challenges. 
fixes #5559
 2015-07-08 20:22:23 -04:00
Sabe Jones
c0d35dc472 WIP(quests): Quests page cont'd 
Test fixes and addition of function for buying Quests with Gold
 2015-07-08 17:43:08 -05:00
Sabe Jones
78d4989544 WIP(event): Summer Splash cont'd 
Splits Quests out to a new page. Refactors inventory Jade files and controllers to more manageable structures.
 2015-07-08 16:13:23 -05:00
Sabe Jones
46543f9072 feat(event): Derby Day mount 2015-07-08 16:07:37 -05:00
Blade Barringer
7dc64f8448 Update iOS link to point to new app in footer 2015-07-07 21:30:08 -05:00
Sabe Jones
3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00