Commit Graph

53 Commits

Author SHA1 Message Date
Matteo Pagliazzi cdc13d2ffb refactor(bs3): misc 2014-02-03 19:24:37 +01:00
Matteo Pagliazzi 07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi 571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi 317a148760 refactor(bs3): port newStuff and member modals, misc fixes 2014-02-02 15:55:01 +01:00
Matteo Pagliazzi f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Matteo Pagliazzi af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Sabe Jones 2d97577708 Textual tweaks for spellcasting
Makes the notification for casting a spell on the party consistent with the message generated in party chat.
2014-02-01 07:01:40 -06:00
Tyler Renelle 2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
Matteo Pagliazzi 13131087ff fix(translations): add env.t to rootScope 2014-01-24 23:19:17 +01:00
Tyler Renelle 47bd6dcb79 fix(spells): more $rootScope spell-casting bug fixes 2014-01-22 00:27:55 -08:00
Tyler Renelle e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Tyler Renelle c6f7ab8a5c fix(spells): some $rootScope.applying action fixes so cast-ending is
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
2014-01-21 23:04:01 -08:00
Tyler Renelle a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Andrew Bloomgarden dc368bb652 Remove references to $rootScope.Shared & .Content in non-view code.
Instead, have them request services that return them so tests don’t need to prepare special state.
2014-01-15 21:33:58 -08:00
Tyler Renelle 8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle 8b8f385fff winter: make bailey head more visible with holiday gear (remember to
revert this after 1/31!)
2013-12-20 23:14:08 -07:00
Tyler Renelle bf699ca466 Merge branch 'winter' into develop 2013-12-20 21:59:54 -07:00
Tyler Renelle 58195d9eeb #2012 preventDefault as well as stopPropagation. This will preven the
checkbox from getting checked, which may not be desirable, but at least
 prevents the bug for now
2013-12-20 19:57:03 -07:00
Tyler Renelle a4ba5b036f save user on spell-cast (so we don't get second mp loss notif) 2013-12-20 18:52:14 -07:00
Tyler Renelle 06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Tyler Renelle 04df61fb53 fix #2030, immediately "fulfill" spell cast, don't wait for server response 2013-12-17 19:33:36 -07:00
Tyler Renelle d03a996946 classes: very simple "buffs applied" icon next to level, add chat message
for party / member casts (@wc8 @sabrecat)
2013-12-17 19:16:31 -07:00
Tyler Renelle ceea1b5909 #2008 add option to disable sticky header 2013-12-17 14:04:38 -07:00
Tyler Renelle d2a460769d #2008 #2020 use jquery.sticky instead of bootstrap affix 2013-12-17 13:41:13 -07:00
Tyler Renelle 91f5da7989 [#1994] dismiss alert fix 2013-12-16 15:43:16 -07:00
Tyler Renelle a7100b6606 classes: cast URL fix 2013-12-16 00:18:50 -07:00
Tyler Renelle 259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -07:00
Tyler Renelle 774775de7a fixes: appliedTags, add moment to rootScope (repeat i18n issues). Also,
discard the sync-queue if errors were detected. Previously, if an op
triggered server error, the op is still in the queue and will keep
trying. Thus, in-browser user is corrupt - they'll need to logout /
clear localStorage. This *should* fix that, while still allowing the
sync-queue to build up when offline (status appears to == 0 in those
cases). @paglias just FYI - should be good, but wanna loop you in just
in case.
2013-12-15 12:11:25 -07:00
Tyler Renelle ee1cd3c05d [#1977] APIv2 WIP - start of a framework where operations are shared
between client & server. If the op is called on the client, it updates
the user & then POSTs to the server with op of the same name. If called
on server, it updates the user and user.save()s
2013-12-11 21:42:57 -07:00
Tyler Renelle ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -07:00
Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
Nick Gordon 5b610bfc5c small fix for sanity 2013-11-27 22:48:48 -08:00
Nick Gordon 86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Tyler Renelle 83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Matteo Pagliazzi df5a436338 use countPets also for stats, fix #1898 2013-11-23 17:42:47 +01:00
Matteo Pagliazzi b83eb0ee28 moment is exported as an helper by habitrpg-shared 2013-11-17 13:28:57 +01:00
Matteo Pagliazzi 34d5eda736 [#1832] remove relative-date, use moment instead 2013-11-17 13:21:21 +01:00
Tyler Renelle 2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle 085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Tyler Renelle 962cf9a3be contrib: add name-tag colors based on contributor level 2013-11-07 12:23:12 -08:00
Matteo Pagliazzi e2331e5194 added growl style notification for errors 2013-10-30 19:29:46 +01:00
Tyler Renelle 77fee06fdb gMerge branch 'challenges' into develop
Conflicts:
	migrations/20131028_cleanup_deleted_tags.js
	src/controllers/groups.js
	views/options/groups/group.jade
	views/options/profile.jade
2013-10-29 15:38:47 -07:00
Tyler Renelle be657a76e0 challenges: pass down if user is member of group (group._isMember) for
performance. some bug fixes
2013-10-29 12:26:13 -07:00
Matteo Pagliazzi 6ee1b14e97 dismissable errors and warnings, fix #1580 2013-10-28 20:16:40 +01:00
Tyler Renelle 35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00
Tyler Renelle e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks =>
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
2013-10-28 11:34:07 -07:00
Matteo Pagliazzi 20f2d75bbf add streak achievement notification 2013-10-23 17:57:02 +02:00
Matteo Pagliazzi c4882942d6 fix chart shown below task edit form 2013-10-21 20:41:19 +02:00
Tyler Renelle c52bbc8f0d graphs: hack 300px width on charts because I can't figure out how to
make 100% work
2013-10-19 16:42:29 -07:00
Tyler Renelle cef8431af0 charts: port toggleChart back in (functional, but it's not getting the
right width)
2013-10-19 16:15:48 -07:00