Commit graph

66 commits

Author SHA1 Message Date
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
Kevin Gisi
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
John Montgomery
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
John Montgomery
c22acb81a8 Updates new tag code and test spec for new tags. 2015-03-30 22:07:02 -04:00
Tyler Renelle
edb50f7081 feat(analytics): a/b on tour (counter, finish button) 2015-03-30 16:57:17 -06:00
Tyler Renelle
e0dae01dda fix(analytics): remove a/b on play button, fixes #4947 2015-03-30 16:43:49 -06:00
John Montgomery
f95f892491 Changed new tag code to be more angular-idiomatic. 2015-03-30 08:32:45 -04:00
John Montgomery
99aad96688 New tag field correctly clears when new tag added. 2015-03-29 15:10:24 -04: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
Alys
1202c624f1 Revert "Added hide and error message when a user tries to create a challenge for..." 2015-03-27 20:11:12 +10:00
Alys
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
kholliday
258da77586 Added sync on mage fireball spell 2015-03-26 00:18:18 -05:00
kholliday
a7873a41a1 Added icons to Notification for the item that is dropped. 2015-03-24 16:28:24 -05:00
Tyler Renelle
5de42b03c9 fix(analytics): remove testing code 2015-03-20 17:03:01 -06:00
Sabe Jones
fbcf8e9a6f Merge pull request #4895 from SabreCat/spring2015
Spring Fling 2015
2015-03-20 17:29:02 -05:00
Tyler Renelle
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
Sabe Jones
ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones
f3f5669ab2 feat(spring): Fling 2015-03-20 14:56:00 -05:00
Alys
5198050cd2 Merge pull request #4863 from rdhammond/InstantPartySource
Instant party source
2015-03-20 06:46:38 +10:00
Tyler Renelle
84a77695ea feat(ads): remove ads completely 2015-03-19 11:39:17 -06: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
kholliday
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
Alice Harris
44259925e4 re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent 2015-03-16 19:27:44 +10:00
R. Daniel Hammond
5ac73aca9e Adding a couple of watch statements should make the party order auto-update on changes. 2015-03-15 20:49:13 -04:00
Alice Harris
9199c6c7e2 remove unequip background feature temporarily - fixes https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868 2015-03-15 07:44:36 +10:00
Alice Harris
f82469eba7 remove trailing whitespace 2015-03-14 22:40:26 +10:00
Alys
94f9cff279 Merge pull request #4850 from stillsnowedin/develop
Added confirmation before deleting messages and moved buttons to top of ...
2015-03-14 22:32:46 +10:00
Alys
59f64830b1 Merge pull request #4799 from TheHollidayInn/add-dequip-button
Added dequip ability per ticket: 3730
2015-03-14 21:36:57 +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
Alys
881f70997b Merge pull request #4815 from Alys/debug-options-2015-03-07
new local install Debug options in footer: +2 Missed days, +MP
2015-03-13 14:06:12 +10:00
Alice Harris
cd8c0956f8 add debug button to footer for increasing mana points (MP) 2015-03-13 13:53:21 +10:00
kholliday
8a121a5dc3 Added hide and error message when a user tries to create a challenge for HabitRPG group and they have no gems 2015-03-10 22:15:24 -05:00
Tyler Renelle
a7232b5abe fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart() 2015-03-10 15:40:19 -06:00
Tyler Renelle
812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
kholliday
fc3e1c6c9b Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons. 2015-03-08 15:35:37 -05:00
Matteo Pagliazzi
1b53aeaee8 increase timeout when usubscribing from email 2015-03-08 16:25:19 +01:00
Alice Harris
044930b7d3 add +2 Missed Days to debug menu in footer, adjust addMissedDay function and all calls to it 2015-03-07 18:39:43 +10:00
kholliday
11f61c2732 Add functionality to dequip all Battle Gear or Cosutme. 2015-03-05 09:40:37 -06:00
kholliday
f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00