Blade Barringer
|
71c65c7a73
|
change coupon route in angular router to promo
|
2015-05-08 21:24:57 -05:00 |
|
Blade Barringer
|
8569f7b749
|
Merge branch 'joyclark-autocomplete-click-behavior' into develop
|
2015-05-08 08:45:06 -05:00 |
|
negue
|
e628dba5e8
|
Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
|
2015-05-07 22:21:42 +02:00 |
|
Matteo Pagliazzi
|
7d08358791
|
fix(registration) do not re-enable registrations if the first one is successfull
|
2015-05-06 16:23:15 +02:00 |
|
Matteo Pagliazzi
|
8066589268
|
disable registration while request in progress
|
2015-05-06 15:43:30 +02:00 |
|
Tyler Renelle
|
a090fed10b
|
feat(analytics): "motivate yourself" 3 variants @lemoness
|
2015-05-04 15:31:00 -04: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 |
|
Alys
|
7c36e49243
|
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
Dated tasks correct impl
|
2015-04-22 16:56:03 +10: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 |
|
Kevin Gisi
|
02838214c7
|
Reimplement (broken) task ordering
|
2015-04-13 07:47:56 -04:00 |
|
Alys
|
8af1f0538b
|
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
|
2015-04-13 20:16:24 +10:00 |
|
Alys
|
0083c3f881
|
Revert "Put list back into removeTask fn, update removal logic within challegeCtrl"
|
2015-04-13 19:34:59 +10:00 |
|
Blade Barringer
|
8642366f15
|
scroll to top and load hero; add tests for new behavior.
|
2015-04-10 23:51:34 -05:00 |
|
Blade Barringer
|
24ef3aa012
|
Made uuid in hall of heroes populate the input box
|
2015-04-09 21:57:06 -05:00 |
|
Blade Barringer
|
ddc91e0227
|
Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order
|
2015-04-09 17:32:09 -05:00 |
|
Alys
|
882827c105
|
Merge pull request #5000 from gisikw/sort-dated-todos
Put list back into removeTask fn, update removal logic within challegeCtrl
|
2015-04-09 16:37:57 +10:00 |
|
Kevin Gisi
|
860ca9fc16
|
Put list back into removeTask function, update removal logic within challengeCtrl
|
2015-04-08 23:03:45 -04:00 |
|
Blade Barringer
|
cdd0b29924
|
Merge branch 'develop' into gisikw-sort-dated-todos
|
2015-04-08 20:47:38 -05:00 |
|
Tyler Renelle
|
8a33de219c
|
feat(analytics): updated cron experiment ID
|
2015-04-08 17:37:40 -06:00 |
|
Kevin Gisi
|
9bb2f46264
|
Modify removeTask to accept a task object. Update task view to reflect new method signature.
|
2015-04-07 22:38:20 -04:00 |
|
TheHollidayInn
|
9619c46df2
|
Removed extra console.log
|
2015-04-07 18:49:25 -05:00 |
|
TheHollidayInn
|
09761c5c53
|
Corrected ordering that tasks appear in when user enters multiple tasks
|
2015-04-07 14:51:26 -05:00 |
|
Kevin Gisi
|
da81241ebe
|
Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814
|
2015-04-06 02:18:29 -04:00 |
|
Kevin Gisi
|
6fb95ec27b
|
Unset .cid for challenge on challenge delete
|
2015-04-06 02:18:29 -04:00 |
|
Kevin Gisi
|
3e653c9282
|
Reimplemented single challenge view code from #3319
|
2015-04-06 02:18:29 -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 |
|
Alys
|
efb4773c27
|
Merge pull request #4958 from TheHollidayInn/groups-clear-notifs-fetch-messages
Marked group messages as seen when user syncs new messages
|
2015-04-05 20:19:51 +10:00 |
|
Alys
|
baf38acc07
|
Merge pull request #4871 from TheHollidayInn/default-group-based-on-filter
Made default group for a challenge the selected group filter if there is only one filter selected
|
2015-04-04 17:01:35 +10:00 |
|
Tyler Renelle
|
7336d5bc23
|
fix(auth): hacky fix to get around tabset hiding the surrounding
authctrl scope (due to isolate scope)
|
2015-04-03 15:48:32 -06:00 |
|
Alys
|
ab6d8d0821
|
Merge pull request #4950 from gisikw/force-latest-bailey
Ensure Bailey always displays the most recent message.
|
2015-04-04 01:29:32 +10:00 |
|
Alys
|
5f3e57274d
|
Merge pull request #4938 from ExperimentMonty/clear-after-add-task
New tag field correctly clears when new tag added.
|
2015-04-04 01:16:21 +10:00 |
|
Alys
|
f432bc1f17
|
Merge pull request #4919 from TheHollidayInn/spells-level-with-exp
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
|
2015-04-04 00:29:41 +10:00 |
|
TheHollidayInn
|
0e2867cce1
|
Marked group messages as seen when user syncs new messages
|
2015-04-02 10:58:24 -05:00 |
|
John Montgomery
|
5163ee466b
|
Fixes more bad git-fu. New tag creation works now.
|
2015-03-31 23:23:24 -04:00 |
|