0f7ccca00b
Changed Difficulty link from Trello to Wiki
...
Changed the Difficulty link from the Trello feature request to the
appropriate wiki page
2015-04-11 21:49:57 -04:00
24ad30aab4
Add port to BASE_URL in config example
2015-04-11 19:31:25 -05:00
9b19bd5076
chore(i18n): update locales
2015-04-11 14:53:33 +02:00
f7d30dbc86
Remove only block on karma test
2015-04-11 00:01:39 -05:00
5f8477ff10
Merge pull request #5005 from crookedneighbor/hall_of_heroes_quick_click
...
Made uuid in hall of heroes populate the input box
2015-04-10 23:56:34 -05:00
8642366f15
scroll to top and load hero; add tests for new behavior.
2015-04-10 23:51:34 -05:00
730ac4b3df
correct chat api tests; prevent sending a blank message via the api
2015-04-10 18:27:58 -05:00
426960c590
Merge branch 'develop' into Horacious-APIv2
2015-04-10 07:33:26 -05:00
24ef3aa012
Made uuid in hall of heroes populate the input box
2015-04-09 21:57:06 -05:00
ddc91e0227
Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order
2015-04-09 17:32:09 -05:00
3fe47957fb
Merge pull request #4989 from TheHollidayInn/fortify-potion-new-art
...
Updated fotify potion art
2015-04-09 17:22:23 -05:00
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
ab2390e8c9
Updated fotify potion art
2015-04-09 09:15:32 -05:00
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
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
69e1b4f8e6
Update challenges.jade
...
Additional changes in translations 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.)"
2015-04-09 07:55:44 -05:00
0878293138
Update menu.jade
...
https://github.com/HabitRPG/habitrpg/issues/2932
2015-04-09 07:55:44 -05:00
b9490d39b8
Update gems.jade
...
https://github.com/HabitRPG/habitrpg/issues/2932
2015-04-09 07:53:53 -05:00
882827c105
Merge pull request #5000 from gisikw/sort-dated-todos
...
Put list back into removeTask fn, update removal logic within challegeCtrl
2015-04-09 16:37:57 +10:00
860ca9fc16
Put list back into removeTask function, update removal logic within challengeCtrl
2015-04-08 23:03:45 -04:00
a3cbca2089
Merge pull request #4991 from TheHollidayInn/filters-sort-adjustments
...
Removed axis resrtiction to ease reordering of large number of tags
2015-04-08 20:57:40 -05:00
cdd0b29924
Merge branch 'develop' into gisikw-sort-dated-todos
2015-04-08 20:47:38 -05:00
695d5f9ef3
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-04-08 19:47:21 -05:00
9b406a3c3b
Merge branch 'gisikw-make-e2e-specs-travis-friendly' into develop
...
Conflicts:
common/dist/scripts/habitrpg-shared.js
2015-04-08 19:46:31 -05:00
8a33de219c
feat(analytics): updated cron experiment ID
2015-04-08 17:37:40 -06:00
fee002b289
feat(analytics): better events organization via category>label>action>value
2015-04-08 17:29:55 -06:00
3df45a8cb0
Merge branch 'TheHollidayInn-error-message-rewrite' into develop
2015-04-08 18:11:51 -05:00
553bd0d90b
Updated console message
2015-04-08 18:11:34 -05:00
a24383c1a2
Removed lingering shared file
2015-04-08 13:58:45 -05:00
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
820909dd9b
chore(i18n): update locales
2015-04-08 19:15:03 +02:00
e58521f416
Merge pull request #4968 from HabitRPG/paglias/emails-unsubscription-page
...
WIP Emails unsubscription page
2015-04-08 19:12:28 +02:00
804b7b20c7
fix email sending for non registered users
2015-04-08 19:07:36 +02:00
a317bc2920
Updated seeConsole message to be more helpful to the average user
2015-04-08 08:20:10 -05:00
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
9bb2f46264
Modify removeTask to accept a task object. Update task view to reflect new method signature.
2015-04-07 22:38:20 -04:00
33f928b6d8
Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos
...
Revert "Sorted dated todos by date."
2015-04-07 19:55:52 -05:00
cc674f57cd
Revert "Sorted dated todos by date."
2015-04-07 19:51:27 -05:00
76ef1fdd92
Merge pull request #4988 from SabreCat/shiny-seed
...
April backgrounds
2015-04-07 19:12:34 -05:00
9d3a14b734
chore(grunt): compile sprites
2015-04-07 19:08:00 -05:00
9619c46df2
Removed extra console.log
2015-04-07 18:49:25 -05:00
09761c5c53
Corrected ordering that tasks appear in when user enters multiple tasks
2015-04-07 14:51:26 -05:00
8826ae8c41
Removed axis resrtiction to ease reordering of large number of tags
2015-04-07 09:47:52 -05:00
f12f2b201a
typos
2015-04-07 16:07:52 +02:00
d21fb41aef
when signing up, delete previous email preferences
2015-04-07 16:04:33 +02:00
b2ffbf4113
password resets back to nodemailer...
2015-04-07 15:53:26 +02:00
16e67ab7d4
put password resets back to email server, check for non registered users unsubscriptions
2015-04-07 14:04:03 +02:00
e6c1a72c39
use callback itself as context
2015-04-07 14:04:03 +02:00
9e95f9c17d
pass entire unsubscription url to email server
2015-04-07 14:04:03 +02:00
ab1b75b655
finalize unsubscription page
2015-04-07 14:04:03 +02:00
hairlessbear