Matteo Pagliazzi
e474f0300c
chore(i18n): update locales
2015-04-15 17:13:07 +02:00
Blade Barringer
c19ec1387a
chore(grunt): compile sprites
2015-04-14 22:18:37 -05:00
Blade Barringer
fc979dfdaa
create new string for quest participants to correct processing error
...
closes #5025 , closes #5029
2015-04-14 17:52:08 -05:00
Kathryn Norris
8c45ab8dc4
Removed unused strings and altered custom day start text. ( #5006 )
2015-04-14 14:23:20 -07:00
Alys
6296a2f4df
Merge pull request #4969 from Alys/explain-drops-2015-03-04
...
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +10:00
Alys
00abf0d694
update Drop System explanation
2015-04-14 17:57:10 +10:00
Kathryn Norris
5dc1d58f8f
Altered custom day start text. ( #5006 )
2015-04-13 17:13:23 -07:00
Kathryn Norris
ea2ad4e4b5
Changed the text for custom day start info. ( #5006 )
2015-04-13 17:13:22 -07:00
Kathryn Norris
ddb7643ff7
Updated the custom day start information in settings. ( #5006 )
2015-04-13 17:13:22 -07:00
Alys
a7abbe0e05
changed drops Learn More link and added drop types to Drops Unlocked message
2015-04-14 08:01:32 +10:00
Matteo Pagliazzi
4fe740a403
chore(i18n): update locales
2015-04-13 19:31:53 +02:00
Kevin Gisi
02838214c7
Reimplement (broken) task ordering
2015-04-13 07:47:56 -04:00
Alys
8af1f0538b
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
2015-04-13 20:16:24 +10:00
Matteo Pagliazzi
9b19bd5076
chore(i18n): update locales
2015-04-11 14:53:33 +02:00
Blade Barringer
3fe47957fb
Merge pull request #4989 from TheHollidayInn/fortify-potion-new-art
...
Updated fotify potion art
2015-04-09 17:22:23 -05:00
Blade Barringer
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
TheHollidayInn
ab2390e8c9
Updated fotify potion art
2015-04-09 09:15:32 -05:00
Blade Barringer
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
Sphinx
7efb594838
Pulling in commits from shared repo
...
Additional changes to other languages are required before merging!
https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
Conflicts:
locales/en/challenge.json
2015-04-09 08:01:34 -05:00
Alys
556a1640c6
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
common/script/content.coffee
common/script/index.coffee
2015-04-09 16:50:10 +10:00
Blade Barringer
cdd0b29924
Merge branch 'develop' into gisikw-sort-dated-todos
2015-04-08 20:47:38 -05:00
Tyler Renelle
fee002b289
feat(analytics): better events organization via category>label>action>value
2015-04-08 17:29:55 -06:00
Blade Barringer
3df45a8cb0
Merge branch 'TheHollidayInn-error-message-rewrite' into develop
2015-04-08 18:11:51 -05:00
Blade Barringer
553bd0d90b
Updated console message
2015-04-08 18:11:34 -05:00
Blade Barringer
a24383c1a2
Removed lingering shared file
2015-04-08 13:58:45 -05:00
Blade Barringer
0f9ce179df
Merge branch 'develop' into Alys-ignore-compiled-js-2015-04-04
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-04-08 13:57:49 -05:00
Matteo Pagliazzi
820909dd9b
chore(i18n): update locales
2015-04-08 19:15:03 +02:00
Matteo Pagliazzi
e58521f416
Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
...
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
TheHollidayInn
a317bc2920
Updated seeConsole message to be more helpful to the average user
2015-04-08 08:20:10 -05:00
Kevin Gisi
f12d56e456
Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos"
...
This reverts commit 33f928b6d876ef1fdd92
2015-04-07 22:38:43 -04:00
Blade Barringer
cc674f57cd
Revert "Sorted dated todos by date."
2015-04-07 19:51:27 -05:00
Sabe Jones
76ef1fdd92
Merge pull request #4988 from SabreCat/shiny-seed
...
April backgrounds
2015-04-07 19:12:34 -05:00
Sabe Jones
9d3a14b734
chore(grunt): compile sprites
2015-04-07 19:08:00 -05:00
Matteo Pagliazzi
ab1b75b655
finalize unsubscription page
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
71108ee935
feat(email): WIP start implementing unsubscription page and related features
2015-04-07 14:04:03 +02:00
Matteo Pagliazzi
e470764b06
chore(i18n): update locales
2015-04-07 14:03:48 +02:00
Sabe Jones
616a7d9650
feat(backgrounds): April BGs
2015-04-06 19:03:24 -05:00
Sabe Jones
1590d050f5
fix(sprite): Seed 32x32
...
Fixes #4966 .
2015-04-06 18:38:30 -05:00
Kevin Gisi
ac01d9ad8b
Sorted dated todos by date.
2015-04-06 03:47:00 -04:00
Alys
7d579ea08a
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
...
Conflicts:
website/views/shared/modals/members.jade
2015-04-05 23:24:46 +10:00
Alys
e134c36ca2
prevent user.stats.points from being negative e.g., after dropping level with Fix Character Values (still need to remove allocated points then)
2015-04-05 09:04:59 +10:00
Matteo Pagliazzi
9a76552072
chore(i18n): update locales
2015-04-04 12:36:55 +02:00
Alys
a02c957c59
ignore habitrpg-shared.js (add to .gitignore, delete from repo)
2015-04-04 13:53:36 +10:00
Alys
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
Tyler Renelle
6b52e00b37
Merge pull request #4972 from HabitRPG/lefnire/sugarfiend2
...
Static page redesign
2015-04-03 13:53:59 -06:00
Alys
f432bc1f17
Merge pull request #4919 from TheHollidayInn/spells-level-with-exp
...
Added sync on mage fireball spell and rogue backstab skill and give correct mp reduction notification for ethereal surge
2015-04-04 00:29:41 +10:00
Alys
43fdf939cc
add text to the Market for eggs, hatching potions, and food to explain to new users that the items will also drop
2015-04-03 23:00:15 +10:00
Matteo Pagliazzi
61db64e963
chore(i18n): update locales
2015-04-03 13:28:45 +02:00
Alys
dcb13a3ed6
Merge remote-tracking branch 'upstream/develop' into rebalancing-2015-03
2015-04-03 11:21:04 +10:00
Tyler Renelle
26f1d6bb39
feat(static): secondary statics reflect front. merge front.old into features
2015-04-02 17:41:38 -06:00
