5a6c9fbf84
Added some logic for adding flags
2014-12-07 13:50:46 +01:00
74b94e6764
Removed flag from system notifications
2014-12-07 13:50:46 +01:00
c44c607ae7
Renamed flagChat to flagChatMessage
2014-12-07 13:50:46 +01:00
a2cf14324c
Added a flags key to message object
2014-12-07 13:50:46 +01:00
62d92db332
Added buttons to footer, cleaned up functions
2014-12-07 13:50:46 +01:00
c90ea166d4
Corrected tooltip name
2014-12-07 13:50:46 +01:00
01c0ce1722
Added text-danger span on username
2014-12-07 13:50:46 +01:00
6fcf1846b3
Renamed everything from flag to abuseFlag
2014-12-07 13:50:46 +01:00
00abb168a1
Added heading and body of flag modal
2014-12-07 13:50:46 +01:00
5e1e1b2c13
Flag icon opens blank modal
2014-12-07 13:50:46 +01:00
d0cf285468
Merge pull request #4358 from andymantell/feature/linking-timetravellers-names
...
Link for Tyler and Vicky's names
2014-12-06 16:48:09 -06:00
6739ec25a3
Merge pull request #379 from andymantell/feature/linking-timetravellers-names
...
Link for Tyler and Vicky's names
2014-12-06 16:48:00 -06:00
8ba6bcddde
Merge pull request #4354 from crookedneighbor/markdown-lists-in-tasks
...
Adjusted margin for markdown list in task-text.
2014-12-06 16:42:31 -06:00
60f3e0032e
Adjusted margin for markdown list in tast-text. Closes #2721
2014-12-06 16:41:59 -06:00
3de86f35cb
fix(plans): attempted fix for: Cast to number failed for value "NaN" at
...
path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317
2014-12-06 12:49:19 -07:00
17f9d4de72
fix(i18n): fix english string
2014-12-06 19:18:28 +01:00
cb9083d9ba
fix(webhooks): don't send webhooks if not valid url (also if not
...
enabled), fixes #4357
2014-12-06 10:25:41 -07:00
82cea43e07
Link for Tyler and Vicky's names
2014-12-06 15:42:32 +00:00
58359f1e89
Link for Tyler and Vicky's names #4351
2014-12-06 15:42:12 +00:00
b23a76f8c8
Merge pull request #365 from crookedneighbor/fix-moment-deprication-warnings-on-tests
...
Corrected ordering of arguments for moment().add and moment().subtract
2014-12-06 00:56:16 -06:00
66f913e833
closes #4353 . If time on chat would break onto new line, just puts whole
...
time statment on new line
2014-12-05 23:51:07 -06:00
024e606f5c
Merge pull request #4348 from crookedneighbor/fix-transparent-challenge-buttons
...
Adjust transparent class of challenge buttons.
2014-12-05 22:17:38 -06:00
2018cc84ab
fix(gem-cap) use customerId in gem purchase
2014-12-05 15:11:27 -07:00
7ab5456c2a
Merge pull request #4352 from crookedneighbor/show-gem-purchases-with-customer-id
...
Converted planId to customerId as test for whether or not gems can be purchased.
2014-12-05 14:56:41 -07:00
ae62a04497
Converted planId to customerId on whether or not gems can be purchased.
...
Closes #4340
2014-12-05 15:53:53 -06:00
ea869a4487
Adjust trasnparent class of challenge buttons. Closes #4346
2014-12-05 15:13:34 -06:00
f010bd7ad9
chore(i18n): update locales
2014-12-05 16:21:13 +01:00
6380584f46
Merge pull request #4343 from HabitRPG/revert-4342-revert-4329-tranlsate-mystic-items
...
Revert "Revert "Tranlsate mystic items""
2014-12-05 16:07:33 +01:00
0450e2b924
Revert "Revert "Tranlsate mystic items""
2014-12-05 16:07:27 +01:00
09aeaf2812
Merge branch 'crookedneighbor-translate-mystic-items' into develop
2014-12-05 16:06:51 +01:00
198d41d5e8
fix(pr): conflicts
2014-12-05 16:06:15 +01:00
6ad4f5004d
Merge pull request #4342 from HabitRPG/revert-4329-tranlsate-mystic-items
...
Revert "Tranlsate mystic items"
2014-12-05 16:03:50 +01:00
1d1de38956
Revert "Tranlsate mystic items"
2014-12-05 16:03:41 +01:00
a1075a5193
Merge pull request #4329 from crookedneighbor/tranlsate-mystic-items
...
Tranlsate mystic items
2014-12-05 16:02:34 +01:00
4aacc103db
Merge pull request #377 from SabreCat/gems
...
Prettify Market Gem
2014-12-04 20:31:45 -06:00
aa346c9271
Merge pull request #4328 from SabreCat/gems
...
Add available Gems counter to Market
2014-12-04 20:30:46 -06:00
7dd16a06e6
Revert "fix(style): Make pet key a SPAN"
...
This reverts commit 63ea851fdb
2014-12-04 20:26:50 -06:00
a0434e67a6
Revert "fix(style): Pet key margins like sub gems"
...
This reverts commit d584e998ba
2014-12-04 20:26:27 -06:00
d584e998ba
fix(style): Pet key margins like sub gems
2014-12-04 20:14:16 -06:00
63ea851fdb
fix(style): Make pet key a SPAN
2014-12-04 20:13:26 -06:00
5986643f1e
Corrected strings so they only use one variable
2014-12-04 20:03:31 -06:00
6dac81f850
Corrected strings so they only used on variable
2014-12-04 20:03:17 -06:00
532f5d1c53
Converted strings to be able to use links
2014-12-04 19:49:36 -06:00
21ca49345d
Moved time travelers and hourglass strings to shared
2014-12-04 19:49:36 -06:00
f2c6c07ff8
fix(Gems): Clarify badge count
2014-12-04 19:04:47 -06:00
6369934ca3
feat(Gems): Add strings for Market gem
2014-12-04 19:04:07 -06:00
efcf9099f4
Adjusted count for remaining gem count
2014-12-04 18:47:28 -06:00
f3fc6644b8
refactor(paypal): some plan debugging cleanup
2014-12-04 16:16:53 -07:00
c9b0898499
fix(style): help emoji line up with task text
...
Adds a `vertical-align` property to `span.emoji` so adding an emoji to a task doesn't cause it to bounce out of alignment with the rest of the task's text.
2014-12-04 16:32:00 -06:00
6b8a4f966b
Merge pull request #4321 from sbreiler/develop
...
Fix #2879 (Check-Icons)
2014-12-04 08:15:38 -06:00
Blade Barringer