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
0083c3f881
Revert "Put list back into removeTask fn, update removal logic within challegeCtrl"
2015-04-13 19:34:59 +10:00
8642366f15
scroll to top and load hero; add tests for new behavior.
2015-04-10 23:51:34 -05:00
24ef3aa012
Made uuid in hall of heroes populate the input box
2015-04-09 21:57:06 -05:00
ddc91e0227
Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order
2015-04-09 17:32:09 -05:00
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
860ca9fc16
Put list back into removeTask function, update removal logic within challengeCtrl
2015-04-08 23:03:45 -04:00
cdd0b29924
Merge branch 'develop' into gisikw-sort-dated-todos
2015-04-08 20:47:38 -05:00
8a33de219c
feat(analytics): updated cron experiment ID
2015-04-08 17:37:40 -06:00
9bb2f46264
Modify removeTask to accept a task object. Update task view to reflect new method signature.
2015-04-07 22:38:20 -04:00
9619c46df2
Removed extra console.log
2015-04-07 18:49:25 -05:00
09761c5c53
Corrected ordering that tasks appear in when user enters multiple tasks
2015-04-07 14:51:26 -05:00
da81241ebe
Transition Challenge -> Edit to the Singleton challenge view, to address issues associated with #4814
2015-04-06 02:18:29 -04:00
6fb95ec27b
Unset .cid for challenge on challenge delete
2015-04-06 02:18:29 -04:00
3e653c9282
Reimplemented single challenge view code from #3319
2015-04-06 02:18:29 -04:00
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
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
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
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
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
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
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
0e2867cce1
Marked group messages as seen when user syncs new messages
2015-04-02 10:58:24 -05:00
5163ee466b
Fixes more bad git-fu. New tag creation works now.
2015-03-31 23:23:24 -04:00
79606736a1
Ensure Bailey always displays the most recent message.
...
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
static html file.
* Updated the new-stuff.jade modal template to use a $rootScope property.
* Added a special case to openModal for the newStuff template, by which it
fetches the flat file, marks it as trusted HTML, and sets it to the
$rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
e35c753bdc
Fixed errors caused by poor git-fu.
...
Forgot I was on a detached head, made a commit, and failed hard at
cherry-picking the commit back to the correct branch.
2015-03-31 08:55:16 -04:00
c22acb81a8
Updates new tag code and test spec for new tags.
2015-03-30 22:07:02 -04:00
edb50f7081
feat(analytics): a/b on tour (counter, finish button)
2015-03-30 16:57:17 -06:00
e0dae01dda
fix(analytics): remove a/b on play button, fixes #4947
2015-03-30 16:43:49 -06:00
f95f892491
Changed new tag code to be more angular-idiomatic.
2015-03-30 08:32:45 -04:00
99aad96688
New tag field correctly clears when new tag added.
2015-03-29 15:10:24 -04:00
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
1202c624f1
Revert "Added hide and error message when a user tries to create a challenge for..."
2015-03-27 20:11:12 +10:00
f16ef869a3
Merge pull request #4836 from TheHollidayInn/fix-max-value-0-challenges
...
Added hide and error message when a user tries to create a challenge for...
2015-03-27 19:21:51 +10:00
258da77586
Added sync on mage fireball spell
2015-03-26 00:18:18 -05:00
a7873a41a1
Added icons to Notification for the item that is dropped.
2015-03-24 16:28:24 -05:00
5de42b03c9
fix(analytics): remove testing code
2015-03-20 17:03:01 -06:00
fbcf8e9a6f
Merge pull request #4895 from SabreCat/spring2015
...
Spring Fling 2015
2015-03-20 17:29:02 -05:00
009b582f25
feat(analytics): add A/B testing on play button using GA's Experiments
...
API. Revert this after the experiment
2015-03-20 14:44:47 -06:00
ae25af7c02
fix(shop): Enable head accessories
2015-03-20 15:27:56 -05:00
f3f5669ab2
feat(spring): Fling
2015-03-20 14:56:00 -05:00
5198050cd2
Merge pull request #4863 from rdhammond/InstantPartySource
...
Instant party source
2015-03-20 06:46:38 +10:00
84a77695ea
feat(ads): remove ads completely
2015-03-19 11:39:17 -06:00
9e540e86af
add email with optional message when kicking user from group
2015-03-18 19:12:53 +01:00
0722a17897
start working on kick from group email & message
2015-03-18 17:31:07 +01:00
6e7aea991e
Made default group for a challenge the selected group filter if there is only one filter selected.
2015-03-17 09:34:12 -05:00
44259925e4
re-add the dequip option for removing backgrounds with proper bug fix (ref https://github.com/HabitRPG/habitrpg/commit/9199c6c7e2d0891eca2bc6a58532366501265c4b ); make whitespace consistent
2015-03-16 19:27:44 +10:00
5ac73aca9e
Adding a couple of watch statements should make the party order auto-update on changes.
2015-03-15 20:49:13 -04:00
9199c6c7e2
remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868
2015-03-15 07:44:36 +10:00
f82469eba7
remove trailing whitespace
2015-03-14 22:40:26 +10:00
Alys