56af84bfdf
Merge pull request #4146 from ebiagogo/3477
...
Issue #3477 (again) - Fixed admin email address display text from admin@gmail.com
2014-10-15 19:08:20 +02:00
fb68f70adf
feat(halloween): updated bailey @lemoness
2014-10-14 20:30:05 -06:00
3f92fb4b64
Fixed admin email address display text from admin@gmail.com to admin@habitrpg.com.
2014-10-14 22:17:20 -04:00
3b769a1407
Merge branch 'spider' into develop
2014-10-14 16:54:56 -06:00
32cab260a2
bailey(spider)
2014-10-12 20:04:18 -06:00
39ab41549a
feat(quests): spider quest
2014-10-12 19:29:51 -06:00
56e2ec1bc4
Merge pull request #4140 from gjoyner/checklists
...
Adding checklist item drag and drop feature
2014-10-12 18:27:06 -06:00
67b341760e
stop spell casting on rewards
2014-10-12 22:01:12 +02:00
36bf09d984
Adding checklist item drag and drop feature
2014-10-12 01:48:51 -07:00
d7c8d48078
Merge pull request #4129 from Alys/Gaelan-hide_completed_dailies
...
Add ability to hide completed dailies (Gaelan's changes with fixes for merge conflicts etc)
2014-10-10 22:07:30 +10:00
1fbf3a7eba
fix(static): fix static/api page, fixes #3636
2014-10-09 13:28:37 -06:00
264b16f76b
move Dailies "All" tab to the first position, to make it the default (I hope)
2014-10-09 21:08:46 +10:00
43d2d1355e
renamed Daily tabs to save space, removed To-Dos from new code because compled/all tabs were blank, decoupled To-Do code from Dailes code to allow future changes (e.g., "Dated" tab for To-Dos)
2014-10-09 20:04:03 +10:00
f0c3b3db4c
add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..."
2014-10-09 15:56:06 +10:00
c4a2e720fd
Add ability to hide completed dailies.
...
While I was at it, I also did a bit of refactoring in general around the hiding
of completed todos/dailies.
2014-10-09 14:49:04 +10:00
96b41448cd
Merge pull request #4112 from betaveros/unallocated-notification
...
Notification for Unallocated Attribute Points (fixes #4109 )
2014-10-08 19:53:50 +02:00
f4977cd1ed
Merge pull request #4122 from jklein/develop
...
Putting the boot icon on the same line as the member name in group members
2014-10-08 15:04:21 +02:00
95e71c68de
fix(jade): update api page to new doctype
2014-10-07 21:30:01 +02:00
80042a7a64
update jade
2014-10-07 21:30:00 +02:00
41de8014a0
Putting the boot icon on the same line as the member name in group members
2014-10-07 14:10:15 -04:00
0a630d7d9b
feat(halloween): jackolantern pet
2014-10-06 16:14:48 -06:00
9ecbe9d48f
Add unallocated attribute points notification
...
* Uses i18n "haveUnallocated" string, to come in another commit
2014-10-04 19:57:30 +08:00
74be4b211b
DRY-refactor notification display conditions
...
* Condense the different notification icons into one span with a
dynamically selected ng-class.
* Move logic for determining which notification icon to show and whether
there are no notifications into AuthCtrl.
* Refactor out the two similar sequences of logic conditions into a
helper function.
2014-10-04 17:56:56 +08:00
8e85581679
fix(spookDust): rename to spooky sparkles
2014-10-03 13:24:55 -06:00
81c98f7630
bailey(): spookDust, october backgrounds, memleak
2014-10-02 23:18:13 -06:00
0841cafd1f
feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP
2014-10-02 23:18:13 -06:00
b1a34a25a8
- add popoverHtml to enable Markdown in Popovers
...
- add markdown filter to get Task Notes as Markdown
2014-10-01 20:30:13 +02:00
ab3c238d11
fix(avatar): put missing ng-click=buy-set back in
2014-09-30 22:06:05 -06:00
5c56b0b7c9
bailey(halloween):
2014-09-30 21:53:34 -06:00
3605b51748
feat(halloween): refactoring skin & hair to use the same mixins, add new
...
halloween seasonal set
2014-09-30 21:25:06 -06:00
ee325ce27f
Merge pull request #4093 from deilann/release_pets
...
feat(pets): release pets
2014-10-01 06:35:36 +10:00
8427c53d90
release pets feature
2014-09-29 13:35:38 -07:00
351e220b83
feat(mystery): 201409
2014-09-24 23:15:46 -06:00
73f7f6605e
remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060
2014-09-22 20:23:37 +10:00
f38db7b964
feat(fall): bailey + free candy script
2014-09-20 14:13:07 -06:00
c501652194
- add popoverHtml to enable Markdown in Popovers
...
- add markdown filter to get Task Notes as Markdown
2014-09-20 12:13:36 +02:00
b3c8acef10
fix guild list
2014-09-18 19:47:30 +02:00
7e53eaf1ae
Revert "Revert "ngRepeat with track by""
...
This reverts commit c90c8f9a5f
2014-09-18 18:37:02 +02:00
c32cd57c92
bailey: Rooster Pets, Party Sorting, And Back-To-School Challenge
2014-09-16 16:13:29 -06:00
94e1d48588
feat(quests): add rooster rampage quest
2014-09-16 16:08:35 -06:00
6e33c237d3
Merge pull request #4022 from Alys/partyAvatarSortOrder
...
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
2014-09-16 14:15:01 +10:00
dc359e7f75
fix(pushTo): only pushToBottom on todos
2014-09-12 14:44:03 -06:00
78624c0bc7
bailey: new official challenge, help menu, MD in checklists
2014-09-12 14:13:06 -06:00
b5ee56b079
Merge pull request #4007 from Alys/pushToBottom-sortOrder-Sep03
...
add support for pushTaskToBottom to help with To-Do sort order bug
2014-09-12 14:05:52 +10:00
e6a29f80fa
Merge pull request #4002 from Alys/questAbortFix
...
add Cancel button for quests, allow party to cancel/abort if quest owner missing, add Debug tools for quest testing
2014-09-12 14:01:09 +10:00
5afb258aa9
add sort by name and background for party avatars in header, remove sort option from guilds pages
2014-09-12 09:47:02 +10:00
d9661cf089
hide Plain Egg mounts and remove them from the totalMounts count
2014-09-11 17:59:37 +10:00
29d1cf460c
bailey()
2014-09-09 23:10:05 -06:00
dc65bd7f45
comment out the button for allowing manual pushToBottom
2014-09-09 17:13:19 +10:00
6cc1d1146e
refactor User.user.ops.sortTask into $scope.pushTask
2014-09-09 17:04:13 +10:00
Matteo Pagliazzi