Matteo Pagliazzi
64b19ed090
Merge pull request #4101 from betaveros/betaveros/meter-text-nowrap
...
Make .meter-text nowrap to prevent truncation
2014-10-03 17:12:36 +02:00
Tyler Renelle
e666d2f837
fix(spookDust): user serverside method for spookdust as it's path-protected
2014-10-03 00:33:39 -06:00
Tyler Renelle
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
Tyler Renelle
e759dbe951
Merge pull request #4045 from Verabird/guildreject
...
fixing guild reject error (issue #2886 )-correcting syntax
2014-10-02 17:22:36 -06:00
Brian Chen
42c4096be7
Make .meter-text nowrap to prevent truncation
...
* Add white-space: nowrap to .meter-text to prevent the meter text from
being cut off when the meter is very short and its content is long
(mainly an issue with the experience bar, which can easily have a bar
graph symbol plus one four-digit number over another e.g. 1,234 /
5,678)
2014-10-02 19:47:48 +08:00
Negue
bf662ff119
fix rootCtrl.js ; forgot a comma while merging...
2014-10-01 20:53:29 +02:00
Negue
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
negue
a595880568
Merge pull request #4044 from negue/apiUrlService
...
Use ApiUrlService in all services
2014-10-01 19:58:26 +02:00
Alice Harris
ee325ce27f
Merge pull request #4093 from deilann/release_pets
...
feat(pets): release pets
2014-10-01 06:35:36 +10:00
deilann
8427c53d90
release pets feature
2014-09-29 13:35:38 -07:00
Tyler Renelle
efd17fe86b
GA demographics
2014-09-26 13:45:01 -06:00
Negue
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
Negue
71c9ea66f4
3rd and last! header scrolling fix, now the full scroll bar is "visible" for the mouse
2014-09-18 21:37:53 +02:00
Negue
e180f73a0e
apiUrlService inside services
2014-09-17 20:35:44 +02:00
Negue
8f468c27ff
use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js
2014-09-16 20:52:32 +02:00
Alice Harris
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
Vera Pavel
3b16206293
fixing guild reject error (issue #2886 )-correcting syntax
2014-09-15 21:35:27 -04:00
Negue
7a0883746c
Use ApiUrlService in all services
2014-09-15 21:31:39 +02:00
Matteo Pagliazzi
fca45a3c0b
feat(emails): add emails on signup, subscription begin and donation
2014-09-13 14:28:11 +02:00
Tyler Renelle
49f2718eec
Merge pull request #4006 from gasolin/mobile_task_view
...
add responsive mobile web task view #4005
2014-09-12 17:28:03 -06:00
Negue
34fe2a9d9e
change sticky-header height to 205px instead of auto - fixes #4023
2014-09-12 17:25:58 +02:00
Alice Harris
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
Alice Harris
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
Alice Harris
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
Alice Harris
d9661cf089
hide Plain Egg mounts and remove them from the totalMounts count
2014-09-11 17:59:37 +10:00
Negue
62361b6c3b
set sticky header height to auto - fix #3011
2014-09-09 20:10:08 +02:00
Alice Harris
6cc1d1146e
refactor User.user.ops.sortTask into $scope.pushTask
2014-09-09 17:04:13 +10:00
gasolin
d4701e60da
add responsive mobile web task view #4005
2014-09-09 11:14:38 +08:00
Tyler Renelle
f59bba598e
Merge pull request #4003 from Lamecarlate/develop
...
Update inventory.styl
2014-09-08 17:53:58 -06:00
Chaopale Lamecarlate
716fb9b111
Update inventory.styl
2014-09-08 23:10:27 +02:00
Alice Harris
b5ac0c635a
improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party
2014-09-09 06:00:23 +10:00
Alice Harris
801753b37a
add Cancel option to API for quests that have not been started (invitation stage)
2014-09-09 06:00:23 +10:00
Alice Harris
f520b8ae66
add extra Debug tools useful for quests
2014-09-09 06:00:23 +10:00
Tyler Renelle
7e91fa4524
Merge pull request #3987 from Alys/soundOff404-Sep05
...
prevent harmless but annoying 404 errors for sound files when sound is off
2014-09-05 16:08:14 -06:00
Alice Harris
c731753e33
add Help menu
2014-09-05 20:57:44 +10:00
Alice Harris
2350989dfb
prevent harmless but annoying 404 errors for sound files when sound is off
2014-09-05 18:45:52 +10:00
Alice Harris
28505c139f
allow newly created tag to have the same UUID on client and server - fixes https://github.com/HabitRPG/habitrpg/issues/2856
2014-09-03 06:16:46 +10:00
Tyler Renelle
f981223153
fix(sortable): revert back to jqueryUI, fixes #3946
2014-08-28 16:32:05 -06:00
Tyler Renelle
4ba860ea8c
fix(sortable): don't trigger sort when dragging in place, fixes #3926
2014-08-26 14:32:21 -06:00
Tyler Renelle
6960a2ddad
Merge pull request #3924 from breiste/develop
...
Fix Play-Button width on frontpage
2014-08-26 14:02:35 -06:00
Tyler Renelle
96532ed6bd
Merge pull request #3925 from ebiagogo/develop
...
Fixed bug #3007 where using wrong "old password" when changing password ...
2014-08-26 14:00:18 -06: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
Tyler Renelle
ef322443f9
refactor(tags): small cleanup
2014-08-26 10:24:43 -06:00
breiste
229bdf3625
Fix Play-Button width on frontpage
...
The Play-Button is too small, at least in german translation.
2014-08-26 12:18:38 +02:00
Tyler Renelle
0b9c5271bb
feat(newStuff): show newStuff modal on page load if present
2014-08-25 17:49:53 -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
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
88d27e2153
Merge branch 'Fandekasp-sortable_tags' into develop
...
Conflicts:
public/js/directives/directives.js
2014-08-19 15:00:36 -06:00