Commit graph

376 commits

Author SHA1 Message Date
Matteo Pagliazzi
21509047bb ops, jquery.cookie is used by bootstrap-tour! 2013-11-06 20:12:58 +01:00
Tyler Renelle
188db745fc allow users to trigger "missed day" manually from Restore modal 2013-11-05 17:43:43 -08:00
Matteo Pagliazzi
d0c29eba78 move js & css files to public/manifest.json, allow for stylus files editing without restarting server on development, removed hashres from dev build 2013-11-04 22:13:03 +01:00
Matteo Pagliazzi
63b4e5152e better fix #1740 2013-11-04 15:21:05 +01:00
Matteo Pagliazzi
774ded9fb2 fix #1740 2013-11-04 15:17:09 +01:00
Tyler Renelle
4f52c7e15d [#1722] have to click twice for options.profile.profile 2013-11-04 00:41:16 -08:00
Tyler Renelle
de05d7dfda [#1735] fix to 6f6df94 2013-11-03 18:00:26 -08:00
Tyler Renelle
6f6df94ce7 [#1735] save timezone to userobj in browser as well as sending to server,
so we don't hit an infinite loop
2013-11-03 17:47:38 -08:00
Tyler Renelle
557ce59c71 back to non-halloween NPCs 2013-11-03 17:44:46 -08:00
Matteo Pagliazzi
33c78c7168 more fixes for guild leaving 2013-11-03 12:12:43 +01:00
Matteo Pagliazzi
126fd55ec6 update guild member count 2013-11-03 12:00:57 +01:00
Matteo Pagliazzi
06f6dc0a43 better guild join/leave 2013-11-03 11:58:42 +01:00
Tyler Renelle
646a5c942b [#1716 #1705] working modal for challenge.participants.stats! also don't
scroll to top of page. We'll want to test that this doesn't break
anything else in the app, @paglias looks like the guys on that thread
felt pretty dirty about this workaround for some reason
2013-11-02 16:07:12 -07:00
Matteo Pagliazzi
d024470abe update gem count after guild creation 2013-11-02 10:04:31 +01:00
Matteo Pagliazzi
b08a30a76b Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-02 09:54:44 +01:00
Matteo Pagliazzi
5a103db716 upgrade lodash to 2.2.1 2013-11-02 09:52:48 +01:00
Tyler Renelle
08498e37ac [#1718] don't 404 for group not found 2013-11-02 01:38:51 -07:00
Matteo Pagliazzi
898adfdc13 fix when leaving public guild 2013-11-02 09:34:56 +01:00
Tyler Renelle
8ae75e09c5 [#1716] use ui-router to collapse challenge participants (WIP) 2013-11-01 23:46:14 -07:00
Tyler Renelle
87bc7fd722 [#1710] fix to party-in-header 2013-11-01 20:32:43 -07:00
Tyler Renelle
62b2d5780b [#1710] some simplification on Groups memoization. No need for all that
special handling of Header Party, just have it's own controller and do
specific-handling. Also, removing MenuCtrl & StatsCtrl - they weren't
used TMK, I think twas a vestige of mobile. @paglias give that a gander
2013-11-01 20:15:04 -07:00
Matteo Pagliazzi
03b945d755 update memberCount & typo 2013-11-01 21:18:31 +01:00
Matteo Pagliazzi
f7dba5f323 avoid reloading for group operations 2013-11-01 21:08:36 +01:00
Matteo Pagliazzi
2da33b0355 add loading bar to front page too 2013-11-01 21:07:44 +01:00
Matteo Pagliazzi
eccc9a7953 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-01 18:33:54 +01:00
Matteo Pagliazzi
3562079ba6 small design tweaks, fix #1682 2013-11-01 18:33:50 +01:00
Tyler Renelle
7037e1c8eb [#1672] don't allow clicking checkboxes on challenge-editing page 2013-11-01 10:20:14 -07:00
Tyler Renelle
dfeae89a07 challenges: minimum 1 gem for public challenges 2013-10-31 19:30:07 -07:00
Tyler Renelle
0ce76ee689 [#1673] challenges: better tag-syncing, show tag bull-horn 2013-10-31 17:49:51 -07:00
Tyler Renelle
baf52db594 [#1670] don't refresh on challenge create/join/leave (meh, workaround) 2013-10-31 16:39:26 -07:00
Tyler Renelle
d8218927e5 add debug buttons back in, including +10 gems (@sabrecat) 2013-10-31 15:14:19 -07:00
Tyler Renelle
39821752fa challenges: move options/challenges to options/social/challenges 2013-10-31 14:37:04 -07:00
Tyler Renelle
d5e78266e5 challenge prize: various fixes. Woo, challenge prizes work now!
@sabrecat @lemoness @wc8 (still some bugs & cleanup, but it's mostly there)
2013-10-31 14:06:18 -07:00
Tyler Renelle
693061c77b challenge prize: award winner 1 achievement and challenge.prize gems. then close challenge. 2013-10-31 13:57:12 -07:00
Tyler Renelle
f6ebd9997e challenge gems: popover for closing (delete or select winner) 2013-10-31 13:26:18 -07:00
Tyler Renelle
13fa947c57 challenge prize: add to challenge creation form (including min/max validation) 2013-10-31 11:44:50 -07:00
Tyler Renelle
7b15a0055a [#1680] fix tavern chat 2013-10-31 09:44:47 -07:00
Matteo Pagliazzi
70c630fcc9 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-10-31 17:35:20 +01:00
Matteo Pagliazzi
904677e3a6 try to limit need to refresh after party operations, @lefnire this is only for parties and I got it working only for removeMember and leave party because I could not get join & create working 2013-10-31 17:35:04 +01:00
Tyler Renelle
931e8125b4 [#1693] make revive available to /options too 2013-10-31 09:34:12 -07:00
Matteo Pagliazzi
fc10e9d6e6 move party.removeSelf to client side 2013-10-31 15:41:22 +01:00
Tyler Renelle
f5a1ec96f9 [#1679] wrong cancel check 2013-10-31 01:24:47 -07:00
Tyler Renelle
d2c50dc02f challenges: GET /groups now returns a merged array of groups, rather
than structured object of {public,guilds,party,tavern}. I was having
trouble with ngResource without doing this, @paglias let me know what
you think
2013-10-30 15:14:08 -07:00
Tyler Renelle
28cdeb0ac6 challenges: fixed joining / leaving groups. Back to the old method of Group.query({type:'public'}), etc - since ngResource can only work with top-level objects. This approach is bad performance (two calls), I'll fix when I can think of a better way of organizing groups requested at GET /groups 2013-10-30 14:50:49 -07:00
Matteo Pagliazzi
e2331e5194 added growl style notification for errors 2013-10-30 19:29:46 +01:00
Matteo Pagliazzi
1490380e53 @lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think 2013-10-30 19:13:21 +01:00
Tyler Renelle
ff3266bac8 get rid of ngRoute completely, depend on ui-router instead 2013-10-30 10:31:36 -07:00
Tyler Renelle
ea54f0aa75 challenges: implement basic filters on challenges tab 2013-10-30 01:21:44 -07:00
Tyler Renelle
d116ac7b81 challenges: lots of misc. bug fixes 2013-10-29 22:30:58 -07:00
Tyler Renelle
6e71a76e22 challenges: back to dealing with taskLists from scopes, rather than the
habitrpg-tasks directive. Was having trouble accessing it by reference
otherwise. Would love to move off of the directive entirely and use
ng-include instead, but some scope issues with lists
2013-10-29 19:07:39 -07:00