2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
cbc1185f00
Added 'icon-ok' as an upper save button
2013-11-14 15:01:58 +02:00
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
95c886eee8
Merge pull request #1811 from Fandekasp/update_contrib_link
...
replace github contributing links → wikia link
2013-11-13 23:26:19 -08:00
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
340590774c
replace github contributing links → wikia link
2013-11-14 15:09:20 +11:00
7eaed0348f
git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations
2013-11-12 14:54:17 +01:00
1d9148eebb
move middleware.locals only where it is needed and transform it into a common function, simplify translations and adds automatic language detection
2013-11-12 14:49:01 +01:00
2e0d83a9cb
remove broken website field from profile
...
Websites can be added with markdown in the blurb field
2013-11-12 17:31:10 +11:00
dda3670d03
mounts: only show mount head in stable (fix later), use egg.mountText
...
for grown mount popovers. replace pet/mount tooltips with popovers
2013-11-11 13:50:11 -08:00
b6adc8e1d8
translations try
2013-11-11 22:30:38 +01:00
86f47cb6f1
halloween: remove "last day" bailey notif
2013-11-11 08:30:51 -08:00
72f64fa85c
[ #1751 ] /challenges/:cid/:mid task filtering by "in this challenge" at
...
application level, not Mongo. $elemMatch doesn't support returning
multiple items, see http://goo.gl/MxmWdQ & http://goo.gl/Iku44w
2013-11-10 23:41:42 -08:00
9fbb45c253
halloween: bailey notif for last day of spooky skins
2013-11-10 18:13:22 -08:00
cd79649100
mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount
2013-11-10 13:43:11 -08:00
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
e711258ced
advanced options not shown for rewards, shown but not editable for challenges
2013-11-10 17:35:29 +01:00
20cac379cf
pretty up our bailey notifs
2013-11-08 20:05:12 -08:00
f868bcae66
contrib: more enticing bailey announcement
2013-11-08 19:42:13 -08:00
14be0b11c6
contrib: add bailey announcement
2013-11-08 19:28:07 -08:00
c0d36f13ef
contrib: links to wikia in tavern & popup
2013-11-08 19:28:07 -08:00
5f9d3991ac
[ #1766 ] remove "trigger next day" option
2013-11-08 13:54:29 -08:00
3a332c4c45
port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting
2013-11-08 22:33:48 +01:00
4a1ed7006e
remove comment
2013-11-08 17:49:30 +01:00
daac0a4b04
show but disable challenge daily days, fix #1758
2013-11-08 17:42:45 +01:00
d419db68f2
typo, fix #1761
2013-11-08 17:23:17 +01:00
7c94b4b6d3
contrib: add contributor achievement modal
2013-11-07 13:42:29 -08:00
7fe4f31a16
contrib: show profile._id in modal so admins can assign contrib status
2013-11-07 13:05:34 -08:00
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
8646783aa1
contrib: equipped functions to use habitrpg-shared@959024d
2013-11-06 17:16:17 -08: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
2c2613ce42
allow editing tag & task.tag even if in challenge
2013-11-05 09:49:01 -08: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
74e4ef0414
add bailey for challenges
2013-11-01 17:18:14 -07:00
7037e1c8eb
[ #1672 ] don't allow clicking checkboxes on challenge-editing page
2013-11-01 10:20:14 -07:00
907f8792a6
[ #1678 ] dont' show tag editor when challenge-editing
2013-11-01 09:58:22 -07:00
37027ac874
[ #1672 ] assign tasks.id = tasks._id for challenges, fixes html ids & for lables
2013-11-01 09:48:22 -07:00
d8218927e5
add debug buttons back in, including +10 gems (@sabrecat)
2013-10-31 15:14:19 -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
9d15e724e2
challenge prize: award winner 1 achievement and challenge.prize
...
gems. then close challenge.
2013-10-31 13:49:31 -07: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
ff3266bac8
get rid of ngRoute completely, depend on ui-router instead
2013-10-30 10:31:36 -07:00
d116ac7b81
challenges: lots of misc. bug fixes
2013-10-29 22:30:58 -07:00
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
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
219318b405
challenges: remove username(), since we're now using user.profile.name
2013-10-28 18:20:21 -07:00
Tyler Renelle