 Blade Barringer
|
522181890e
|
Added additional check for chatChanged
|
2015-06-29 08:13:03 -05:00 |
|
|
Blade Barringer
|
b72b14fe6c
|
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
|
2015-06-28 21:07:32 -05:00 |
|
|
Sabe Jones
|
2ce1daffb8
|
feat(analytics): call service from app
|
2015-06-22 16:35:17 -05:00 |
|
|
Sabe Jones
|
56a461c513
|
Revert "feat(analytics): Analytics service"
This reverts commit 9a0e31db40.
|
2015-06-22 14:14:33 -05:00 |
|
|
Sabe Jones
|
9a0e31db40
|
feat(analytics): Analytics service
Inject Analytics service into controllers where needed. Call Analytics service instead of GA or Mixpanel for tracking within the app.
|
2015-06-22 11:21:02 -05:00 |
|
|
Blade Barringer
|
00c50f1212
|
Fixes #4816
|
2015-06-14 21:17:18 -05:00 |
|
|
Blade Barringer
|
bb73253e8e
|
Make party page sync the party automatically
|
2015-06-14 19:26:01 -05:00 |
|
|
Blade Barringer
|
14fe29dd4a
|
Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync
|
2015-06-14 16:33:38 -05:00 |
|
|
Blade Barringer
|
c1501db292
|
Refactor chat related things into own service
|
2015-05-30 12:08:32 -05:00 |
|
|
Sabe Jones
|
726a8f1acb
|
feat(analytics): Mixpanel implementation WIP
|
2015-05-29 16:22:35 -05:00 |
|
|
Blade Barringer
|
e3bc8805fe
|
Refactor quest functions and add tests
|
2015-05-29 09:13:36 -05:00 |
|
|
Blade Barringer
|
42b482cb7e
|
Make user sync after accepting or rejecting a quest
|
2015-05-28 08:18:08 -05:00 |
|
|
Blade Barringer
|
8569f7b749
|
Merge branch 'joyclark-autocomplete-click-behavior' into develop
|
2015-05-08 08:45:06 -05:00 |
|
|
Joy Clark
|
4450a5d7c3
|
Fixes #5094 Now show list based on whether or not a search query is defined. The autocomplete function from the directive is encapsulated so that it can be called and then the query can be set to null.
|
2015-05-03 18:14:28 +02:00 |
|
|
Blade Barringer
|
e4b21ac325
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
|
2015-04-29 17:19:24 -05:00 |
|
|
Blade Barringer
|
78249122f7
|
Ignore casing when searching for user name in autocomplete
|
2015-04-29 08:21:13 -05:00 |
|
|
Blade Barringer
|
6e35c45d5f
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into joyclark-autocomplete_unit_tests
|
2015-04-29 07:50:33 -05:00 |
|
|
Joy Clark
|
df1c349ea7
|
Fixing #5706 filtering system messages results in errors.
|
2015-04-27 23:01:15 +02:00 |
|
|
Negue
|
189423b0db
|
markdown preview - code "inherit white-space" / hide links for 'system'
|
2015-04-27 19:47:42 +02:00 |
|
|
Negue
|
75579a7c36
|
add previewMarkdown / click as popover-trigger / misc changes
|
2015-04-27 19:23:56 +02:00 |
|
|
Blade Barringer
|
a94aad7a22
|
Fix comment
|
2015-04-26 20:43:32 -05:00 |
|
|
Joy Clark
|
f214428411
|
Improved filter function as described in #5085 and added unit tests.
|
2015-04-26 17:50:53 +02:00 |
|
|
Joy Clark
|
0a2890d1eb
|
#1866 changed parameter name for function so that it is no longer "item"
|
2015-04-25 21:24:56 +02:00 |
|
|
Negue
|
78dd949f20
|
copy chat messages as todo
|
2015-04-25 18:30:11 +02:00 |
|
|
Joy Clark
|
94c5da32d6
|
a proposed solution to issue #1866 Redefined the filter function to match based on prefix
|
2015-04-25 16:23:57 +02:00 |
|
|
Kevin Gisi
|
65e42345f2
|
Ensure correct join/leave button for parties
|
2015-04-24 11:54:00 -04:00 |
|
|
Kevin Gisi
|
a05714405a
|
Inject RootCtrl into MemberModalCtrl to expose shared methods
|
2015-04-21 05:17:15 -04:00 |
|
|
Blade Barringer
|
1d95784dde
|
refactor isMemberOfGroup and tests
|
2015-04-16 07:58:35 -05:00 |
|
|
Blade Barringer
|
4853c0814d
|
Corrected function
|
2015-04-16 07:39:55 -05:00 |
|
|
Kevin Gisi
|
160982df33
|
Simplify group detection logic for guilds
|
2015-04-15 23:10:12 -04:00 |
|
|
Kevin Gisi
|
d455666650
|
Join/Leave buttons on guild detail page. Addresses #4427
|
2015-04-15 06:15:11 -04:00 |
|
|
Alys
|
7d579ea08a
|
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
Conflicts:
website/views/shared/modals/members.jade
|
2015-04-05 23:24:46 +10:00 |
|
|
TheHollidayInn
|
0e2867cce1
|
Marked group messages as seen when user syncs new messages
|
2015-04-02 10:58:24 -05:00 |
|
|
Daniel Hammond
|
cea97e4da8
|
Documenting the (Bootstrap recommended!) wrapper workaround for tooltips
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
|
2015-03-28 01:21:39 -04:00 |
|
|
Matteo Pagliazzi
|
9e540e86af
|
add email with optional message when kicking user from group
|
2015-03-18 19:12:53 +01:00 |
|
|
Matteo Pagliazzi
|
0722a17897
|
start working on kick from group email & message
|
2015-03-18 17:31:07 +01:00 |
|
|
Alice Harris
|
f82469eba7
|
remove trailing whitespace
|
2015-03-14 22:40:26 +10:00 |
|
|
Kathryn Norris
|
47a05338e5
|
Added confirmation before deleting messages and moved buttons to top of Inbox. (fixes #4848)
|
2015-03-13 04:11:35 -07:00 |
|
|
Blade Barringer
|
8ac9dc3ced
|
Merge branch 'develop' into common-convert
|
2015-02-10 16:27:46 -06:00 |
|
|
Blade Barringer
|
dca2f13dda
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
bower.json
public/manifest.json
src/controllers/auth.js
|
2015-02-05 11:20:40 -06:00 |
|
|
Blade Barringer
|
d2eafdd021
|
Started moving public folder stuff back to website
|
2015-02-03 14:02:34 -06:00 |
|