Sabe Jones
983df5c97c
Fix matters of colons: missing space after colon in stats, colon getting placed after tags in task tag list.
2013-11-23 06:54:00 -06:00
Adrien Lemaire
dcd0e7e95b
add setting in Social→Party→Members
2013-11-23 21:59:58 +11:00
Nick Gordon
90582c3709
more bindonce rollbacks... bo-if seems to work sometimes, othertimes not
2013-11-22 22:57:41 -08:00
Nick Gordon
2a7adf7285
reverting more bindonce changes...
...
* challenges are not showing, this could be related to the bo-if directive being broken https://github.com/Pasvaz/bindonce/issues/29
* NPCs lost their color because bindonce seems to have a major issue on tags that are using both interpolation and the bo-class directives
2013-11-22 22:44:02 -08:00
Nick Gordon
f26cb2abf3
making it nicer to be in chat if someone decides to post spammy crap or huge images
2013-11-22 21:15:28 -08:00
Nick Gordon
dfb09b1f9b
Yeah, this didn't work with the achievements popup, because the same template is used for anyone's modal
2013-11-22 15:59:53 -08:00
Nick Gordon
b431336463
more optimizations with bindonce, replacing ngIf with boIf.
...
some of this was done with an axe rather than a fine brush, so there may be issues we need to be on the watch for.
2013-11-22 15:16:24 -08:00
Nick Gordon
0d19c0de21
Looked for opportunities to replace ngclass with boclass to improve performance, as well as replacing some instances of ng-if with bo-if
2013-11-22 14:40:44 -08:00
Nick Gordon
2350e3d359
initial load of bindonce, implementation for chat. performance has improved noticibly, but I think we need to do this in a few other places
2013-11-22 14:23:47 -08:00
Nick Gordon
efe2ff5d70
super awesome mega-fix with unintended awesome collateral-fixes
...
* markdown supported in chat
* by proxy, paragraphs are *also* supported in chat now
* AND EVEN PROXIER, the issue with emoji not showing properly is fixed
2013-11-22 10:38:40 -08:00
Sabe Jones
e458b571dc
Move stat formulae to mouseover popup instead of inline
2013-11-21 20:37:55 -06:00
Tyler Renelle
44f33f7298
Merge pull request #1872 from bobbyroberts99/wikia
...
Add link to wikia Tags article when creating a new challenge
2013-11-20 13:14:21 -08:00
Bob Steffes
6b2a60330f
Add link to wikia Tags article when creating a new challenge
...
The ? icon now links to the wiki Tags article
2013-11-20 13:08:05 -08:00
Adrien Lemaire
e240a4404f
reorganize menus
2013-11-19 11:22:41 +11:00
Adrien Lemaire
7c15f09e03
code logic to update preferences
2013-11-19 11:22:41 +11:00
Adrien Lemaire
0ce0823de4
update ui to test hidable gears
2013-11-19 11:22:41 +11:00
Tyler Renelle
fc352ec2c4
[ #1732 ] temporarily allow restore-streak on challenge tasks
2013-11-17 22:23:22 -07:00
Tyler Renelle
a262828e09
Merge pull request #1847 from HabitRPG/sabe_tweak_3
...
Work on standardizing terminology
2013-11-17 12:22:40 -08:00
Matteo Pagliazzi
7d5da13f6d
small performance fix
2013-11-17 21:20:43 +01:00
Matteo Pagliazzi
13856ce1ce
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-17 20:53:00 +01:00
Matteo Pagliazzi
a81e77f0ff
update chat messages timestamp
2013-11-17 20:52:39 +01:00
Sabe Jones
450e154948
On further thought, "Equipment" is better than "Gear." Also fixed a typo.
2013-11-17 10:01:27 -06:00
Sabe Jones
6cc41c47c7
Work on standardizing terminology
2013-11-17 09:36:38 -06:00
Sabe Jones
cb64ab5a7d
Make it easier for people to find "how to contribute" wiki page
2013-11-17 08:09:23 -06:00
Matteo Pagliazzi
34d5eda736
[ #1832 ] remove relative-date, use moment instead
2013-11-17 13:21:21 +01:00
Nick Gordon
55998085e3
fixed the issue with case insensitive highlighting highlighting short usernames
...
how this works:
* rather than throw an expensive regular expression at each chat message, we start by checking to see if the users name exists.
* then, by simple string manipulation we verify that the preceeding character before the alleged username is whitespace, the start of a line, or an '@' character.
* FINALLY, we verify the following character is a non-word character using a regular expression.
* then we cache the highlight status on the local `message` object, because for some reason, this function is called **every time a character is typed in the chatbox.** this seems like a hugh performance problem to me, need to see if there is a way to disable that or something
2013-11-16 09:24:01 -08:00
Tyler Renelle
4fa4519b34
[ #1829 ] sort challenge-box by creation date
2013-11-15 21:32:25 -08:00
Tyler Renelle
b762ecba81
admin: add list of contributors. Add contributor.contributions, textarea for links of contributions for tracking. move all admin stuff to dedicated controller & routes
2013-11-15 19:27:23 -08:00
Tyler Renelle
460afb7763
[ #1829 ] sort by timestamp, show group & creator in challenge header
2013-11-15 18:57:35 -08:00
Tyler Renelle
2b286ba889
[ #1821 ] [ #1723 ] fix pet counters (incl for member modals)
2013-11-15 17:51:00 -08:00
Tyler Renelle
05334550b0
[ #1837 ] separate groups filter from "create new challenge"-available groups
2013-11-15 17:36:36 -08:00
Nick Gordon
5116a99dce
moved UI stuff into the settings area, moved authWithSession to the Auth controller
2013-11-15 16:25:09 -08:00
Nick Gordon
b958103447
Merge branch 'develop' of https://github.com/snicker/habitrpg into develop
2013-11-15 06:20:37 -08:00
Nick Gordon
7bf1bf2af0
data export commit, supports exporting task history via csv
...
*adds the following new dependencies: moment, express-csv
*recommend replacing functionality of 'relative-date' with features from 'moment'
*supports retrieval of CSV history via the API and in browser
**/api/v1/export/history (requires typical API authorization)
**/export/history.csv (requires session authorization)
*adds new routes for data export
2013-11-15 06:18:16 -08:00
Tyler Renelle
1e6dec0bbe
pets: popover placement fixes
2013-11-14 22:07:08 -08:00
Sabe Jones
5ae2f06006
Shields don't come free ya know!
...
Fix a couple of missed pieces from reward tier text updates.
2013-11-14 20:42:09 -06:00
Sabe Jones
ee1768b7e2
One does not simply *pull request* into Heroism.
...
Improved descriptions of reward tiers in the Tavern chat sidebar. Also a handful of miscellaneous English syntax tweaks.
2013-11-14 19:42:03 -06:00
Tyler Renelle
4c3f04cc49
Merge branch 'mounts' into develop
...
Conflicts:
views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Tyler Renelle
d245c87f29
mounts: temporarily remove mounts code from views. merging to master so
...
we can run schema migration and start with item translations. This commit will be reverted
when mounts is fully merged
2013-11-14 12:59:00 -08:00
Filippos
cbc1185f00
Added 'icon-ok' as an upper save button
2013-11-14 15:01:58 +02:00
Tyler Renelle
10e9c205e6
Merge branch 'translations' into develop
...
Conflicts:
locales/bg/app.json
locales/nl/app.json
2013-11-13 23:37:29 -08:00
Tyler Renelle
95c886eee8
Merge pull request #1811 from Fandekasp/update_contrib_link
...
replace github contributing links → wikia link
2013-11-13 23:26:19 -08:00
Tyler Renelle
aad8f80c9d
Merge pull request #1795 from Fandekasp/remove_website
...
remove broken website field from profile
2013-11-13 23:09:27 -08:00
Adrien Lemaire
340590774c
replace github contributing links → wikia link
2013-11-14 15:09:20 +11:00
Nick Gordon
528fd5f067
case-insensitive highlighting for usernames in chat
2013-11-13 06:57:48 -08:00
Nick Gordon
0ac1f4e397
support for npc styling in autocomplete list to match messages
2013-11-12 21:45:31 -08:00
Tyler Renelle
56b1684a45
Merge pull request #1798 from snicker/develop
...
Fixed issues with positioning of userlist
2013-11-12 20:16:42 -08:00
Nick Gordon
66c0840e76
a few fixes and performance increases:
...
* username autocompletes on click now instead of showing undefined
* an adjustable 'update interval' stops the huge performance hit by delaying events from firing until the user has stopped typing for a while
* nested controllers can cause issues because of prototypal inheritance if the models are not defined correctly... with ChatCtrl._chatMessage, this was the case. Modified it to fit in better with "best practices". See blog post here: http://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html
2013-11-12 20:04:37 -08:00
Matteo Pagliazzi
be2010b0a2
add sample app.json for new translations, send client side strings to the browser, send languages to the browser with a language name and code
2013-11-12 22:01:27 +01:00
Nick Gordon
edcafcc3ce
Fixed issues with positioning of userlist
2013-11-12 07:41:26 -08:00
Matteo Pagliazzi
5ddf54466c
can change language from setting
2013-11-12 16:13:35 +01:00
Matteo Pagliazzi
7eaed0348f
git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations
2013-11-12 14:54:17 +01:00
Matteo Pagliazzi
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
Adrien Lemaire
4980a2e6b5
remove groups websites
2013-11-12 22:25:40 +11:00
Tyler Renelle
32a94871d2
Merge pull request #1796 from snicker/develop
...
Autocompletion of nicknames in chat
2013-11-12 00:17:29 -08:00
Nick Gordon
cd693835ce
Autocompletion of nicknames in chat works. this commit will require a npm install to fetch new packages
2013-11-11 22:32:52 -08:00
Adrien Lemaire
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
Tyler Renelle
2978842d23
[ #1781 ] challenges: select-all / select-none buttons
2013-11-11 19:00:43 -08:00
Tyler Renelle
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
Matteo Pagliazzi
b6adc8e1d8
translations try
2013-11-11 22:30:38 +01:00
Matteo Pagliazzi
de7ae2203f
remove old files
2013-11-11 21:21:19 +01:00
Matteo Pagliazzi
a1f9bf60fb
try
2013-11-11 21:20:12 +01:00
Tyler Renelle
86f47cb6f1
halloween: remove "last day" bailey notif
2013-11-11 08:30:51 -08:00
Tyler Renelle
42534b5233
[ #1792 ] put purchased limited skins back on avatar tab
2013-11-11 08:21:29 -08:00
Tyler Renelle
cde96bf28b
halloween: take down halloween skins
2013-11-11 00:27:20 -08:00
Tyler Renelle
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
Tyler Renelle
bfbc907fa1
mounts: show when selectedFood by green-circle highlighting pets
2013-11-10 22:53:20 -08:00
Tyler Renelle
e6f524fce2
mounts: much cleaner inventory interface. Replace text (underneath) with
...
gem cost. Use popover instead of tooltip, show item.text & item.notes
for more details than before (especially useful for saddle). Screenshot: http://goo.gl/0AfLfG
2013-11-10 20:03:54 -08:00
Tyler Renelle
543635dd37
mounts: change growth-points requirement to 50 (@lemoness)
2013-11-10 19:20:34 -08:00
Tyler Renelle
05c3e71a92
mounts: fixes to starter food css
2013-11-10 19:18:06 -08:00
Tyler Renelle
9fbb45c253
halloween: bailey notif for last day of spooky skins
2013-11-10 18:13:22 -08:00
Tyler Renelle
4f2a4b1f02
mounts: rare mounts html fix
2013-11-10 17:17:24 -08:00
Tyler Renelle
244fe63bdd
mounts: add support for rare mounts
2013-11-10 14:36:40 -08:00
Tyler Renelle
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
Tyler Renelle
284114c056
mounts: counting bug fixes, put pets & mounts in tabs
2013-11-10 12:28:08 -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
Matteo Pagliazzi
e711258ced
advanced options not shown for rewards, shown but not editable for challenges
2013-11-10 17:35:29 +01:00
Sabe Jones
ce1461f0e9
Challenges are no longer an upcoming feature!
...
Wording tweaks to guild creation text.
2013-11-09 13:34:14 -06:00
Tyler Renelle
8c83bc6ad2
challenges: "close" => "end challenge", move outside of edit
2013-11-09 09:37:31 -08:00
Tyler Renelle
20cac379cf
pretty up our bailey notifs
2013-11-08 20:05:12 -08:00
Tyler Renelle
f868bcae66
contrib: more enticing bailey announcement
2013-11-08 19:42:13 -08:00
Tyler Renelle
14be0b11c6
contrib: add bailey announcement
2013-11-08 19:28:07 -08:00
Tyler Renelle
242bcda96a
contrib: remove gems from admin section, update automatically when they
...
increase a level
2013-11-08 19:28:07 -08:00
Tyler Renelle
c0d36f13ef
contrib: links to wikia in tavern & popup
2013-11-08 19:28:07 -08:00
Bob Steffes
8773e8ee88
Minor edits
...
Fix a runon sentence, add a space after a comma and change adventure to
venture by your side.
Happy note, I finally got my local copy running. Needed to edit
config.json with my actual settings.
2013-11-08 17:40:23 -08:00
Bob Steffes
dd2e8144bb
Revert "Minor edits"
...
This reverts commit 43bb1bf485
2013-11-08 17:15:03 -08:00
Bob Steffes
43bb1bf485
Minor edits
...
Add a space at of sentence and fix run.
2013-11-08 17:01:24 -08:00
Tyler Renelle
5f9d3991ac
[ #1766 ] remove "trigger next day" option
2013-11-08 13:54:29 -08:00
Matteo Pagliazzi
9f326e7433
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-08 22:34:28 +01:00
Matteo Pagliazzi
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
Shane Lister
64ed414ae6
Update inventory.jade
2013-11-08 10:53:28 -08:00
Shane Lister
30e4dbcb98
Update Hatching Instructions
...
On behalf of @bobbyroberts99
2013-11-08 10:43:22 -08:00
Tyler Renelle
4e668a7de4
contrib: heroic at (8)
2013-11-08 08:51:33 -08:00
Matteo Pagliazzi
4a1ed7006e
remove comment
2013-11-08 17:49:30 +01:00
Matteo Pagliazzi
daac0a4b04
show but disable challenge daily days, fix #1758
2013-11-08 17:42:45 +01:00
Matteo Pagliazzi
d419db68f2
typo, fix #1761
2013-11-08 17:23:17 +01:00
Tyler Renelle
06d1f77ce5
contribu: cleanup tavern, add legend for contrib tiers
2013-11-07 17:25:58 -08:00
Tyler Renelle
7c94b4b6d3
contrib: add contributor achievement modal
2013-11-07 13:42:29 -08:00
Tyler Renelle
7fe4f31a16
contrib: show profile._id in modal so admins can assign contrib status
2013-11-07 13:05:34 -08:00
Tyler Renelle
962cf9a3be
contrib: add name-tag colors based on contributor level
2013-11-07 12:23:12 -08:00
Tyler Renelle
e387ee9d13
Merge remote-tracking branch 'Shaners/patch-3' into contrib
...
Conflicts:
views/options/pets.jade
2013-11-06 17:40:02 -08:00
Tyler Renelle
8646783aa1
contrib: equipped functions to use habitrpg-shared@959024d
2013-11-06 17:16:17 -08:00
Tyler Renelle
d679fa1e62
contrib: add Admin page to update contributor status. Start migrating from User.backer => User.contributor
2013-11-06 15:59:56 -08:00
Matteo Pagliazzi
36e45a36a2
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2013-11-06 20:33:10 +01:00
Matteo Pagliazzi
ffd119b16d
invited consistent with members
2013-11-06 20:31:00 +01:00
Tyler Renelle
22b70b9a0a
add message about clearing completed todos if length>100
2013-11-05 18:40:23 -08:00
Tyler Renelle
188db745fc
allow users to trigger "missed day" manually from Restore modal
2013-11-05 17:43:43 -08:00
Tyler Renelle
1d5296880b
Merge pull request #1750 from HabitRPG/paglias/build-manifest
...
Paglias/build manifest
2013-11-05 10:29:12 -08:00
Tyler Renelle
2c2613ce42
allow editing tag & task.tag even if in challenge
2013-11-05 09:49:01 -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
774ded9fb2
fix #1740
2013-11-04 15:17:09 +01:00
Tyler Renelle
427a70e76d
[ #1731 ] update guild gems wording
2013-11-03 18:30:50 -08:00
Tyler Renelle
62012a1052
fix adding challenges as subdoc to groups. write migration to restore those that have been created. Also in migration fix missing task.ids (taskSchema issue)
2013-11-02 18:05:14 -07: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
9454a3a629
should help performances, it inserted the whole group leader object into the profile attr
2013-11-02 12:40:36 +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
Tyler Renelle
65b18f3af1
[ #1711 ] limit number of members that get sent down with group, limit profile
...
fields sent down
2013-11-01 19:27:08 -07:00
Tyler Renelle
74e4ef0414
add bailey for challenges
2013-11-01 17:18:14 -07: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
Tyler Renelle
4b4a043a5f
[ #1685 ] add help popover to explain challenge task coloring / charts
2013-11-01 11:09:49 -07: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
907f8792a6
[ #1678 ] dont' show tag editor when challenge-editing
2013-11-01 09:58:22 -07:00
Tyler Renelle
37027ac874
[ #1672 ] assign tasks.id = tasks._id for challenges, fixes html ids & for lables
2013-11-01 09:48:22 -07:00
Tyler Renelle
dfeae89a07
challenges: minimum 1 gem for public challenges
2013-10-31 19:30:07 -07:00
Tyler Renelle
58fa97fb19
challenges: shortcode for tag names & task tooltips
2013-10-31 18:18:34 -07:00
Tyler Renelle
0ce76ee689
[ #1673 ] challenges: better tag-syncing, show tag bull-horn
2013-10-31 17:49:51 -07:00
Tyler Renelle
b3804c4d1f
[ #1675 ] fixes to populating Group.challenges, and display challenges in party
...
page. I'm not sure about having challenges as a subdoc anymore, i think
it will be better performance and maintenance if we just reference
Challenge.group/members and remove User.challenges & Group.challenges
2013-10-31 16:20:48 -07:00
Tyler Renelle
14b5044fd7
[ #1695 ] add access control to update/deleting challenges
2013-10-31 15:32:30 -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
012dabf8b6
challenges: visually collapse members list (still loads the full thing, revisit later)
2013-10-31 14:26:48 -07:00
Tyler Renelle
4a442d924e
challenge: small tweaks on descriptions
2013-10-31 14:16:01 -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
9d15e724e2
challenge prize: award winner 1 achievement and challenge.prize
...
gems. then close challenge.
2013-10-31 13:49:31 -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
6c63608f83
[ #1681 ] add chal.description on creation form
2013-10-31 10:46:25 -07:00
Tyler Renelle
0892f93b75
[ #1683 ] typo
2013-10-31 10:21:36 -07:00
Tyler Renelle
398c52f3b0
[ #1683 ] ugly workaround to fix save/delete/cancel flashing. Problem is
...
$scope.challenge isn't resolved yet, so ._locked isn't set
immediately. Well we could use $state.resolve instead of
$state.controller, but it's just not resolving (ui-router not working
with ng-resoure?)
2013-10-31 10:14:46 -07:00
Tyler Renelle
1420fe8c03
Merge pull request #1694 from bobbyroberts99/patch-1
...
Clarify pet hatching instructions
2013-10-31 09:39:38 -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
bobbyroberts99
5b09bd30b4
Clarify pet hatching instructions
...
This is my first PR. Hope I'm in the right place.
2013-10-31 09:34:43 -07: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
