 Alice Harris
|
6f4eebb348
|
Merge pull request #354 from Alys/beeminderDeleteWarning-2014-11-06
add warning text for Beeminder users about deleting To-Dos
|
2014-11-07 19:31:26 +10:00 |
|
|
Alice Harris
|
1f9cb90d2d
|
Merge pull request #4225 from Alys/beeminderDeleteWarning-2014-11-06
add warning text for Beeminder users about deleting To-Dos
|
2014-11-07 19:29:43 +10:00 |
|
|
Tyler Renelle
|
4eae55f3ba
|
refactor(payments): move transactional emails to utils.js for
DRY (cc @paglias)
|
2014-11-06 18:25:44 -07:00 |
|
|
Tyler Renelle
|
a8d4a7545c
|
bailey(costumes)
|
2014-11-06 16:24:48 -07:00 |
|
|
Tyler Renelle
|
8120d69d05
|
feat(halloween): costume contest badges
|
2014-11-06 16:21:52 -07:00 |
|
|
Tyler Renelle
|
d043048d28
|
deleted facebook.jpeg, now using zocial (see HabitRPG/habitrpg#6304dd2)
|
2014-11-06 16:21:09 -07:00 |
|
|
Tyler Renelle
|
6304dd2e15
|
feat(auth): move to hello.js for social auth, paves the way for multiple
connectors. Prettier buttons via zocial
|
2014-11-06 14:45:06 -07:00 |
|
|
Alice Harris
|
551e5d4e83
|
add warning text for Beeminder users about deleting To-Dos
|
2014-11-06 12:24:57 +10:00 |
|
|
Alice Harris
|
a34beb7686
|
add warning text for Beeminder users about deleting To-Dos
|
2014-11-06 12:24:27 +10:00 |
|
|
Tyler Renelle
|
8651f0da25
|
fix(facebook): move from passport-facebook to Facebook JS SDK. Better
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
|
2014-11-05 18:23:10 -07:00 |
|
|
Tyler Renelle
|
8ff971b1ec
|
fix(facebook): try using facebook oauth route 2.1 #4221
|
2014-11-05 11:31:26 -07:00 |
|
|
Tyler Renelle
|
1f72721e6a
|
fix(facebook): attempt using a callback buster to generate a new
authorization code #4221
|
2014-11-05 11:30:53 -07:00 |
|
|
Matteo Pagliazzi
|
cfbb564801
|
feat(emails): add recaptureEmailsPhase path to flags
|
2014-11-05 17:56:10 +01:00 |
|
|
Tyler Renelle
|
94a813fc6b
|
bailey: backgrounds, beeminder
|
2014-11-04 19:50:56 -07:00 |
|
|
Tyler Renelle
|
c53e6a23cf
|
feat(backgrounds): add new backgrounds
|
2014-11-04 19:45:42 -07:00 |
|
|
Tyler Renelle
|
ee879decb9
|
chore(upgrade): passport-facebook
|
2014-11-04 18:26:31 -07:00 |
|
|
Matteo Pagliazzi
|
28668bea8c
|
Merge pull request #352 from Alys/commGuide-translation-fix-2014-11-04
merge strings to ease translations
|
2014-11-04 19:15:13 +01:00 |
|
|
Matteo Pagliazzi
|
2b085b8803
|
Merge pull request #4220 from Alys/commGuide-translation-fix-2014-11-04
merge strings to ease translations
|
2014-11-04 19:15:10 +01:00 |
|
|
Alice Harris
|
cad04b376a
|
merge strings to ease translations
|
2014-11-04 16:44:15 +10:00 |
|
|
Alice Harris
|
62f71fbdb8
|
merge strings to ease translations
|
2014-11-04 16:43:27 +10:00 |
|
|
Matteo Pagliazzi
|
2ac9cd037c
|
chore(i18n): add communityGuidelines translations
|
2014-11-03 20:28:18 +01:00 |
|
|
Matteo Pagliazzi
|
e788872932
|
fix typo in previous commit
|
2014-11-03 19:55:10 +01:00 |
|
|
Matteo Pagliazzi
|
e692b4b392
|
do not allow user to revive if not dead, fixes HabitRPG/habitrpg#3599
|
2014-11-03 19:53:27 +01:00 |
|
|
Matteo Pagliazzi
|
7e573bc877
|
chore(i18n): update locales, add pirate english
|
2014-11-03 19:29:01 +01:00 |
|
|
Tyler Renelle
|
3fc4978176
|
feat(fall): back to default npcs
|
2014-11-02 23:10:48 -07:00 |
|
|
Tyler Renelle
|
1151002dd6
|
feat(fall): disable candy drops
|
2014-11-02 17:02:09 -07:00 |
|
|
Alice Harris
|
16fff701d4
|
Merge pull request #4212 from Alys/mountsFix
fix decapitated mount head - fixes https://github.com/HabitRPG/habitrpg/issues/4209
|
2014-11-02 19:16:30 +10:00 |
|
|
Alice Harris
|
b79118c976
|
fix decapitated mount head
|
2014-11-02 18:54:33 +10:00 |
|
|
Alice Harris
|
036b855777
|
improve wording for Dated To-Dos tab tooltip
|
2014-11-02 06:05:15 +10:00 |
|
|
Alice Harris
|
136408e885
|
add tooltip to Dated To-Dos tab to explain that To-Dos aren't sorted
|
2014-11-02 05:50:31 +10:00 |
|
|
Alice Harris
|
6d0f2ed0bf
|
add tooltip to Dated To-Dos tab to explain that To-Dos aren't sorted
|
2014-11-02 05:49:49 +10:00 |
|
|
Tyler Renelle
|
51a850c766
|
fix(bailey)
|
2014-11-01 13:32:50 -06:00 |
|
|
Tyler Renelle
|
5e0f4e7823
|
bailey(mystery)
|
2014-11-01 13:31:08 -06:00 |
|
|
Tyler Renelle
|
8932db4cc9
|
feat(mystery): update box
|
2014-11-01 13:29:29 -06:00 |
|
|
Tyler Renelle
|
3132bbcb41
|
feat(fall): back to fall npcs
|
2014-11-01 13:28:32 -06:00 |
|
|
Tyler Renelle
|
89060c9561
|
feat(fall): turn off fall hair, skins, spookySparkles
|
2014-11-01 13:25:09 -06:00 |
|
|
Tyler Renelle
|
050acdc8f3
|
Merge pull request #4203 from Alys/revertPumpkin-2014-11-01
convert JackOLantern-Base pumpkin pet code to commented-out example code
|
2014-11-01 13:12:01 -06:00 |
|
|
Tyler Renelle
|
44aa1209cd
|
Merge pull request #351 from spacetime/develop
Added space before "target=" when added to href
|
2014-11-01 13:06:58 -06:00 |
|
|
Rishab Arora
|
a772c6dd8f
|
Added space before "target=" when added to href
Fixes bug where the first links in markdown boxes don't work
|
2014-11-01 23:04:00 +05:30 |
|
|
Alice Harris
|
28e89b9bbd
|
add Dated tab for To-Dos, and renamed other two To-Do tabs to save space
|
2014-11-01 20:35:11 +10:00 |
|
|
Alice Harris
|
3451315ef6
|
add Dated tab for To-Dos
|
2014-11-01 20:34:36 +10:00 |
|
|
Alice Harris
|
9ea0db88c1
|
remove previous method for hiding/showing remaining/completed To-Dos, and add new method
|
2014-11-01 19:54:41 +10:00 |
|
|
Alice Harris
|
246fa799b7
|
remove unnecessary commented-out code
|
2014-11-01 19:52:58 +10:00 |
|
|
Alice Harris
|
ff962b5959
|
allow To-Do add form to appear even when viewing completed To-Dos
|
2014-11-01 19:46:50 +10:00 |
|
|
Alice Harris
|
db411a440d
|
remove previous method for hiding/showing remaining/completed To-Dos
|
2014-11-01 19:43:08 +10:00 |
|
|
Matteo Pagliazzi
|
b858aece51
|
Merge pull request #4201 from crookedneighbor/href-to-nghref
Updated href with angular expression to ng-href
|
2014-11-01 10:19:38 +01:00 |
|
|
Alice Harris
|
876d1d435d
|
change Fetch Recent Messages from tooltip to button text
|
2014-11-01 11:42:48 +10:00 |
|
|
Alice Harris
|
372869d709
|
enable feature to block chat until user agrees to guidelines
|
2014-11-01 11:03:01 +10:00 |
|
|
Alice Harris
|
0963f0fc0a
|
Merge pull request #4114 from Alys/lynnyliz-develop
changes made by lynnyliz to reorganise the mounts page (with fixes for merge conflicts, etc)
|
2014-11-01 10:25:38 +10:00 |
|
|
Alice Harris
|
48cfd1c2a1
|
convert JackOLantern-Base pumpkin pet code to commented-out example code for future use
|
2014-11-01 07:30:40 +10:00 |
|