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

2524 commits

Author SHA1 Message Date
Tyler Renelle
bb78b121da revert part of a053486, angular is madeningly inconsistent with this bug 2015-01-18 16:38:31 -07:00
Blade Barringer
7c10d27c04 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-18 15:56:11 -06:00
Blade Barringer
137ff71bc8 Added one way binding for email 2015-01-18 15:55:39 -06:00
Blade Barringer
e0a081b0ff Adjusted spacing and line breaks 2015-01-18 15:55:39 -06:00
Blade Barringer
cdad6e36da Adjusted some spacing and line breaks 2015-01-18 15:55:39 -06:00
Blade Barringer
4a5fe1867d Removed target="_blank" attribute from mailto link 2015-01-18 15:55:39 -06:00
scribblypanda
b3c9371d9f changed links to relative, corrected mailto link 2015-01-18 15:55:39 -06:00
scribblypanda
1c151f57c2 applied .muted to text so less cluttered looking 2015-01-18 15:55:39 -06:00
scribblypanda
b978852e11 added description of login name and link to page to edit display name 2015-01-18 15:55:39 -06:00
scribblypanda
ae90889dec added description of display name and link to page to edit login name 2015-01-18 15:55:39 -06:00
scribblypanda
18317f3346 fixed emailChange message, displays properly on localhost 2015-01-18 15:55:39 -06:00
scribblypanda
5a4ebda187 plain text to translatable strings 2015-01-18 15:55:39 -06:00
scribblypanda
c4113994e6 plain text to translatable strings 2015-01-18 15:55:38 -06:00
scribblypanda
330a9191a5 added new translatable string emailChange 2015-01-18 15:55:38 -06:00
scribblypanda
7c990ba109 changed Username to Login Name 2015-01-18 15:55:38 -06:00
Tyler Renelle
a053486fcd fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x 
bug. Also, anon wasn't able to view avatar shares!
 2015-01-18 14:51:40 -07:00
Tyler Renelle
2306b7c572 refactor(services): move to a single "habitrpg" module for services / 
directives / filters
 2015-01-17 18:43:37 -07:00
Sabe Jones
0b63e48c6e feat(quest): T-Rex pet 
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
 2015-01-15 15:38:51 -06:00
Sabe Jones
17ab1d660f chore(news): Stress Strike 1 Bailey 2015-01-13 13:29:10 -06:00
K. Belardinelli
22446a5ddb apply active class to special spells too 2015-01-10 11:06:39 -05:00
K Bell
d6dc2119cb add active class to spell item when it is selected 2015-01-10 10:36:00 -05:00
Blade Barringer
dc37442691 Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat 
Cmd/Ctrl + enter for chat and pms.
 2015-01-09 13:51:21 -06:00
Blade Barringer
64bb55e57b Reworked mixin file to retain gembutton history 2015-01-09 13:48:19 -06:00
Sabe Jones
cda16d5bc0 Merge pull request #4494 from SabreCat/stressbeast 
World boss for Winter Wonderland 2015
 2015-01-08 15:51:04 -06:00
Sabe Jones
41d073d181 fix(world-boss): Achievement badge 2015-01-08 15:47:48 -06:00
Sabe Jones
ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Tyler Renelle
cba232ef83 feat(presskit): add presskit page cc @lemoness 2015-01-08 13:41:23 -07:00
Matteo Pagliazzi
193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01:00
Blade Barringer
8ba0bb5d88 Changed spellObj to skill to be more semantic, and match the text in the 
rewards column
 2015-01-06 15:31:07 -06:00
Blade Barringer
870d9d7e86 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 15:04:47 -06:00
Blade Barringer
9da000ec4e Changed spell to spellObj in ng-repeat for class spells in order to 
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
 2015-01-06 15:03:54 -06:00
Blade Barringer
96b48324f8 Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks 
Fix for truncated dates on task due date. Closes #4482
 2015-01-06 14:29:16 -06:00
Blade Barringer
53c466ee7f Rounds tooltip for exp, health and mana to 2 decimal places 2015-01-06 13:52:22 -06:00
Blade Barringer
e416b03a59 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 09:39:04 -06:00
Blade Barringer
dd4e8d74c7 Fix for truncated dates on task due date. Closes #4482 2015-01-06 09:37:29 -06:00
Sabe Jones
8feffa5431 fix(news): Improve accuracy 2015-01-05 17:31:19 -06:00
Blade Barringer
f0c65be629 Fix to allow for challenges with the same award name. Closes #4479 2015-01-05 17:15:33 -06:00
Sabe Jones
8529c0f1db chore(news): Bailey 2015-01-05 16:48:58 -06:00
negue
aa6b1e3f81 add remove-watch to markdown-directive 2015-01-05 22:19:05 +01:00
negue
ad8add58d7 Merge pull request #4461 from negue/markdownText 
change markdown ngModel to text attribute
 2015-01-05 22:12:06 +01:00
Blade Barringer
cc7b2f70ba Hide buy gems button if over level 100 in rebirth modal 2015-01-05 13:41:58 -06:00
Blade Barringer
10451d3296 Removed gem cost if lv 100 or higher 2015-01-05 13:38:00 -06:00
Blade Barringer
f3676fcbf4 Added spaces between quantity and gem symbol 2015-01-05 13:33:43 -06:00
Blade Barringer
a72faa5d92 Added ctrl+cmd enter command to pms 2015-01-05 13:21:23 -06:00
Blade Barringer
5deb72c457 Added ability to send chat via cmd/ctrl + enter 2015-01-05 13:17:23 -06:00
Jackson Popkin
b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Sabe Jones
09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Blade Barringer
914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Sabe Jones
3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00
Blade Barringer
fc4e43bef8 Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin 
Conflicts:
	views/shared/gems.jade
	views/shared/modals/buy-gems.jade
 2015-01-01 23:18:28 -06:00