Marcelo Sizer
6f4f04a5af
Delete locales/en/secondary.json
2013-12-30 10:39:28 -02:00
Marcelo Sizer
55fbd7d439
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
locales/en/app.json
2013-12-30 10:33:08 -02:00
Matteo Pagliazzi
c7e93f7793
remove console.log
2013-12-30 12:28:30 +01:00
Matteo Pagliazzi
34319bdcd3
improved multiple files translations
2013-12-30 12:23:23 +01:00
Matteo Pagliazzi
cb07bc9229
allow multiple files for translations
2013-12-30 12:16:42 +01:00
Marcelo Sizer
57ac0239c5
Replaced hard-coded strings with env.t on views/static folder and en/app.json contains it all.
2013-12-30 00:14:55 -02:00
Tyler Renelle
6299415d6e
Merge pull request #2173 from HabitRPG/sabe/tweak2
...
Add .idea and .git to nodemon ignore list
2013-12-29 17:19:50 -08:00
Sabe Jones
1036f0549e
Add .idea and .git to nodemon ignore list, to reduce unnecessary server bounces during dev
2013-12-29 19:11:32 -06:00
Tyler Renelle
61dfb8d129
Merge pull request #2086 from HabitRPG/sabe/tweak2
...
Remove sliding effect on avatar mouseover
2013-12-29 16:19:09 -08:00
Tyler Renelle
2f4fd2faca
fix #2163 add stats.maxMP in GET /api/v2/user. @russtaylor let me know
...
if you need it in other locations
2013-12-29 17:13:39 -07:00
Tyler Renelle
fd324fc220
classes: fix class-modal heads. Also, little class title display trick
...
@sabrecat (tiny perf bonus)
2013-12-29 12:21:56 -07:00
Tyler Renelle
be4e29faba
Merge pull request #2162 from HabitRPG/sabe/tweak3
...
Some work on demystification of RPG elements
2013-12-29 11:12:52 -08:00
Sabe Jones
2f79472439
Some work on demystification of RPG elements
2013-12-29 11:04:31 -06:00
Tyler Renelle
e9cb9b8a9f
task-icons: larger emoji in task text than chat
2013-12-29 01:24:02 -07:00
Tyler Renelle
c14e4c8fec
display profile.stats.class in modal
2013-12-29 00:47:39 -07:00
Tyler Renelle
585f736305
add markdown support for task.text so we can use icons in task
...
titles. @wc8 does this satisfy
https://trello.com/c/FCVdjdUd/102-task-reward-icons sufficiently? @lemoness
2013-12-29 00:46:08 -07:00
Tyler Renelle
b4ff7d4be4
#1499 check that task[0] exists first
2013-12-29 00:33:58 -07:00
Tyler Renelle
d966833782
#1499 ng-if to hide/show task editing (fewer watchers)
2013-12-29 00:14:55 -07:00
Tyler Renelle
b20a3b7381
#1499 add list filter on tasks to not display completed todos at all
...
until "completed" tab clicked
2013-12-29 00:14:46 -07:00
Tyler Renelle
34a955665c
Merge pull request #1986 from Magnilucent/develop
...
Fixes #1959 : petCount was only being updated...
2013-12-28 21:15:32 -08:00
Tyler Renelle
46f772581d
Merge pull request #2153 from HabitRPG/sabe/tweak3
...
Don't need angle brackets anymore for party cast notifications
2013-12-28 21:14:48 -08:00
Tyler Renelle
8ed891db83
Merge pull request #1984 from SyntaxPickax/patch-2
...
Fixed challenge prize logic to avoid double paying
2013-12-28 21:09:48 -08:00
Tyler Renelle
57cd53cfc9
fix #2155 . Since quest.leader is new, doesn't apply to quests started
...
before today. Show abort/begin for all quest members if quest.leader
doesn't exist, otherwise only show those options to the leader
2013-12-28 21:54:25 -07:00
Tyler Renelle
d3a4d35d5d
quest: when new user joins party, invite to pending-invite quests. When
...
user in quest leaves party, knock user from group.quest.members & quest
from user.party.quest
2013-12-28 21:50:27 -07:00
Sabe Jones
47c4b1dbe5
Don't need angle brackets anymore for party cast notifications
2013-12-28 17:46:18 -06:00
Tyler Renelle
ea0b5b9291
quest: add quest leader. only quest-leader can begin/abort. Abort
...
restores quest scroll to leader. Bug fixes on clearing quest
data (completion, abort, etc)
2013-12-28 16:36:16 -07:00
Tyler Renelle
1d6679298d
server: move config => utils, send headers along with error. Trying to
...
find out if some of these errors are mobile / not my own apps. Some
requests are malformed, but hitting apiv2's batch-api, i don't see how
this could be happening since both web and mobile are built to use apiv2
properly, unless a 3rd-party is trying to use apiv2 batch-api, but that
seems unlikely
2013-12-28 14:52:21 -07:00
Tyler Renelle
49d76e1649
fix #2147 put removeMember back in
2013-12-28 12:54:53 -07:00
Tyler Renelle
827d04e4dc
APIv2: send response for user.ops
2013-12-28 12:06:24 -07:00
Tyler Renelle
ce572e230c
Merge pull request #2145 from bobbyroberts99/patch-1
...
Update Request Feature link
2013-12-27 20:58:19 -08:00
Bob Steffes
5c89954b83
Update Request Feature link
...
Link now goes directly to How to Submit a New Request card. Previously it was linking to the Trello board (not the card).
2013-12-27 19:21:30 -08:00
Tyler Renelle
f8b7d313da
typo on req.body.notes
2013-12-27 15:39:49 -07:00
Tyler Renelle
2332b15a55
add more details to errorHandler email
2013-12-27 12:22:26 -07:00
Tyler Renelle
c5ca9cf41b
fix #2142 - show boss damage as Math.abs()
2013-12-27 10:50:23 -07:00
Tyler Renelle
fa2fddb516
winter: add snowball achievement
2013-12-27 09:48:58 -07:00
Tyler Renelle
e863d5927a
Merge pull request #2138 from HabitRPG/sabe/tweak4
...
Remove padding from <li> when used in Markdown
2013-12-27 07:53:52 -08:00
Tyler Renelle
13e1792685
Merge pull request #2123 from HabitRPG/sabe/tweak3
...
Fix #2072 (add Mana delta alerts)
2013-12-27 07:53:12 -08:00
Bob Steffes
ae84ebc47c
Change link to Trello feature request card
...
Instead of linking to the Board it now links directly to the card
2013-12-27 08:50:08 -07:00
Tyler Renelle
f9d858c588
Merge pull request #2118 from HabitRPG/sabe/drops
...
Minimal fix for #2092
2013-12-27 07:48:00 -08:00
Sabe Jones
f3798c0bc8
Remove padding from <li> when used in Markdown
2013-12-27 08:56:55 -06:00
Tyler Renelle
e6e961f991
#2135 remove connect-domain commented-out examples
2013-12-26 22:39:40 -07:00
Tyler Renelle
1b8cba1945
#2135 use domain-middleware to handle top-level error-handling so we can
...
email admins UUIDs
2013-12-26 22:38:52 -07:00
Tyler Renelle
2a63dfe687
quests: temporary fix to users who have left a party mid-quest
2013-12-26 15:39:09 -07:00
Tyler Renelle
aa3767afd9
admin: calculate 2gem bonus *after* the manual gem update from admin
2013-12-26 09:58:33 -07:00
Tyler Renelle
4e811d632e
bosses: temp defensive code against progress not being defined
2013-12-26 09:58:33 -07:00
Tyler Renelle
c03dd65695
Merge pull request #2124 from HabitRPG/sabe/tweak4
...
Make better use of space for customizations and Market
2013-12-26 08:28:22 -08:00
Sabe Jones
601af6ddc0
Make better use of space for customizations and Market
2013-12-26 07:56:01 -06:00
Sabe Jones
3074cc8f16
Fix #2072 (add Mana delta alerts)
2013-12-26 07:31:00 -06:00
Sabe Jones
e5b8a92ea2
Minimal fix for #2092
2013-12-25 23:56:51 -06:00
Tyler Renelle
e9e2f26a9f
collection quest item icons fix
2013-12-25 21:26:51 -07:00
