632d0fdf5d
Merge pull request #4299 from pollockjj/develop
...
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261 )
2014-11-30 18:41:51 -06:00
96f8f2cdd5
refactor(inventory): move all special items into single category
...
"special" (cleaner)
2014-11-30 13:12:28 -07:00
2ee6f0ed61
feat(Bailey): November subscription reminder
2014-11-30 11:50:31 -06:00
44baa822c8
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:50:39 -06:00
6520caed7d
Modified to 15px border and lock icon based on feedback from dev team
2014-11-29 21:56:10 -06:00
0f3070e334
Allow send messages to yourself - see #4295
2014-11-30 01:52:46 +01:00
9abaedc7c5
Modified two-line solution for ticket #4261 to one-line based on feedback/solution from B. Barringer
2014-11-29 13:17:54 -06:00
e4b2351b42
Removed extraneous space
2014-11-29 12:53:19 -06:00
223cac838e
Added one time binding to ng-if
2014-11-29 12:52:34 -06:00
3a29eef799
Removed pm symbol if sent by own user
2014-11-29 12:30:15 -06:00
e0f09cd468
Removed option to send private message if it would go to system. Closes
2014-11-29 12:26:28 -06:00
1a567ce82f
Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds ( #4261 ). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate
2014-11-29 12:25:21 -06:00
3204418af1
Revert #4291
...
This reverts commit a1ea6869b7
2014-11-29 09:16:44 -07:00
e63f2b6d97
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
9a1b209da1
Corrected indentation error
2014-11-28 19:41:11 -06:00
607c72049c
Merge pull request #4291 from sbreiler/develop
...
Fix #4259
2014-11-28 20:51:04 +01:00
28b25c6b89
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:55:01 +01:00
64a76566a0
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:52:03 +01:00
a1ea6869b7
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
Fixes health, level and mana bar.
2014-11-27 22:47:52 +01:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
be3342cb26
feat(event): Thanksgiving Bailey
2014-11-26 19:34:16 -06:00
1e5b7e6f2d
fix( #4282 ): refactor for DRY unlock/hide paths
2014-11-26 10:49:49 -07:00
0278caca76
fix( #4282 ): fix $parse errors in avatar customize screens
2014-11-26 10:49:49 -07:00
c0a3fc887a
fix(costume): better fix for #4274
2014-11-26 12:26:41 +01:00
43fa461a67
fix(costume): fixes #4274
2014-11-26 12:19:33 +01:00
afbd2199e8
fix(datepicker): fixes #4273
2014-11-26 11:51:44 +01:00
d24ece973b
fix(food): popover-placement='top' in foodtray, fixes #4278
2014-11-25 15:26:42 -07:00
f0b3da295c
re-enable +1 button, add spaces before delete button, add "quick reply" to Tavern/guilds/party chat
2014-11-25 14:50:01 +10:00
0f7f30aa12
bailey: private messages & november mysteries
2014-11-24 19:36:44 -07:00
5f654c4dad
fix(private-messages): move PM buttons to bottom-left of modal
2014-11-24 19:11:49 -07:00
478cba9a5a
feat(members): add options: $modal.open({size, windowClass}). Use those
...
to make avatar modal wider, and "100% window height" (see code, it's kinda hacky)
2014-11-24 18:59:27 -07:00
36ffd8a8b2
fix(quick-reply): only show quick-reply in inbox (cc @crookedneighbor)
2014-11-24 18:14:17 -07:00
c309cb2342
Merge pull request #4267 from crookedneighbor/quick-reply
...
Quick reply
2014-11-24 18:11:43 -07:00
7ea8ff70ae
Added additional env.t declarations for pm modal
2014-11-23 21:33:14 -06:00
d8c30fc885
Added env.t for member modal to allow for translations
2014-11-23 21:19:40 -06:00
bf586cbc17
Added env.t declarations for translations
2014-11-23 21:16:32 -06:00
f16d9d609e
Added quick reply button (doesn't load in the correct parameters for
...
sending a msg)
2014-11-23 20:29:27 -06:00
19fb81aafd
Merge pull request #4248 from crookedneighbor/add-uuid-to-user-data-link
...
Added uuid parameter to data link
2014-11-22 12:08:51 +10:00
ecef457d2b
fix(private-messages): glyphicon-ban-circle (@Alys @crookedneighbor)
2014-11-21 10:40:57 -07:00
743df194c7
feat(private-messages): add a "clear all" button
2014-11-21 08:42:24 -07:00
f5415ac6c5
feat(private-messages): start implementing private messaging (includes blocking). Start experimenting with reflists for PMs, instead of arrays
2014-11-20 19:03:01 -07:00
ebebcea34b
fix(webhooks): sort webhooks by created, use angular-filter for sorting object
2014-11-19 15:42:14 -08:00
2023cf852e
chore(bower): upgrade angular to 1.3.3. Remove
...
bindonce (incompatible). Note, bindonce="..." attrs still need to be
converted to their {{::}} equiv for better performance, but this is
functional for now
2014-11-19 14:32:45 -08:00
f922a0337f
bailey(owl)
2014-11-18 23:18:53 -08:00
bf8882e8f5
feat(quest): Add owl to purchasable quest eggs
2014-11-18 19:37:57 -06:00
cb3ebccbbf
feat(invite-friends): obfuscated invite
2014-11-18 16:38:43 -08:00
487f8afe30
feat(help): add tour to help menu
2014-11-18 12:00:33 -08:00
f7f4473590
fix(payments): allow resubscription after unsubscribe
2014-11-17 19:51:03 -08:00
6ef838cf1a
feat(webhooks): move webhooks from array to object (everything should
...
really be stored as objects). Add to API routes (see
HabitRPG/habitrpg-shared#83a22b8). Note, sorting doesn't work. Meh.
2014-11-16 20:03:56 -08:00
21d6b71d37
Merge branch 'webhooks' into develop
...
Conflicts:
src/controllers/user.js
2014-11-16 15:24:15 -08:00
Blade Barringer