c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
2306b7c572
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:43:37 -07:00
f6885427a8
Corrected Beast Master and Mount Master count so it would be accurate.
2015-01-11 17:24:01 -06:00
edf66cbb59
feat(discount) google discount & use sub.key instead of sub.months
2014-12-30 20:05:07 -07:00
a8888a0a53
Added last logged in choice for sorting
2014-12-30 13:05:55 -06:00
b4975bb8a4
Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting
...
Conflicts:
public/js/controllers/headerCtrl.js
views/options/social/group.jade
2014-12-30 12:57:32 -06:00
695c463b40
Added confirmation dialog before deleting message
2014-12-26 21:04:22 -06:00
9406b3cf70
Removed unnecessary console.log
2014-12-18 22:36:52 -06:00
38cd0e8de1
Added method for letting an admin unhide a flagged message
2014-12-11 17:29:01 -06:00
ae6e0255c6
feat(flag-message): add server methods
2014-12-07 14:35:09 +01:00
5acde1e609
Added todo for paglias
2014-12-07 13:50:47 +01:00
7a7c13ff6d
Prevent modal from popping up if already reported
2014-12-07 13:50:47 +01:00
e9cffe6206
Error handling for if message already flagged
2014-12-07 13:50:46 +01:00
5a6c9fbf84
Added some logic for adding flags
2014-12-07 13:50:46 +01:00
c44c607ae7
Renamed flagChat to flagChatMessage
2014-12-07 13:50:46 +01:00
62d92db332
Added buttons to footer, cleaned up functions
2014-12-07 13:50:46 +01:00
6fcf1846b3
Renamed everything from flag to abuseFlag
2014-12-07 13:50:46 +01:00
5e1e1b2c13
Flag icon opens blank modal
2014-12-07 13:50:46 +01:00
d2e230db1f
fix(plans): various bug fixes
2014-12-03 18:34:26 -07:00
0fffd66588
feat(plans): time travelers tab, 1 trinket to buy 1 set
2014-12-03 14:17:08 -07:00
5b01fff700
feat(gifts): allow gifting subscriptions
2014-12-03 14:17:07 -07:00
e8dbd5ca1a
feat(gifts): allow gifting gems from paypal/stripe
2014-12-03 14:17:07 -07:00
7e9b92fcad
feat(gifts): allow gifting from balance
2014-12-03 14:17:07 -07:00
8794adde69
Updated function to go to correct options pane. Closes # 4319
2014-12-03 08:01:23 -06:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
e759dbe951
Merge pull request #4045 from Verabird/guildreject
...
fixing guild reject error (issue #2886 )-correcting syntax
2014-10-02 17:22:36 -06:00
a595880568
Merge pull request #4044 from negue/apiUrlService
...
Use ApiUrlService in all services
2014-10-01 19:58:26 +02:00
8f468c27ff
use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js
2014-09-16 20:52:32 +02: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
3b16206293
fixing guild reject error (issue #2886 )-correcting syntax
2014-09-15 21:35:27 -04: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
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
4af860ea24
allow partymember sorting to be ascending or descending
2014-08-05 00:31:22 +02:00
a5aedf850f
Add sorting by username and date joined for partymembers
2014-08-05 00:30:53 +02:00
80dbc1111e
fix(quests): when leaving group, if leader or quest.leader is leaving,
...
re-assign to most senior member. #3709
2014-07-11 16:29:42 -06:00
c180d899c1
perf(groups): bindonce on guild listings for better performance guild
...
page. This requires refreshing when making changes to guilds. Fixes #3663
2014-06-29 13:33:40 -06:00
314497271a
fix(i18n): group name
2014-05-06 20:04:10 +02:00
ce82be637d
feat(groups): add group chat notifications
2014-02-12 21:21:30 -07:00
ebd1df932e
fix(bs3): fix to MemberModalCtrl parameter
2014-02-10 13:48:34 -07:00
ffb42906e1
feat(event-tracking): start adding some client-side GA event-tracking
2014-02-10 11:33:40 -07:00
3447524d41
refactor(bs3): chat suggestions, revert
2014-02-09 00:44:39 +01:00
1e3042a4b6
refactor(bs3): maybe fix for chat suggestions
2014-02-08 20:23:50 +01:00
d6b3279e5c
refactor(bs3): misc fixes
2014-02-06 18:35:12 +01:00
e4bd817443
refactor(bs3): sync with develop
2014-02-06 17:36:33 +01:00
386d108c3c
Replace hard-coded strings for window.env.t on js files
2014-02-05 20:43:49 -02:00
cdc13d2ffb
refactor(bs3): misc
2014-02-03 19:24:37 +01:00
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
07593dc122
refactor(bs3): port quests modals, fix restore modal and various bugs
2014-02-02 16:43:58 +01:00
317a148760
refactor(bs3): port newStuff and member modals, misc fixes
2014-02-02 15:55:01 +01:00
Blade Barringer