02651d52a4
solve conflict
2013-11-08 17:05:03 +01:00
a78297f129
update chat if necessary after new message posted or deleted
2013-11-08 17:03:10 +01:00
06d1f77ce5
contribu: cleanup tavern, add legend for contrib tiers
2013-11-07 17:25:58 -08:00
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
d679fa1e62
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
2013-11-06 15:59:56 -08:00
3b18c322bc
return whole group.chat after chat message is sent
2013-11-06 21:27:24 +01:00
36e45a36a2
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-06 20:33:10 +01:00
a4951e151c
use $resource class methods to avoid sending whole model to server & reduce some responses
2013-11-06 20:31:39 +01:00
21509047bb
ops, jquery.cookie is used by bootstrap-tour!
2013-11-06 20:12:58 +01:00
22b70b9a0a
add message about clearing completed todos if length>100
2013-11-05 18:40:23 -08:00
188db745fc
allow users to trigger "missed day" manually from Restore modal
2013-11-05 17:43:43 -08:00
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
63b4e5152e
better fix #1740
2013-11-04 15:21:05 +01:00
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
4f52c7e15d
[ #1722 ] have to click twice for options.profile.profile
2013-11-04 00:41:16 -08:00
de05d7dfda
[ #1735 ] fix to 6f6df94
2013-11-03 18:00:26 -08:00
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
557ce59c71
back to non-halloween NPCs
2013-11-03 17:44:46 -08:00
33c78c7168
more fixes for guild leaving
2013-11-03 12:12:43 +01:00
126fd55ec6
update guild member count
2013-11-03 12:00:57 +01:00
06f6dc0a43
better guild join/leave
2013-11-03 11:58:42 +01:00
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
d024470abe
update gem count after guild creation
2013-11-02 10:04:31 +01:00
b08a30a76b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-02 09:54:44 +01:00
5a103db716
upgrade lodash to 2.2.1
2013-11-02 09:52:48 +01:00
08498e37ac
[ #1718 ] don't 404 for group not found
2013-11-02 01:38:51 -07:00
898adfdc13
fix when leaving public guild
2013-11-02 09:34:56 +01:00
8ae75e09c5
[ #1716 ] use ui-router to collapse challenge participants (WIP)
2013-11-01 23:46:14 -07:00
87bc7fd722
[ #1710 ] fix to party-in-header
2013-11-01 20:32:43 -07:00
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
03b945d755
update memberCount & typo
2013-11-01 21:18:31 +01:00
f7dba5f323
avoid reloading for group operations
2013-11-01 21:08:36 +01:00
2da33b0355
add loading bar to front page too
2013-11-01 21:07:44 +01:00
eccc9a7953
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-01 18:33:54 +01:00
3562079ba6
small design tweaks, fix #1682
2013-11-01 18:33:50 +01:00
7037e1c8eb
[ #1672 ] don't allow clicking checkboxes on challenge-editing page
2013-11-01 10:20:14 -07:00
dfeae89a07
challenges: minimum 1 gem for public challenges
2013-10-31 19:30:07 -07:00
0ce76ee689
[ #1673 ] challenges: better tag-syncing, show tag bull-horn
2013-10-31 17:49:51 -07:00
baf52db594
[ #1670 ] don't refresh on challenge create/join/leave (meh, workaround)
2013-10-31 16:39:26 -07:00
d8218927e5
add debug buttons back in, including +10 gems (@sabrecat)
2013-10-31 15:14:19 -07:00
39821752fa
challenges: move options/challenges to options/social/challenges
2013-10-31 14:37:04 -07:00
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
693061c77b
challenge prize: award winner 1 achievement and challenge.prize gems. then close challenge.
2013-10-31 13:57:12 -07:00
f6ebd9997e
challenge gems: popover for closing (delete or select winner)
2013-10-31 13:26:18 -07:00
13fa947c57
challenge prize: add to challenge creation form (including min/max validation)
2013-10-31 11:44:50 -07:00
7b15a0055a
[ #1680 ] fix tavern chat
2013-10-31 09:44:47 -07:00
70c630fcc9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-10-31 17:35:20 +01:00
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
931e8125b4
[ #1693 ] make revive available to /options too
2013-10-31 09:34:12 -07:00
fc10e9d6e6
move party.removeSelf to client side
2013-10-31 15:41:22 +01:00
Matteo Pagliazzi