Sam
f8dec65b95
BUGFIX: setting title to aggressively
2014-06-17 11:32:59 +10:00
Sam
92772bbf1d
BUGFIX: icons all red
2014-06-17 11:09:01 +10:00
Sam
1af8a2fb63
BUGFIX: keeping noscript in DOM
2014-06-17 11:01:48 +10:00
Sam
56dcd00570
BUGFIX: trust_level_0 group not including trust_level_1
...
BUGFIX: manual trust level change not adding user to groups
BUGFIX: system not in correct trust level groups
2014-06-17 10:52:02 +10:00
Sam
73a4309723
Merge pull request #2444 from riking/my-fix
...
Allow all /my URLs
2014-06-17 09:32:03 +10:00
Jeff Atwood
5db621c5fe
normalize to search.title for search help
2014-06-16 16:20:57 -07:00
Jeff Atwood
a0d9dcce17
improve hint on admin user search
2014-06-16 16:17:41 -07:00
Robin Ward
eedb0df4fb
ES6: Just a couple of views
2014-06-16 15:55:09 -04:00
Neil Lalonde
2cd55b1fa2
FIX: topics in private sub-categories were visible to everyone on the categories page
2014-06-16 15:12:14 -04:00
Robin Ward
d53ac36818
FIX: New action arriving in stream via message bus
2014-06-16 14:49:58 -04:00
Robin Ward
1147b9d2e5
Merge pull request #2408 from peternlewis/pop3_insecure
...
Support for insecure POP3 (without SSL)
2014-06-16 11:51:44 -04:00
Robin Ward
198fc3db56
Merge pull request #2449 from ligthyear/plugin-outlet-defaults
...
Plugin-Outlets-defaults for template overriding
2014-06-16 11:36:40 -04:00
Neil Lalonde
e2d8f04ec0
FIX: allow saving profile preferences when name field is blank
2014-06-16 11:23:15 -04:00
Neil Lalonde
1f17871b0c
FIX: chrome password manager, for reals fix
2014-06-16 11:23:15 -04:00
Neil Lalonde
b702ad2d54
Don't disable the composer's submit button. Let it be clicked to cause validation error messages to show.
2014-06-16 11:23:14 -04:00
Robin Ward
88b5e78424
Merge branch 'add_custom_embed_by_username' of github.com:justinleveck/discourse into justinleveck-add_custom_embed_by_username
...
Conflicts:
config/site_settings.yml
2014-06-16 10:52:15 -04:00
Benjamin Kampmann
22d93bc43a
Let Plugin-Outlet Render inner template data
...
- allows passing of template data to the plugin-outlet to be rendered if no plugin is using that slot
- acts as a fallback when no plugin is found
- allows wrapping of existing features inside a plugin-outlet that then plugins can overwrite with their own behaviour
- backwards compatible
- uses invisible emberviews (as Ember.Component does)
- the template has full-access to the controller and view, should be totally transparent
2014-06-16 15:10:10 +02:00
Sam Saffron
92d2912ff2
Revert "Bugfix: Mailing list mode disables PM emails"
...
This reverts commit 6a2dde6417
.
2014-06-16 16:36:02 +10:00
Sam
1542854a93
Merge pull request #2420 from peternlewis/mailing_list_mode_disables_private_message_emails
...
Bugfix: Mailing list mode disables PM emails
2014-06-16 16:32:05 +10:00
Sam Saffron
03cde003db
BUGFIX: no network could mean no posts save.
2014-06-16 12:14:51 +10:00
Sam Saffron
944cda1f73
BUGFIX: do not strip spaces from raw_hash of posts
2014-06-16 12:14:06 +10:00
Sam Saffron
6f88fc3aa3
HACK: disable undo/redo editor functionality
...
TODO in a few weeks, rip out all code.
2014-06-16 10:39:51 +10:00
Jeff Atwood
258c353307
Merge pull request #2445 from techAPJ/invitation-patch
...
Consider User trust level while showing Invites tab
2014-06-15 03:15:34 -07:00
Jeff Atwood
00e285f55b
remove legacy (deleted) username under avatar
2014-06-15 01:32:05 -07:00
Arpit Jalan
42375866cc
Consider User trust level while showing Invites tab
2014-06-15 13:21:10 +05:30
Jeff Atwood
30ee16a72b
add glyph to remove invite button
2014-06-14 16:13:17 -07:00
Jeff Atwood
1b3180f916
better copy for site and topic invites
2014-06-14 15:49:19 -07:00
riking
6e698315d6
Allow all /my URLs
...
Previously, URLs like /my/activity/posts were denied. This change allows those URLs.
2014-06-14 10:58:20 -07:00
Robin Ward
6f8888d405
XSS: Topic links needed sanitization
2014-06-14 12:53:48 -04:00
Robin Ward
dc6f30dd94
Don't focus on text field in mobile view when tapping the progress
2014-06-14 11:51:15 -04:00
Robin Ward
fb639bc5f9
FIX: Remove extra setting of view
2014-06-13 16:42:18 -04:00
Neil Lalonde
c1f9d76323
Don't disable the Sign In button in the sign in modal
2014-06-13 16:07:28 -04:00
Robin Ward
3c8a610f73
Extra safety to the post stream. Don't return undefined
if we can't
...
retrieve a post for some reason.
2014-06-13 16:00:39 -04:00
Robin Ward
929a195c5d
Merge pull request #2442 from techAPJ/add-tooltip-to-glyph
...
Add tooltip to Admin & Moderator glyph
2014-06-13 15:19:24 -04:00
Arpit Jalan
9e0cf55758
Add tooltip to Admin & Moderator glyph
2014-06-14 00:37:55 +05:30
Robin Ward
17d341ff86
FIX: crawler versions of the page need the updated bio relationships.
2014-06-13 14:55:32 -04:00
Andrew Bezzub
9ffd173873
move bio to UserProfile from User
2014-06-13 14:55:32 -04:00
Robin Ward
4a2d6bd5da
Merge pull request #2439 from peternlewis/mailing_list_mode_disables_private_message_emails2
...
Bugfix: Mailing list mode disables PM emails (take 2)
2014-06-13 14:46:38 -04:00
Robin Ward
cf165320e2
Keyboard shortcuts for new progress expansion
2014-06-13 14:03:12 -04:00
Robin Ward
42ca46e628
Highlight posts when jumping to them.
2014-06-13 14:03:12 -04:00
Robin Ward
e449d64ae1
ES6: Remove an unncessary view
2014-06-13 11:24:28 -04:00
Sam
00469e976d
BUGFIX: Don't depend on localStorage for Discourse to function
2014-06-13 16:42:01 +10:00
Sam
0ffa98904f
BUGFIX: mobile styling
2014-06-13 16:14:58 +10:00
Sam
5815e12caf
BUGFIX: omit the "reply" word in mobile view
2014-06-13 16:03:25 +10:00
Sam
87baf58dbb
SECURITY: XSS fix
2014-06-13 13:20:57 +10:00
Jeff Atwood
ae46e439b8
make autocomplete use highlight color for selecting
2014-06-12 15:30:21 -07:00
Robin Ward
29b8330dc3
Move up/down buttons on top of go
2014-06-12 17:24:11 -04:00
Robin Ward
d37195796f
FEATURE: New expandable progress bar with jump buttons and jump to
...
arbitrary post.
2014-06-12 16:52:33 -04:00
Robin Ward
33e9bc68fc
Split Topic Progres widget into its own controller, view, template
2014-06-12 16:52:33 -04:00
Robin Ward
efc70a2bca
Always show Bookmark icon. Always show edit if the post is a wiki.
2014-06-12 11:21:12 -04:00
Robin Ward
61bba4d074
ES6: More views converted and deprecated
2014-06-12 11:21:12 -04:00
Peter N Lewis
f9830fb480
Bugfix: Mailing list mode disables PM emails (take 2)
...
Mailing List Mode disables normal emails, but mailing list mode does not email private_messages.
To avoid this, mailing list mode should only disable emails if they are not private_messages.
There are no tests for this commit as UserNotifications does not appear to be instantiated in the spec suite.
2014-06-12 20:25:20 +08:00
Arpit Jalan
9db6c4d05d
Fix broken markup on invites tab
2014-06-12 17:31:17 +05:30
Jeff Atwood
6ceebc3f1c
Merge pull request #2435 from techAPJ/add-bookmark-menu
...
FEATURE: Add Bookmarks menu to user dropdown
2014-06-12 03:28:40 -07:00
Sam
76166567fb
Use the cheap Defer queue as opposed to sidekiq for view tracking.
2014-06-12 11:29:29 +10:00
Sam
8c7363bdd5
BUGFIX: not clearing blue notifications correctly when you have a PM
2014-06-12 10:50:41 +10:00
Sam
9bbfb1ea15
BUGFIX: not binding correctly to notifications that popped up AFTER element was inserted
2014-06-12 10:50:10 +10:00
Sam
d3becd2969
SECURITY: fix XSS
2014-06-12 10:17:41 +10:00
Jeff Atwood
90fca1ba17
bigger category stat numbers
2014-06-11 16:35:58 -07:00
Jeff Atwood
d58ed9eafb
Merge pull request #2436 from ArmedGuy/master
...
Deboxify topic-map
2014-06-11 16:00:30 -07:00
Robin Ward
26689d34b8
A little extra robustness for the post stream
2014-06-11 17:31:30 -04:00
Régis Hanol
5e461a22ee
BUGFIX: enable the 'relative timestamp' share dialog on mobile view
2014-06-11 22:32:45 +02:00
Arpit Jalan
aed2483bb9
FEATURE: User Bookmarks Menu
2014-06-12 01:54:54 +05:30
Neil Lalonde
404021be7b
FIX: wrong i18n key on Take Action button
2014-06-11 16:20:57 -04:00
Robin Ward
c90b609aa5
FIX: Reply button broke
2014-06-11 15:16:33 -04:00
Robin Ward
d40ec22bef
Always show your own edit button
2014-06-11 14:38:57 -04:00
Robin Ward
b749585aa7
REFACTOR: Only show ellipsis if there is more than 1 thing behind it.
2014-06-11 14:31:03 -04:00
Robin Ward
176120cbc1
REFACTOR: Keyboard Shortcuts should send their actions directly to
...
posts, not by activating clicks on buttons.
2014-06-11 14:31:03 -04:00
Régis Hanol
ce732d2252
FEATURE: new "disable_edit_notifications" site setting
...
Should be used whenever you activate the "download_remote_images_to_local" site setting to prevent users from receiving a lot of edit notifications from the system user.
2014-06-11 17:14:00 +02:00
Robin Ward
f822491886
ES6: Convert a couple view helpers. They should probably be components
...
evnetually!
2014-06-11 11:05:49 -04:00
Régis Hanol
18489ba83a
BUGFIX: proper regex escaping
2014-06-11 16:37:26 +02:00
Régis Hanol
2f23ee1830
BUGFIX: keep transparent background in avatars
2014-06-11 16:01:01 +02:00
Sam
03087679f0
FEATURE: Support custom preferences for users, injected by plugins
2014-06-11 15:50:37 +10:00
Sam
62abb873df
FEATURE: support serializing user custom fields by plugins
2014-06-11 11:57:22 +10:00
Neil Lalonde
1691d52882
FIX: mobile: reduce height of composer a bit to make room for android devices
2014-06-10 17:12:50 -04:00
Neil Lalonde
877302884b
FIX: notification badge colors on mobile
2014-06-10 17:12:50 -04:00
Robin Ward
d06720d059
REFACTOR: Remove animation from ellpisis post menu, change ordering of
...
buttons.
2014-06-10 15:27:43 -04:00
Robin Ward
9472d65059
FIX: Swapping one topic with another then scrolling wasn't updating the
...
URL properly.
2014-06-10 13:43:45 -04:00
Robin Ward
e985ffc273
Add link back to logo so it can be copied and pasted and what not.
2014-06-10 13:27:55 -04:00
Régis Hanol
06f37e692d
Merge pull request #2432 from riking/patch-1
...
Change logo link to /
2014-06-10 19:13:07 +02:00
Régis Hanol
0781531e3c
Merge pull request #2415 from techAPJ/bulk-invite-users-5
...
FEATURE: Bulk Invite
2014-06-10 19:11:11 +02:00
riking
3bbb035891
Change logo link to /
2014-06-10 10:10:56 -07:00
Régis Hanol
3b6b2770f3
BUGFIX: date of the post in the share dialog is now properly bound
...
CLEANUP: removed all unused handlebars helpers
REFACTOR: removed 'unbound' prefix (for performance reasons, helpers are unbound by default)
REFACTOR: added 'bound' prefix to bound helpers
REFACTOR: renamed helper using 'foo-bar-foo' syntax (instead of camel case)
2014-06-10 19:04:31 +02:00
Robin Ward
580a1bf8b0
ES6: Migrated and deprecated a bunch of views
2014-06-10 11:54:38 -04:00
Sam
e129e4a19e
BUGFIX: scrolled never ever fired :(
2014-06-10 22:24:52 +10:00
Benjamin Kampmann
8167207e38
Wrap extended post actions in ellipsis.
...
Add a new SiteSetting to specify a maximum of items to be shown in post action menus per default. If more buttons are rendered and those after mentioned maximum will be hidden behind a collapsible ellipsis-button. Once clicked it slides in the missing buttons and hides itself.
If the setting is set to 0, the ellipsis will not be applied. It default is set to 4 though.
All buttons are created equal - but the Reply-Button is more equal than others: If it is rendered, the reply button will never be hidden behind the ellipsis. The max count is exclusiding the reply button and its position would make the reply button hide, it is removed there and pushed to the end of the list.
2014-06-10 09:55:07 +02:00
Sam
cbb2cc3911
BUGFIX: fix ~ and ` navigation
...
Was completely broken.
2014-06-10 16:10:19 +10:00
Sam
6a089122e8
Minor optimisation avoid set in hot code path
2014-06-10 15:07:38 +10:00
Sam
383f0290a4
FEATURE: higher slack ratio out of the box
...
I upped the slack ratio for a few reasons
1. We render ucloaked anyway on first render,
so cloaking really is not saving much
2. On mobile you don't get JS events so you need
a lot more slack to minimize white screens
3. Vast majority of memory is used by object model,
if we want to tame it we need to remove posts from stream
ember cloaking now supports high slack ratios without going into a tail spin
2014-06-10 15:07:37 +10:00
Sam Saffron
2042ed02ec
BUGFIX: notifications cleared incorrectly
...
The notifications panel would reset itself
if you got a notification while it was open
New behavior, we refresh the panel live, blue notification
is cleared automatically if its open.
If window is not visible it will close the notifications panel,
that way you don't miss notifications by accident.
2014-06-10 11:44:49 +10:00
Sam Saffron
9f56d7d19d
BUGFIX: unclearable blue unread circles
...
There were 2 issues:
1. We were resetting our tracking on large amounts of idle time
2. We used focus trakcing which is fragile and broken on iPad vs page visibility API
2014-06-10 10:03:29 +10:00
Neil Lalonde
56cd60f226
FIX: there are site settings for username min and max lengths. Neat.
2014-06-09 18:26:42 -04:00
Robin Ward
c6b92f0ef7
FIX: Support for nested bold/italics in MD
2014-06-09 17:46:36 -04:00
Neil Lalonde
c61462662b
Add ability to run validation on site settings. notification_email and other email address settings are now validated.
2014-06-09 16:59:20 -04:00
Justin Leveck
a78df3d57d
Add custom embed_by_username feature
...
Feature to allow each imported post to be created using a different discourse
username. A possible use case of this is a multi-author blog where discourse
is being used to track comments. This feature allows authors to receive
updates when someone leaves a comment on one of their articles because each of
the imported posts can be created using the discourse username of the author.
2014-06-09 12:35:38 -07:00
Neil Lalonde
78d46a81e1
FIX: js needs to use same max username length as server
2014-06-09 15:28:03 -04:00
Robin Ward
59ef38bb88
FIX: Load order for pagedown-preview
2014-06-09 15:15:39 -04:00
Régis Hanol
2abcbcc29b
FEATURE: add real date of post in the share dialog when triggered from the post date
2014-06-09 21:14:03 +02:00
Robin Ward
9d96fc6370
FIX: Back button not working well to latest
2014-06-09 14:05:26 -04:00
Robin Ward
7adb545168
ES6: Convert {{pagedown}} to {{pagedown-editor}} with deprecations
2014-06-09 12:16:27 -04:00
Robin Ward
1df3214773
ES6: Convert header view
2014-06-09 11:34:38 -04:00
Robin Ward
c176dc07c1
Merge pull request #2421 from peternlewis/reply_to_name
...
Use an appropriate name in the Reply-To header
2014-06-09 11:04:53 -04:00
Robin Ward
b16c18e667
Merge pull request #2424 from abezzub/website
...
Move website from User to UserProfile
2014-06-09 11:00:20 -04:00
Arpit Jalan
727184641e
FEATURE: Bulk Invite
2014-06-09 01:43:39 +05:30
Johan Jatko
5e43100fe5
Deboxify topic-map
2014-06-08 21:34:22 +02:00
Jeff Atwood
61bcdb926a
make create new account a big button vs. link
2014-06-07 22:27:41 -07:00
Andrew Bezzub
0a42901c40
do not use try in UserSerializer for fields coming from UserProfile
2014-06-07 13:30:35 -07:00
Arpit Jalan
42d6cf90f6
Fix Badge Spacing
2014-06-08 00:17:33 +05:30
Andrew Bezzub
7db31adf35
move website from User to UserProfile
2014-06-06 21:54:32 -07:00
Johan Jatko
c6a8c095f2
Deboxify .nav-stacked on user-page
2014-06-07 04:41:14 +02:00
Sam
0f37699d5f
BUGFIX: broken schedule
2014-06-07 10:25:15 +10:00
Neil Lalonde
b031327a46
Reverse the order of rows in a report so today is first
2014-06-06 17:08:35 -04:00
Neil Lalonde
4f90869618
Add content :bottom to the bottom of every page, as it says it should
2014-06-06 16:48:17 -04:00
Régis Hanol
aa71d15b7d
TRIVIAL: uses the new attribute
2014-06-06 19:00:00 +02:00
Régis Hanol
8262279380
update ember-cloaking to support bottom fixed element
2014-06-06 18:59:07 +02:00
Robin Ward
6048c9e100
Let's switch back to using post numbers rather than last
for links to
...
the last post. We'll keep support for the old format, but start linking
directly to the last post.
2014-06-06 10:14:43 -04:00
Peter N Lewis
d0ebdea5fa
Honor email_always even if notification has been read
...
Even if the notification has been read, send it by email if user has enabled email_always
2014-06-06 21:16:41 +08:00
Peter N Lewis
0af1242aa8
Use an appropriate name in the Reply-To header
...
Use "Site Name <>" for the Reply-To header when the reply is to the site or a public topic.
Use "username <>" for the Reply-To header only when the reply is to a private message topic.
2014-06-06 21:09:00 +08:00
Sam
cc1bbf3a7b
BUGFIX: cut up line while searching in chrome mac
2014-06-06 17:15:14 +10:00
Peter N Lewis
6a2dde6417
Bugfix: Mailing list mode disables PM emails
...
Emailing a PM uses the user_posted event/format, but Mailing List Mode disables emails with this format.
We work around this by temporarily using "postedprivate", and then reverting back to "posted" efter the Mailing List Mode check.
2014-06-06 15:04:33 +08:00
Sam
41b15d1ad1
BUGFIX: not notifying unread and new counts correctly
2014-06-06 15:17:02 +10:00
Sam Saffron
d97ceb1d72
FEATURE: log_out endpoint for admins
2014-06-06 13:02:52 +10:00
Jeff Atwood
221fc2aef4
Merge pull request #2417 from adamloving/doc-fixes
...
Minor fixes to documentation and comments
2014-06-05 14:49:59 -07:00
Jeff Atwood
c27e70849e
Merge pull request #2418 from kevinreese/master
...
restore bg-color for New Topic / New Post rows of Topic-List Categories
2014-06-05 14:46:50 -07:00
Robin Ward
97715b33d5
FIX: Composer wasn't displaying errors correctly. The fix is a hack
...
around our weird view structure that we need to fix.
2014-06-05 17:06:42 -04:00
Neil Lalonde
cc257e1f5c
Boolean site settings don't save immediately
2014-06-05 17:02:15 -04:00
Robin Ward
651def63e5
Return the current user's custom fields
2014-06-05 16:16:45 -04:00
Robin Ward
6ae7d48fd1
FIX: Make sure the context of plugin outlets is correct
2014-06-05 15:20:55 -04:00
Robin Ward
e65283ecf5
ES6: Convert a view, adds a backwards compatibility layer with
...
deprecations for the old view helper names.
2014-06-05 15:09:20 -04:00
Kevin Reese
49ef3958c5
restore bg-color for New Topic / New Post rows in Topic-List Categories table
2014-06-05 11:58:20 -07:00
Adam Loving
efcd6396cf
fix route in comment
2014-06-05 09:52:01 -07:00
Régis Hanol
c46b7f6181
TRIVIAL: ES6ify AppEvents
2014-06-05 18:51:39 +02:00
Régis Hanol
2cb6bec014
BUGFIX: progress bar was hidden when the composer was open - TAKE 2
2014-06-05 18:39:26 +02:00
Neil Lalonde
04e94bec5f
Mobile: on a post, put username, name, and title on their own lines beside the author avatar
2014-06-05 12:32:48 -04:00
Neil Lalonde
a3c148407c
Mobile: don't show edit reason and in reply to details in composer
2014-06-05 12:09:08 -04:00
Neil Lalonde
bd92291b26
When javascript disabled, add category links to topic list and topic page
2014-06-05 11:14:06 -04:00
Robin Ward
06965a999e
Use replaceWith
in order to not break the back button.
2014-06-05 10:18:31 -04:00
Benjamin Kampmann
6b3d5c7348
add min_posts, max_posts to filter the topic list queries
...
superseeds #2412
2014-06-05 15:30:24 +02:00
Sam
a4de1f25c1
Fix broken tests
2014-06-05 21:16:36 +10:00
Jeff Atwood
17dbc568c8
why did topic-excerpt have 50px padding?
2014-06-05 04:00:50 -07:00
Régis Hanol
425526d3fb
BUGFIX: fix post highlight
2014-06-05 12:31:29 +02:00
Jeff Atwood
d3035b9405
gutter needs more left-margin
2014-06-05 03:07:42 -07:00
Jeff Atwood
3dd61a2056
f**ing bootstrap, span5 = .gutter
2014-06-05 02:57:56 -07:00
Jeff Atwood
f245da5142
f**ing bootstrap, span11 = .embedded-posts body
2014-06-05 02:29:56 -07:00
Jeff Atwood
972d58b876
consolidate post-column into topic-body
2014-06-05 02:02:27 -07:00
Jeff Atwood
3ed8b8f155
f**ing bootstrap, span2 = topic-avatar
2014-06-05 01:42:27 -07:00
Jeff Atwood
48f58eff1d
tweak gutter width a bit
2014-06-05 01:15:06 -07:00
Jeff Atwood
8185fe0097
correct reply-to-tab offsets, based on .row?
2014-06-05 01:00:22 -07:00
Jeff Atwood
80a862c358
f**ing bootstrap, span14 = post-column
2014-06-05 00:34:57 -07:00
Sam
e7991cb803
FEATURE: search highlighting within topic
...
BUGFIX: fixed hiding of the search dialog when navigating within a topic
2014-06-05 17:03:53 +10:00
Jeff Atwood
96fc5addc4
fix some CSS color issues
2014-06-04 23:33:58 -07:00
Sam
c8a0994f24
Remove aggressive highlighting
2014-06-05 14:45:53 +10:00
Sam
f1a28d62a3
FEATURE: support registration of custom html by plugins
2014-06-05 11:39:33 +10:00
Sam
8ec9288a5c
BUGFIX: not showing tooltips correctly
2014-06-05 10:55:45 +10:00
Sam
66b6d6c4dd
BUGFIX: limit hijacking of search for places that have infinite lists of stuff.
2014-06-05 10:23:42 +10:00
Sam
daa5b1f77d
BUGFIX: Ember.run.throttle is dodge.
2014-06-05 09:55:45 +10:00
Robin Ward
24cde6c604
Actually, it *should* be user_path
and not userpage_path
2014-06-04 16:51:48 -04:00
Robin Ward
66fe80c52a
FIX: The page is actually called userpage
2014-06-04 16:44:41 -04:00
Jeff Atwood
42509964da
copyedits on admin PM notifications
2014-06-04 13:39:54 -07:00
Robin Ward
411985de3b
FIX: Recursion with a computed property that was pointing to itself.
2014-06-04 16:33:22 -04:00
Robin Ward
d46fc79344
FIX: winky emoticons were matching with non-spaces before them.
2014-06-04 15:48:27 -04:00
Robin Ward
535c90c298
Merge pull request #2414 from awesomerobot/master
...
fix for the flag badge in dropdowns
2014-06-04 15:02:03 -04:00
Kris Aubuchon
a029daacbb
temp fix for the flag badge in dropdowns
2014-06-04 14:54:24 -04:00
Robin Ward
2e3842084c
If the composer is already open with the same draft, we don't have to
...
close and reopen it.
2014-06-04 14:46:23 -04:00
Régis Hanol
897f219d61
BUGFIX: change the image upload icon when only images are authorized ( fixes #2359 )
2014-06-04 19:51:26 +02:00
Robin Ward
8e7f0aa268
Add back the choices, change the separator options
2014-06-04 12:54:58 -04:00
Régis Hanol
16b1379b01
BUGFIX: uploaded avatar aren't cropped
2014-06-04 18:54:08 +02:00
Régis Hanol
bc7730e0dd
BUGFIX: avatar in history dialog
2014-06-04 18:35:14 +02:00
Robin Ward
e690c1ff14
ES6: Start on some views
2014-06-04 12:18:06 -04:00
Neil Lalonde
b2121cd1d0
FIX: mobile: highlight in expanded quote is highlighted
2014-06-04 12:16:07 -04:00
Robin Ward
a1887c97c6
Merge pull request #2405 from ligthyear/select2-sitesetting
...
AdminUI: Use Select2.js for SiteSetting Lists – adds Autocomplete and DnD-Sorting
2014-06-04 11:47:46 -04:00
Régis Hanol
0df666277d
BUGFIXES: properly deal with bookmarks and deleted posts
...
BUGFIX: removing a bookmark from the activity feed was busted for deleted posts
BUGFIX: delete associated user actions when deleting a post
2014-06-04 17:41:11 +02:00
Kris Aubuchon
ee248b549f
few fixes to the previous navigation update
2014-06-04 09:39:43 -04:00
Régis Hanol
7655066967
BUGFIX: progress bar was hidden when the composer was open
2014-06-04 13:03:14 +02:00
Sam
fc8eef6d98
BUGFIX: blank preview when loading draft.
...
FEATURE: worlds dumbest preview sync.
2014-06-04 17:04:15 +10:00
Sam
cab589ec67
FEATURE: live delete / recover
...
BUGFIX: total post count could be smaller than filtered posts count
BUGFIX: filteredPostsCount not correctly defined
2014-06-04 14:10:54 +10:00
Jeff Atwood
2eac7128dc
Merge pull request #2411 from awesomerobot/master
...
navigation enhancements
2014-06-03 19:36:35 -07:00
Kris Aubuchon
6f91e60bd9
enhancing navigation
2014-06-03 21:59:42 -04:00
Kris Aubuchon
26d113ced0
enhancing navigation
2014-06-03 21:56:50 -04:00
Robin Ward
9453089b11
FIX: Include status=xyz
in queryParams
2014-06-03 18:50:49 -04:00
Neil Lalonde
69abe470c5
FIX: mobile style of edit reason input
2014-06-03 15:25:15 -04:00
Neil Lalonde
d2044700d3
FIX: z-index issue with quote reply button on mobile
2014-06-03 14:43:19 -04:00
Neil Lalonde
ae30e3d348
FIX: on mobile view, never show the show/hide preview link in composer. nexus 7 was showing it.
2014-06-03 14:00:54 -04:00
Neil Lalonde
3e16ac62c3
Add register_color_scheme for plugins
2014-06-03 12:37:29 -04:00
Robin Ward
bb0cf87684
ES6: All components ported over
2014-06-03 12:11:17 -04:00
Robin Ward
80fd714b23
FIX: Use replaceWith
instead of transitionTo
when redirecting to a
...
user's activity. That way the back button works nicely. Also we can now
shorten a lot of links that were going to activity instead.
2014-06-03 10:47:21 -04:00
Robin Ward
3f9c4100ef
Many Plugin upgrades.
2014-06-03 10:33:47 -04:00
Jeff Atwood
0b52e20bff
remove margin-right on .contents .cooked
2014-06-03 03:08:16 -07:00
Sam
86c0d890d6
disable read-state indicator on mobile for now
2014-06-03 15:33:00 +10:00
Sam
6d9d010516
no longer need these bindings for the post menu
2014-06-03 12:40:41 +10:00
Sam
4c55dc0903
Strip confusing bookmark styling
2014-06-03 12:36:39 +10:00
Sam
78378c7ade
re-style read-state indicator
2014-06-03 12:32:33 +10:00
Sam
3405253405
FEATURE: rush posting read times for newly read posts
...
FEATURE: "read" indicator on posts
CHANGE: anon is now assumed to have read everything
2014-06-03 11:48:52 +10:00
Neil Lalonde
5b39913766
FIX: qunit tests pass, re-enable the category notifications dropdown button
2014-06-02 15:51:03 -04:00
Robin Ward
bf749f127c
ES6: Topic Message Map converted
2014-06-02 13:31:42 -04:00
Robin Ward
f839573d85
ES6: Support for views. Quote button proof of concept
2014-06-02 13:31:42 -04:00
Régis Hanol
72130357ed
Merge pull request #2404 from archony/patch-3
...
Remove useless table border
2014-06-02 15:14:43 +02:00
Peter N Lewis
6c05de45b6
Support for insecure POP3 (without SSL)
...
Ideally it would be a menu selection to select POP3, POP3S, and potentially other future protocols like IMAP if desired, but I didn't want to deal with data migration at this point. And then I was going to have a checkbox for "Secure" (on by default, obviously), but that was very hard to word as to how it was different given everything else referred to pop3s and I couldn't change that either. So I settled on a preference:
pop3s_polling_insecure: "Poll using plain text POP3 without SSL"
Off by default.
This makes it very clear that as to what turning on that checkbox will be, and by calling it "insecure" makes sure people will think twice before turning it on.
I have not attempted to do any of the translations of the preference, I'm ot sure how you handle that.
2014-06-02 20:59:10 +08:00
Sam
e087e37907
BUGFIX: blank name causes SSO to explode
2014-06-02 17:32:39 +10:00
Sam
9e9c41ac52
FEATURE: admins can clear screend emails if needed
2014-06-02 16:53:00 +10:00
riking
6431a6b849
Add tooltips to flag dialog
...
re https://meta.discourse.org/t/what-does-take-action-do/16156/4?u=riking
2014-06-01 23:36:18 -07:00
Sam
e7c6a51760
BUGFIX: overflow auto makes more sense here.
2014-06-02 15:48:44 +10:00
Sam
0979e7b9af
BUGFIX: tracking categories was not implemented
2014-06-02 13:55:01 +10:00
Sam
7cba724fdb
BUGFIX: some protection for missing "notification" translations
2014-06-02 13:52:22 +10:00
Sam
ddc3c992b7
Correct unit tests
2014-06-02 13:35:59 +10:00
Sam
7312ee699b
BUGFIX: allow static assets (avatars) for sites that require login
2014-06-02 13:13:06 +10:00
Sam
5e526c033d
BUGFIX: missing avatar on user pages
2014-06-02 12:59:54 +10:00
Sam
fb3e06bd64
BUGFIX: progress was 0 of 100 while a post is in transit
...
BUGFIX: highest_post_number could be incorrect
BUGFIX: incorrect rendering of in-situ post (when its a reply)
2014-06-02 12:56:54 +10:00
Sam
7653262a07
BUGFIX: flashing incorrect avatar while posting
...
BUGFIX: incorrect trophy for admins while posting
2014-06-02 12:56:54 +10:00
Sam
0625465e4a
FEATURE: CTRL+F is useless, use our search instead
2014-06-02 11:21:00 +10:00
Sam
2dc50ced4c
PERF: avoid get in sensitive path
2014-06-02 11:20:37 +10:00
Sam
0be6bcacee
PERF: optimise check
2014-06-02 10:56:16 +10:00
Sam
97eba92a2e
BUGFIX: user screen.width cause it will be more correct
...
BUGFIX: fix deprecation and regression in cloaking
PERF: cache progressWidth super aggresively to avoid reflows
2014-06-02 10:30:16 +10:00
Benjamin Kampmann
eb884f9928
Switch Admin Settings Lists to Select2.js
...
- and use jquery.sortable to allow sorting
- support for autocompletion
2014-06-01 16:36:26 +02:00
Sam
68600f1dce
PERF: eliminate reflow on topic render
2014-06-01 20:53:35 +10:00
Jeff Atwood
46ec6e671a
add slashes to category page units
2014-05-31 15:26:36 -07:00
Jeff Atwood
1d52ac818c
center wiki marker in left gutter
2014-05-31 15:02:54 -07:00
Archon
ed72d4665e
Remove useless table border
2014-05-31 23:03:55 +02:00
Sam
7861cabfa1
FEATURE: posts per page is configurable, so should be desktop slack
2014-05-31 10:19:29 +10:00
Robin Ward
1af2ff6201
ES6: More components moved over.
2014-05-30 12:28:05 -04:00
Sam
69ffce72a0
Remove dead code
2014-05-30 14:50:03 +10:00
Sam
95221ee9c1
rebake based on version, not date
2014-05-30 14:45:55 +10:00
Sam
91b6459f2b
BUGFIX: allow users to pick no avatar
2014-05-30 14:45:55 +10:00
Sam
53c96395a7
Comment out category notification button, it is breaking qunit
2014-05-30 14:45:55 +10:00
Sam
fa6f22dd39
Move letter avatars out of upload system
...
FIX: S3 issues around system avatars
FIX: reduced backup file size
2014-05-30 14:45:55 +10:00
Sam
fe594f5d1e
Merge pull request #2372 from vikhyat/badge-system
...
Multiple grant badges
2014-05-30 10:18:00 +10:00
Sam
1d97a25bb3
Merge pull request #2392 from borhub/allow_css_targetting_of_group_profile
...
Group profile page template: add extra class so that we can differentiate group mode
2014-05-30 10:13:20 +10:00
Neil Lalonde
d5b48c1ec2
FIX: i resolved that merge conflict badly. category notification settings dropdown was never showing.
2014-05-29 20:04:41 -04:00
Jeff Atwood
12add6ea55
invert some topic summary stats
2014-05-29 16:11:25 -07:00
Neil Lalonde
98deb5ff41
Category notification settings dropdown: use common code with topic notification and pin/unpin dropdowns
2014-05-29 18:18:29 -04:00
Catrin
71a7ce1fee
added new glyphs and removed regular glyph from list
2014-05-29 18:18:29 -04:00
Catrin
d1cc91520f
added glyph to dropdown list
2014-05-29 18:18:28 -04:00
Catrin
5726f6f040
minimized button and bugfix
2014-05-29 18:18:28 -04:00
Catrin
5f8ac51059
another bugfix
2014-05-29 18:18:28 -04:00
Catrin
665ff95015
missing semicolon
2014-05-29 18:18:28 -04:00
Catrin
33fcf79444
setting permissions to change category notification levels
2014-05-29 18:18:28 -04:00
Catrin
919999b114
added icon binding
2014-05-29 18:18:28 -04:00
Catrin
66dccfe8d0
clean up
2014-05-29 18:18:27 -04:00
Catrin
772a304fc2
dropdown on categorypage
2014-05-29 18:18:27 -04:00
Neil Lalonde
e6841d0849
FIX: user avatar urls need to be absolute in wordpress api
2014-05-29 17:19:49 -04:00
Neil Lalonde
1926702cff
Merge pull request #2400 from wooyek/translations_pl_PL
...
New pl_PL translations for Polish language
2014-05-29 11:23:27 -04:00
Robin Ward
8132e9cecb
ES6: Just a few components today
2014-05-29 11:21:00 -04:00
Jeff Atwood
cc473f1c5d
better signal on empty category desc
2014-05-29 02:14:08 -07:00
Jeff Atwood
c91c6bbb11
dim the poster expansion right h3s
2014-05-29 01:21:19 -07:00
Jeff Atwood
696a7e2c4d
add location field to user card expansion
2014-05-29 01:12:47 -07:00
Janusz Skonieczny
ff8f70cb1d
New translation per instructions:
...
https://github.com/discourse/discourse/pull/2383#issuecomment-44501238
2014-05-29 09:54:44 +02:00
Jeff Atwood
88494736bb
duplicate color definition
2014-05-29 00:08:01 -07:00
Jeff Atwood
edf58e4657
de-emphasize topic map headers a bit
2014-05-28 23:53:41 -07:00
Jeff Atwood
ad21f7c7af
lighter admin setting description color
2014-05-28 23:35:03 -07:00
Jeff Atwood
4d6ca00e2b
remove user page mini-avatar wrappers
2014-05-28 23:21:27 -07:00
Sam
4b4d775ad9
Add quote post
2014-05-29 16:09:31 +10:00
Sam
2d9db9ebc9
BUGFIX: j/k navigation was scrolling stuff in insane ways on first press
2014-05-29 15:58:05 +10:00
Sam
bb887964b1
BUGFIX: j/k now goes to the suggested topic list correctly.
2014-05-29 15:38:06 +10:00
Sam
5adc486cef
BUGFIX: missing avatars in topic map
...
Cleanup uneeded column
2014-05-29 14:59:14 +10:00
Sam
a47581de18
hmmm, why is this here ...
2014-05-29 14:58:34 +10:00
Robin Ward
f9ca13b33b
ES6: Migrate a few components over
2014-05-28 15:10:23 -04:00
Neil Lalonde
9aba666d3f
Also warn admins when there aren't at least 50 posts
2014-05-28 13:33:48 -04:00
Robin Ward
f0620a7d21
FIX: Sass helper mismatch
2014-05-28 13:12:34 -04:00
Robin Ward
44cbf73399
Merge pull request #2382 from BenLubar/patch-quotes
...
quoting fixes
2014-05-28 12:32:18 -04:00
Robin Ward
0542761de4
Minor CSS fixes for Select2
2014-05-28 12:12:31 -04:00
Robin Ward
f8a05195a1
Support images from the select2 plugin
2014-05-28 12:00:58 -04:00
Robin Ward
2164a25258
Merge pull request #2333 from rhacker/select2
...
feature: use select2 instead of chosen
2014-05-28 11:42:40 -04:00
Sam
1a31eb1d97
job should warn about corrupt user_avatar records
2014-05-28 19:55:33 +10:00
Sam
3e36d0698c
BUGFIX: ensure it tries downloading avatars
2014-05-28 17:57:15 +10:00
Sam
d9f51961c4
BUGFIX: pick gravatar if it was just downloaded
...
BUGFIX: don't go rebaking unless all avatars are downloaded
2014-05-28 16:54:21 +10:00
Boris
66711816cd
Group profile page template: add extra class so that we can differentiate group details from user details in CSS
...
Since the layout of the "user details" section on the Group profile page is very different from a regular User profile page, we need to be able to selectively style the Group profile. Achieve this by adding a CSS flagging class.
2014-05-28 13:27:52 +10:00
Ben Lubar
73946e5402
quoting fixes
...
- allow bbcode quotes to be nested
- don't allow the '=' to be omitted from quotes
- fix some css that made assumptions about nested quotes
2014-05-27 21:46:31 -05:00
Sam
f6753d3d46
FEATURE: automatically rebake out-of-date posts
2014-05-28 12:30:57 +10:00
Sam
2791852bd8
FEATURE: ability to regenerate system avatars as needed
...
BUGFIX: made system letter avatar more thinner for less block look
2014-05-28 12:30:57 +10:00
Sam
b1d5f4440b
Annotate models
2014-05-28 12:30:57 +10:00
Jeff Atwood
5095de815d
Merge pull request #2389 from awesomerobot/master
...
fixing @mention background in quotes and embeds
2014-05-27 11:03:25 -07:00
Robin Ward
7c22d738b6
FEATURE: Add a location field to a user's profile
2014-05-27 13:54:04 -04:00
Kris Aubuchon
971494bf5a
removing max-width on #site-logo from base and putting it back in mobile
2014-05-27 11:58:53 -04:00
Robin Ward
1efa113bea
FIX: Don't route to data-share-url
2014-05-27 11:45:45 -04:00
Kris Aubuchon
d6a9f384aa
fixing @mention background in quotes and embeds
2014-05-27 11:42:59 -04:00
Sam
1e28668e9f
missed one spot where route changed
2014-05-28 01:09:01 +10:00
Robin Ward
663c57a0f0
ES6: Most controllers converted over now.
2014-05-27 10:51:03 -04:00
Sam
50a0c1a751
BUGFIX: fix redirect, correct multisite
2014-05-28 00:15:09 +10:00
Sam
0c86d9ed9e
BUGFIX: proper multisite support for origin pull CDNs
2014-05-27 23:13:42 +10:00
Sam
18bdc4e63e
Add DoS protection to action
2014-05-27 22:29:27 +10:00
Sam
ce6c25afed
Correct query so it scopes correctly
2014-05-27 22:17:04 +10:00
Sam
7c6a0c7690
disable avatars mk2
2014-05-27 21:37:42 +10:00
Sam
57176a9f46
Merge pull request #2387 from velesin/wiki_topic_ie_fix
...
[FIX] Wiki Topic - IE / FF problem with post admin menu.
2014-05-27 20:54:59 +10:00
Sam
6e0f54ba9a
slow down the back fill process a bit
2014-05-27 20:46:17 +10:00
Sam
f733d5532f
BUGFIX: broken like expansion
2014-05-27 19:43:19 +10:00
Sam Saffron
4b611f87e9
use bicubic so we support earlier image magicks like the one in docker
...
TODO upgrade docker base image to latest image magick
2014-05-27 15:38:11 +10:00
Sam Saffron
252e93d0f2
BUGFIX: support CDN for avatars
...
Correct broken spec
Implement S3 support
2014-05-27 14:40:46 +10:00
Vikhyat Korrapati
a79bf11edb
Admin badge creation bug fixes.
2014-05-27 09:03:55 +05:30
Sam Saffron
9262a714bd
BUGFIX: include avatar for system user
2014-05-27 12:38:16 +10:00
Sam
033cbc61bf
BUGFIX: broken spec
2014-05-27 10:08:03 +10:00
Sam
504cfcff96
Fix specs for avatars
...
Implement avatar picker
Correct avatar related jobs
2014-05-27 10:08:03 +10:00
Sam
6c1c8be794
Work in progress, keeping avatars locally
...
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)
user can then pick which they want.
2014-05-27 10:08:03 +10:00
Sam
4ccf07be8c
Improve resize logic so images end up sharper
2014-05-27 09:48:13 +10:00
Robin Ward
5284fb7cbc
New Setting: Don't jump to new posts when replying
2014-05-26 16:39:03 -04:00
Wojciech Zawistowski
d4ae913065
[FIX] Wiki Topic - IE / FF problem with post admin menu.
2014-05-26 22:19:28 +02:00
Robin Ward
7900c7bd2f
Allow multiple subcategories with the same name
2014-05-26 15:33:51 -04:00
Robin Ward
919ae73709
ES6: A few more controllers on a Holiday Monday
2014-05-26 14:40:06 -04:00
Jeff Atwood
13ff9980ac
Merge pull request #2385 from fantasticfears/css_modal
...
fix user/username error class
2014-05-26 11:00:41 -07:00
Robin Ward
fc3ce934f5
Show categories on the user streams for topics.
2014-05-26 13:49:57 -04:00
Robin Ward
b1d2aba0f3
Clean up notifications if a user can't see a topic
2014-05-26 13:26:46 -04:00
Neil Lalonde
b45e9081ca
Merge pull request #2386 from awesomerobot/master
...
merging more styles into base, also fixing <big> abuse
2014-05-26 12:07:02 -04:00
Kris Aubuchon
9c02ad73ac
merging more styles into base, also fixing <big> abuse
2014-05-26 11:33:47 -04:00
Neil Lalonde
8c3770c0b0
Add site setting show_create_topics_notice as a way to hide the 'Create at least 5 topics to get discussion started' message.
2014-05-26 11:20:06 -04:00
Robin Ward
e5a8c606d4
Add primary group class to the username too
2014-05-26 11:14:57 -04:00
Neil Lalonde
c14d754e02
FIX: don't float left all h3's on mobile
2014-05-26 11:00:54 -04:00
Neil Lalonde
96ed5e0e54
FIX: layout problems in composer on mobile
2014-05-26 10:53:05 -04:00
Erick Guan
ecbda44be4
fix user/username error class
2014-05-26 17:46:31 +08:00
riking
2ffea38bb0
Fix up the bind-attr structure
2014-05-25 19:12:28 -07:00
riking
66453c4692
Make timestamp a permalink
2014-05-25 19:10:09 -07:00
Sam
570c4b6300
certain keyboard shortcuts were never tested ever.
2014-05-25 14:59:05 +10:00
Sam
c529cc6f1f
wow, just wow, this has been broken for so long
2014-05-25 14:40:39 +10:00
Sam
107003576e
Simple workaround for username highlighting for long names
2014-05-25 13:54:52 +10:00
Sam
7fbf162666
Logster update
...
cleans up a bunch of messed up context stuff with multisite
improves backtraces
adds request params
2014-05-25 13:54:52 +10:00
Neil Lalonde
b4c4cc2d13
Merge pull request #2365 from ok-harry/master
...
korean translation: *.ko.html.erb
2014-05-23 15:54:21 -04:00
Neil Lalonde
512771932a
Show a warning to admins if the site has fewer than 5 topics.
2014-05-23 12:25:16 -04:00
Neil Lalonde
8267a451b2
Disallow /users/ in robots.txt
2014-05-23 10:28:26 -04:00
Jeff Atwood
f0dafb4132
unused category-column css -- doesn't exist
2014-05-23 01:51:52 -07:00
Jeff Atwood
13e18cb038
misaligned curlies
2014-05-23 01:42:53 -07:00
Jeff Atwood
0d2fffe180
remove size-based max-width from main-link
2014-05-23 01:37:20 -07:00
Jeff Atwood
52280170d5
a bit more room for reply-to-tab
2014-05-23 01:29:23 -07:00
Jeff Atwood
e34321af7a
add sign in user glyph to 404 page
2014-05-23 01:01:09 -07:00
Jeff Atwood
2eca37b7ae
wider share-link dialog to better show URL
2014-05-23 00:46:45 -07:00
Jeff Atwood
132f04a0be
Merge pull request #2380 from awesomerobot/master
...
adding some padding to the topic-body
2014-05-23 00:11:53 -07:00
Kris Aubuchon
3cd91b50ed
adding some padding to the topic-body, helps selection is Firefox and makes highlighted posts look better
2014-05-23 02:40:55 -04:00
Jeff Atwood
61d17e961e
unnecessary rule caused extra spacing in Firefox
2014-05-22 21:47:24 -07:00
Jeff Atwood
2531e4e3a1
old legacy css rule, not needed
2014-05-22 21:29:42 -07:00
Sam
ff6755f1e5
Merge pull request #2343 from knutaldrin/patch-1
...
Fix suspended scope
2014-05-23 12:56:32 +10:00
Sam
2350227a6f
Merge pull request #2379 from awesomerobot/master
...
topic list highlight fix, some quote style fixes
2014-05-23 12:36:26 +10:00
Kris Aubuchon
00278b42d8
topic list highlight fix, some quote style fixes
2014-05-22 21:55:50 -04:00
Sam
e06da1821d
BUGFIX: notifications were not updated correctly live
...
- missing notifications when multiple replies in topic (till refresh)
- not cleared properly on click
2014-05-23 11:34:34 +10:00
Neil Lalonde
d2c34d17b7
Fix failing spec. Stubbing intermittently does not stub...
2014-05-22 11:06:19 -04:00
Jeff Atwood
3445661898
Merge pull request #2374 from awesomerobot/master
...
darkening the too-light-grey and the primary black a bit
2014-05-21 18:50:36 -07:00
Kris Aubuchon
e439df4b6b
darkening the too-light-grey and the primary black a bit
2014-05-21 21:18:25 -04:00
Neil Lalonde
867c56d9c7
Add link to google config instructions. Fix dashboard warning for google oauth2.
2014-05-21 19:11:10 -04:00
Sam
7fee3d7f8f
Annotate models
2014-05-22 09:00:38 +10:00
Neil Lalonde
742841ddce
Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites.
2014-05-21 18:35:10 -04:00
Robin Ward
5e07d18069
FIX: Don't track pageView on initial load. Let the router signal that.
2014-05-21 14:04:08 -04:00
Neil Lalonde
7061f6a570
FIX: displayErrors is undefined in flags.js controller
2014-05-21 12:19:27 -04:00
Neil Lalonde
68747c8d2d
FIX: category_list_spec would sometimes fail. It was passing only by luck.
2014-05-21 10:37:37 -04:00
Robin Ward
00fefb8e45
If both GA endpoints are provided, don't use both.
2014-05-21 07:36:58 -04:00
Robin Ward
3f6bf2fda0
FIX: Home key was broken due to some HTML changes
2014-05-21 07:30:47 -04:00
Vikhyat Korrapati
d208e4d517
Multiple grant badges.
2014-05-21 12:54:55 +05:30
Sam
1714bfe441
SECURITY: fix XSS when expanding quotes
2014-05-21 15:03:31 +10:00
riking
7f0b66246b
Tweak the no-js layout
2014-05-20 16:34:18 -07:00
Robin Ward
6dd1880f1f
FIX: More safety when displaying link counts on blogs
2014-05-20 15:20:33 -04:00
Robin Ward
f698ffd522
FIX: Weird back button behavior when going from group members -> profile
...
and then back.
2014-05-20 13:38:16 -04:00
Robin Ward
8a24a34b1b
ES6: More controllers
2014-05-20 12:49:38 -04:00
Jeff Atwood
1ed56eba7a
Merge pull request #2366 from riking/patch-5
...
Allow anonymous to see raw posts
2014-05-20 01:01:15 -07:00
riking
96f97d9d4c
Consider URLs starting with # as internal
2014-05-20 00:54:22 -07:00
riking
41332ab7ad
Allow anonymous to see raw posts
2014-05-19 23:33:27 -07:00
Harry Seo
2ef2afa06c
korean translation: *.ko.html.erb
2014-05-20 14:40:21 +09:00
Jeff Atwood
32000228e6
correct error in CSS
2014-05-19 22:27:33 -07:00
riking
2c6ab4c699
Remove the special styling on the Categories link
2014-05-19 22:21:35 -07:00
Jeff Atwood
6617bfa454
add glyph to Sign In to Reply button
2014-05-19 22:10:47 -07:00
Kris Aubuchon
7accf5aafa
some simple style cleanup
2014-05-19 23:55:46 -04:00
Sam
c1776fa1ae
Merge pull request #2360 from vikhyat/badge-system
...
Badge system updates
2014-05-20 08:24:26 +10:00
Jeff Atwood
84ead32956
Merge pull request #2361 from awesomerobot/master
...
making the color customizer a little nicer with dark themes
2014-05-18 22:40:38 -07:00
Vikhyat Korrapati
a25087b62a
Badges admin UI improvements.
...
* Query param to allow linking.
* Better handling of deleting unsaved badges.
* New badge list item style improvement.
2014-05-19 10:50:57 +05:30
Kris Aubuchon
ffa33c572c
making the color customizer a little nicer with dark themes
2014-05-19 01:17:59 -04:00
Vikhyat Korrapati
4de700b49b
Change badge user list limit to 96 so that it is divisible by 8.
2014-05-19 10:32:59 +05:30
Vikhyat Korrapati
6b7b328c66
Badges page ordering and titles.
2014-05-19 10:27:09 +05:30
Vikhyat Korrapati
6225b83f4a
Show system badges in the admin interface but don't allow editing them.
2014-05-19 10:27:04 +05:30
Sam
8bc8052ab8
BUGFIX: show usernames logic, logic failure
2014-05-19 09:11:01 +10:00
Sam
832a730e36
BUGFIX: re-enable CDN js debugging in a robust way
...
May be disabled if needed via site setting
2014-05-19 08:46:28 +10:00
Jeff Atwood
5901ed6842
Merge pull request #2358 from fantasticfears/css_tweak
...
Fix c6ef85d517
. Align reply area, 10px padding.
2014-05-18 11:04:43 -07:00
Erick Guan
81dda9fc3e
Fix c6ef85d517
. Align reply area, 10px padding.
2014-05-19 01:15:11 +08:00
Sam
9e3c08b5ee
Merge pull request #2354 from vikhyat/badge-system
...
Badge system updates
2014-05-18 20:03:20 +10:00
Erick Guan
c6ef85d517
User prefrence: align all control groups on top. And some padding for follow category.
2014-05-18 16:34:12 +08:00
Vikhyat Korrapati
abd5263671
Load more users on badge pages using infinite scrolling instead of a
...
button.
2014-05-18 12:42:47 +05:30
Vikhyat Korrapati
8fe8e66280
Don't display system badges in the admin badges interface.
2014-05-18 12:28:14 +05:30
Erick Guan
76e26daf87
So sad, reply-new icon is not circle. I can't tolerate this <3
2014-05-18 00:24:51 +08:00
Jeff Atwood
b0ff2b2311
few more glyphs
2014-05-17 01:46:39 -07:00
Jeff Atwood
605cf96923
add some glyphs to new buttons
2014-05-17 01:27:12 -07:00
Jeff Atwood
e8d24edd16
shorten settings reset text, add glyph
2014-05-17 01:07:43 -07:00
Jeff Atwood
3793a2e06d
add glyphs to user page API buttons
2014-05-17 01:02:30 -07:00
Jeff Atwood
5cd588c375
add glyph to API master key button
2014-05-17 00:57:01 -07:00
Jeff Atwood
1f0f71df65
add glyphs to API buttons
2014-05-17 00:54:20 -07:00
Jeff Atwood
99f9140147
add glyph to "must be signed in" sign in btn
2014-05-16 14:57:30 -07:00
Robin Ward
aa9e89b6c8
Support for defining components within plugins
2014-05-16 16:10:16 -04:00
Neil Lalonde
09dc3f128f
Don't disable the create account button for signups from 3rd parties. Server will return error messages if something is wrong.
2014-05-16 16:01:45 -04:00
Neil Lalonde
68fcb66443
Use Discourse.computed.setting for more better javascript
2014-05-16 15:27:42 -04:00
Robin Ward
a6670c6c83
Convert all initializers to Ember initializers
2014-05-16 14:04:34 -04:00
Robin Ward
a2a07a9852
Allow reply as new topic to use the selected text as a quote.
2014-05-16 12:20:15 -04:00
Neil Lalonde
4ca0a162b4
Add a hint about the fixed_category_positions site setting in the edit category modal.
2014-05-16 11:45:54 -04:00
Neil Lalonde
27cbc06563
Add fixed_category_positions site setting to handle whether categories are ordered by specified positions or by activity.
2014-05-16 11:33:52 -04:00
Robin Ward
417fdeaad8
FIX: Allow clicking on the (+) icon as well as the link to reply as new
...
topic.
2014-05-16 11:25:49 -04:00
Kris Aubuchon
1fd6a9067b
making onebox styles consistent with quotes
2014-05-16 10:19:02 -04:00
Régis Hanol
3a0b23191c
TEMP: disable CORS when using CDN
2014-05-16 15:11:12 +02:00
Erick Guan
60b9c8b79e
align for user dropdown. No badge for zero incoming message.
2014-05-16 19:54:58 +08:00
Vikhyat Korrapati
215e42053a
FIX: missing badge descriptions.
2014-05-16 13:39:40 +05:30
Sam
109d7cc52d
move into property so does not evaluate too early.
2014-05-16 12:06:51 +10:00
Sam
d897eada61
Improve visual styling for badges page
2014-05-16 11:08:06 +10:00
Sam
8146ee4560
add badges link to hamburger
2014-05-16 10:52:39 +10:00
Sam
eff8c22638
There is this thing called SQL and it is about 1000x faster
2014-05-16 10:34:06 +10:00
Sam
5914d0e132
Merge pull request #2311 from vikhyat/badge-system
...
Add automatically assigned trust level badges
2014-05-16 09:08:00 +10:00
Robin Ward
63bf03ba5b
Support for automatic registering of initializers from plugins.
2014-05-15 17:05:29 -04:00
Neil Lalonde
57c970b692
FIX: enable button is broken when color scheme is not saved yet
2014-05-15 15:05:02 -04:00
Robin Ward
026cfe2dc7
ES6: Half a dozen more controllers
2014-05-15 11:32:15 -04:00
Knut Aldrin Wikström
579f2bf7b8
Fix suspended scope
...
:non_suspended should check if suspension is <= NOW, else one could end up in neither group.
2014-05-15 15:47:49 +02:00
Jeff Atwood
a8d5860caf
topic-map domains should be lighter
2014-05-15 01:34:43 -07:00
Sam
fad868c78f
Bump hashes on various files
...
Upgrade jquery
I made this commit cause my JS debugging CDN support added a header and
wanted we bump cache everywhere
2014-05-15 15:52:09 +10:00
Sam
f34862d195
FEATURE: get window.onerror working for CDNs
2014-05-15 12:59:26 +10:00
Sam
198cf851ff
BUGFIX: exact username match not correctly prioritized on search
2014-05-15 12:22:35 +10:00
Jeff Atwood
b85c78a499
return unescaped HTML here
2014-05-14 16:03:53 -07:00
Jeff Atwood
a4285830e1
I wish I had noticed that double quote earlier
2014-05-14 15:58:18 -07:00
Jeff Atwood
1e07d9a1d7
add parens
2014-05-14 15:56:38 -07:00
Jeff Atwood
b369609903
add glyphs to flag dialog action button
2014-05-14 15:52:29 -07:00
Robin Ward
ab319de4f9
FIX: Github commit oneboxing formatting in emails
2014-05-14 16:40:54 -04:00
Robin Ward
93b2af8a6e
Pass the post to any events bound to custom names
2014-05-14 15:21:11 -04:00
Robin Ward
3211c60bbe
FEATURE: A new site setting public_user_custom_fields
which allows you
...
to whitelist custom fields that will be exposed to the Ember client
application.
2014-05-14 14:39:01 -04:00
Robin Ward
f90548f88a
ES6: Just a few more controllers
2014-05-14 11:38:20 -04:00
Vikhyat Korrapati
c07244a4e6
Refactor BadgeGranter.update_trust_level_badges! -> update_badges.
2014-05-14 21:01:41 +05:30
Vikhyat Korrapati
b144b75565
Add automatically assigned trust level badges.
2014-05-14 20:47:21 +05:30
Neil Lalonde
eb7aab3e0b
FIX: revert button on all colors in a new color scheme
2014-05-14 10:19:00 -04:00
Neil Lalonde
4980cff802
Add descriptions. Make all the actions buttons. Add a revert button to colors. Add a new variable: quaternary.
2014-05-14 10:19:00 -04:00
Neil Lalonde
3b1e1731dc
Remove the message that says the themer is under contruction
2014-05-14 10:18:13 -04:00
Neil Lalonde
0fa26022c0
Remove admin css from common
2014-05-14 10:18:12 -04:00
Neil Lalonde
c4d3aa3d47
Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline.
2014-05-14 10:18:12 -04:00
Régis Hanol
c97de2c449
BUGFIX: markdown sanitize on null/undefined text
2014-05-14 12:14:33 +02:00
Régis Hanol
06a87fb0ee
BUGFIX: allow new users to upload an avatar/background
2014-05-14 12:13:51 +02:00
Régis Hanol
3fde28e108
BUGFIX: correctly auto-select /top time range when filtering on a category
2014-05-14 11:49:50 +02:00
Jeff Atwood
b232736242
new-user styles not consistent
2014-05-14 01:05:24 -07:00
nXqd
0b6ebdac8a
feature: use select2 instead of chosen
2014-05-14 08:01:08 +00:00
Jeff Atwood
d28e03c3aa
user page instructions should be dimmed
2014-05-14 00:26:09 -07:00
Jeff Atwood
c0c0bfa35e
both mobile and desktop
2014-05-13 22:27:04 -07:00
Jeff Atwood
1492a8f871
forgot parens
2014-05-13 22:22:33 -07:00
Jeff Atwood
c1cb0e9ac6
forgot a spot for the PM notification style
2014-05-13 22:09:08 -07:00
Jeff Atwood
f2d7e4906b
symmetry between PM notifications and user page
2014-05-13 21:55:44 -07:00
Sam
ca4c72e648
BUGFIX: 500 error on some invalid uploads
2014-05-14 10:51:09 +10:00
Sam
b329e23f85
don't attempt to send emails on deleted topics
2014-05-14 10:34:28 +10:00
Robin Ward
152dc499e1
New poster-name component, designed to be extended to add additional
...
information.
2014-05-13 16:56:25 -04:00
Robin Ward
2e4d8b2e13
The main content of a post was being floated to the left in mobile. This
...
was causing the topic map to surround the first post.
2014-05-13 15:07:05 -04:00
Jeff Atwood
2c6ed24e26
more margin on show full post in mobile
2014-05-13 11:39:13 -07:00
Jeff Atwood
704a683903
mobile layout CSS tweaks
2014-05-13 11:10:29 -07:00
Jeff Atwood
8fa580f40d
scale quote highlight color
2014-05-13 10:16:13 -07:00
Jeff Atwood
a83859ea59
the span highlight expand quote CSS went missing
2014-05-13 10:08:43 -07:00
Robin Ward
ad90d9710d
Add an ENV variable to enable the stricter, plugin-incompatible ES6
...
behaviour for development.
2014-05-13 12:49:02 -04:00
Régis Hanol
b5239be2fa
BUGFIX: center title columns in basic topic lists
2014-05-13 18:41:20 +02:00
Régis Hanol
08dde3d881
BUGFIX: moderators can notify moderators
2014-05-13 17:47:00 +02:00
Régis Hanol
d11d31acaa
BUGFIX: missing <tbody> tag inside a <table>
2014-05-13 17:46:57 +02:00
Neil Lalonde
6e0eb89697
Don't show suspended users in autocomplete fields unless you are staff
2014-05-13 11:44:15 -04:00
Neil Lalonde
9f4171e487
Fix my prev_page code, thanks to riking
2014-05-13 10:15:28 -04:00
Wojciech Zawistowski
960d64930c
Wiki Post
2014-05-13 08:53:11 -04:00
Jeff Atwood
27c702464e
bit more mobile css cleanup
2014-05-13 00:03:22 -07:00
Jeff Atwood
0e23641291
fix mobile badge colors, jay leno P chins
2014-05-12 23:37:25 -07:00
Sam
0ade2be7d6
FEATURE: logster logs js errors
2014-05-13 15:52:25 +10:00
Jeff Atwood
8ff9b8388e
minor mobile fixes
2014-05-12 22:50:52 -07:00
Jeff Atwood
0e758c5a84
remove subcategories text from categories page
2014-05-12 15:21:28 -07:00
Neil Lalonde
00390ee739
Add a way to show a custom message at the top of all notification emails. Customize it at /admin/site_contents/notification_email_top
2014-05-12 16:52:06 -04:00
Robin Ward
d31996eaca
FIX: Allow users to create protocol relative URLs in posts.
2014-05-12 16:30:00 -04:00
Neil Lalonde
e68e97d986
FIX: moderators can't see private topics that they aren't invited to see.
2014-05-12 15:26:46 -04:00
Robin Ward
07007e6cbc
ES6: Notification controllers, added helper to create via ES6/container
2014-05-12 14:01:21 -04:00
Neil Lalonde
cf7a3e74ee
In web crawler mode, don't show a previous link on a page with 0 results. Google will index those pages and keep following the prev links.
2014-05-12 10:50:27 -04:00
Régis Hanol
fca6738212
BUGFIX: could not see the revisions of a post in a deleted topic
2014-05-12 16:30:10 +02:00
Régis Hanol
4b39e9e6d3
Merge pull request #2332 from rhacker/patch-1
...
Update discovery_topics_view.js
2014-05-12 12:13:17 +02:00
Régis Hanol
cf40851905
BUGFIX: 404 on /users/:user/private-messages
2014-05-12 12:02:32 +02:00
Régis Hanol
b018b4ad18
BUGFIX: remove N+1 on topic lists
2014-05-12 10:11:05 +02:00
Régis Hanol
5f2c2efb47
BUILD FIX: missed a semicolon
2014-05-12 09:54:52 +02:00
Régis Hanol
bc3de84ebf
FEATURE: remove bookmark button in activity feed
2014-05-12 09:33:26 +02:00
Régis Hanol
9125453628
FEATURE: add the first 3 participants in a private message
2014-05-12 09:32:49 +02:00
Sam
557dc76c07
BUGFIX: failing avatar detection job
2014-05-12 15:50:44 +10:00
Sam
97ae43126b
BUGFIX: 500 error on missing category
2014-05-12 15:50:31 +10:00
Sam
f8b7f0d73f
FEATURE: logster env tab, log current user
2014-05-12 15:28:23 +10:00
Kris Aubuchon
0779621680
lighter TH on topic-list
2014-05-12 01:02:05 -04:00
Sam
c683fab2a1
Adjust username styling
2014-05-12 11:28:24 +10:00
Sam
8de172c0da
Removed invite on ENTER key
...
1. We can not use this feature as admins
2. It will be inconsistent if admins don't have it and others do
3. inviting people by mistake is no good
tab enter should do fine
2014-05-12 09:40:22 +10:00
Robin Ward
eb0872c5d4
FIX: Topic archetype check should only happen when the topic exists
2014-05-11 15:53:57 -04:00
Robin Ward
948ebf2201
FIX: Modals weren't closing when routing to raw links
2014-05-11 15:39:00 -04:00
Robin Ward
2bb63ffb38
FIX: Don't show links to private messages in the gutter
2014-05-11 15:16:28 -04:00
Dung Quang
eed1440a8d
Update discovery_topics_view.js
...
I guess this is a typo
2014-05-10 19:36:40 +07:00
Jeff Atwood
8714391bb2
fix p:last-of-type on embed topic blockquotes
2014-05-09 23:51:06 -07:00
Jeff Atwood
1e8e2590cf
Merge pull request #2331 from awesomerobot/master
...
rearranging layout to better fit the new username placement
2014-05-09 23:30:38 -07:00
Jeff Atwood
c65fa01479
fix in-reply-to names for mobile embed
2014-05-09 23:20:23 -07:00
Kris Aubuchon
b2675a61ba
rearranging layout to better fit the new username placement
2014-05-10 02:09:04 -04:00
Jeff Atwood
9afc5706e9
loosen spacing a bit on embedded topics
2014-05-09 22:50:45 -07:00
Jeff Atwood
6cfa5f78d9
make new user names a bit lighter
2014-05-09 13:32:36 -07:00
Robin Ward
6cd3796c39
FIX: Blog counts stopped working with additional security checks
2014-05-09 16:26:14 -04:00
Jeff Atwood
5ee6ac3621
reply-to-tab doesn't need bgcolor
2014-05-09 13:25:28 -07:00
Robin Ward
2fd5ae2091
Move reply to to the right
2014-05-09 16:12:21 -04:00
Robin Ward
252b36bb86
FIX: Some avatars were too big in embedded CSS
2014-05-09 15:49:53 -04:00
Robin Ward
067381ed18
Move in reply to slightly in embedded posts
2014-05-09 15:42:48 -04:00
Robin Ward
e713cc40c4
First attempt: Move username on top of embedded posts
2014-05-09 15:14:00 -04:00
Arpit Jalan
93cff8deb5
Speech bubble waiting for an ajax response prior to rendering
2014-05-09 22:23:27 +05:30
Robin Ward
842dd91958
Revert "Merge pull request #2304 from techAPJ/speech-bubble-update"
...
This reverts commit 6590ebbcbe
, reversing
changes made to 3855ead62e
.
2014-05-09 12:01:36 -04:00
Robin Ward
6590ebbcbe
Merge pull request #2304 from techAPJ/speech-bubble-update
...
Speech bubble waiting for an ajax response prior to rendering
2014-05-09 11:58:57 -04:00
Robin Ward
3855ead62e
ES6: Some more controllers
2014-05-09 11:57:39 -04:00
Jeff Atwood
853bbbbf06
suppress reply-to-tab borders
2014-05-09 08:42:07 -07:00
Régis Hanol
978fb7ff96
Merge pull request #2328 from ligthyear/better-debugging-of-promises-in-dev
...
Log the actual promise object instead of a useless name
2014-05-09 11:25:44 +02:00
Benjamin Kampmann
41f1c70fe4
Log the actual promise object instead of a useless name
...
- console.log has support for objects including introspection, use this
- instead of logging useless names
2014-05-09 11:16:56 +02:00
Sam
084ec87850
FEATURE: admins can invite users to groups via the web UI
2014-05-09 18:22:36 +10:00
Sam
3f07c1d0a1
Backend support for group invites
2014-05-09 18:22:35 +10:00
Sam
34d1668f9f
FEATURE: backend for inviting a user to a group
2014-05-09 18:22:35 +10:00
Arpit Jalan
d16974fd4c
Speech bubble waiting for an ajax response prior to rendering
2014-05-09 08:06:56 +05:30
Robin Ward
77d68ccf08
FIX: Robin is fired for the typo
2014-05-08 16:44:32 -04:00
Robin Ward
44ed0d5232
FIX: Even more safety, the topic must exist as well.
2014-05-08 16:41:25 -04:00
Robin Ward
5fb962a65f
FIX: Some extra safety - in the case that an imported post was deleted,
...
don't error out of the PollFeed job
2014-05-08 16:27:17 -04:00
Robin Ward
804a489c7b
ES6: More controllers
2014-05-08 11:35:34 -04:00
Robin Ward
efcf99c21d
ES6: A bunch more controllers
2014-05-08 11:35:34 -04:00
Robin Ward
a0221ce5e5
ES6: More controllers converted to ES6
2014-05-08 11:35:34 -04:00
Robin Ward
4640b9d653
ES6: Half a dozen more controllers converted
2014-05-08 11:35:34 -04:00
Robin Ward
5191acfd9f
ES6: Uses proper normalize
method, includes support for namespaced
...
controllers.
2014-05-08 11:35:33 -04:00
Robin Ward
eee5f85654
ES6: AvatarSelector
and HeaderController
- also includes support for controllers with
...
camelcase via an error message.
2014-05-08 11:35:33 -04:00
Robin Ward
a4e30e8f93
Proof of concept: Load controller via ES6 module in Discourse
2014-05-08 11:35:33 -04:00
Sam
cec18aba3f
Rails 4 upgrade
2014-05-08 14:47:54 +10:00
Robin Ward
fbda9cac69
FIX: Reply as new topic was broken
2014-05-07 23:28:14 -04:00
Sam
0c2c92978d
Merge pull request #2301 from vikhyat/accessibility
...
Slightly improve header accessibility
2014-05-08 09:23:29 +10:00
Sam
4025591a1d
Merge pull request #2307 from alxndr/latest-topics-rss-title-tweak
...
change title in Latest Topics RSS feed title
2014-05-08 09:21:06 +10:00
Sam
b144ad4e5b
Merge pull request #2314 from fantasticfears/fix_notification_level
...
Add regular notification level into topic_view_serializer
2014-05-08 09:17:40 +10:00
Sam
a2e2d0e886
Merge pull request #2316 from mutiny/refactor-where-first
...
Refactor `where(...).first` to `find_by(...)`
2014-05-08 09:10:45 +10:00
Régis Hanol
f9e49624b2
BUGFIX: button styling on /top page
2014-05-08 00:47:10 +02:00
Régis Hanol
fafc5d9006
Merge pull request #2321 from awesomerobot/master
...
minor user(and group) page fixes
2014-05-07 19:59:28 +02:00
Kris Aubuchon
ae79078605
minor user(and group) page fixes
2014-05-07 13:49:59 -04:00
Régis Hanol
4b9acd6806
BUGFIX: make sure we do not try to pull images from the CDN
2014-05-07 19:49:16 +02:00
Régis Hanol
21e8ae0eca
BUGFIX: the /top page now shows the first non-empty period
2014-05-07 19:04:39 +02:00
Robin Ward
76cb4bf0a5
Roll up gutter links, don't show reply as new topic unless expanded.
2014-05-07 12:28:38 -04:00
Neil Lalonde
63a1f87806
Use topic excerpts and category desriptions in meta description tags for crawlers
2014-05-07 11:21:37 -04:00
Vikhyat Korrapati
ed8aeccb0c
Use helper to insert sr-only text for icons.
2014-05-07 19:04:26 +05:30
Vikhyat Korrapati
2f33c288a6
Remove extra anon glyphs, move sign in button.
...
See: https://meta.discourse.org/t/add-sign-in-to-anonymous-header/15335
2014-05-07 18:42:51 +05:30
Vikhyat Korrapati
17ad49ffbc
Slightly improve header accessibility.
...
Partially addresses: https://meta.discourse.org/t/links-without-text-make-blind-user-accessibility-worse/13538 .
2014-05-07 18:08:47 +05:30
Jeff Atwood
7687ceef66
Merge pull request #2319 from awesomerobot/master
...
some color fixes, general consistency
2014-05-06 20:55:11 -07:00
Kris Aubuchon
22e7fd5ed0
some color fixes, general consistency
2014-05-06 23:53:04 -04:00
Sam
ee0efab02f
More logging, less problems
2014-05-07 12:37:02 +10:00
Jeff Atwood
41c6ca1686
don't color mobile topic map numbers
2014-05-06 15:38:22 -07:00
Robin Ward
f51cbc8952
FIX: @mentions should not be processed within links
2014-05-06 17:48:30 -04:00
Neil Lalonde
9a1318879e
FIX: blockquote colors on mobile
2014-05-06 15:38:19 -04:00
Robin Ward
4cdf25e39d
Merge pull request #2318 from camilleroux/patch-3
...
Update the Amazon links regexp
2014-05-06 15:15:33 -04:00
Robin Ward
2cf6f65660
FIX: Linking to relative hash URLs was reloading the app.
2014-05-06 15:09:43 -04:00
Neil Lalonde
f44bd4ec28
Don't allow sending private messages to suspended users. Emails to suspended users should tell them how to respond, since they can't.
2014-05-06 15:01:27 -04:00
Neil Lalonde
ba68470d5a
FIX red hightlighted rows in admin
2014-05-06 15:01:27 -04:00
Robin Ward
8a471d629e
FIX: Adds safety to painting on quote controls for elements that might
...
not be present. This should fix an issue with not scrolling down after
new posts are created sometimes.
2014-05-06 14:25:24 -04:00
Robin Ward
9e719e49da
Only show a few topic links in the gutter and allow the user to expand
...
them.
2014-05-06 14:11:17 -04:00
Camille Roux
f14c71b9d4
Fix the Amazon links regex
2014-05-06 19:19:32 +02:00
Camille Roux
e77e7f23ca
Update the Amazon links regexp
...
Added all the countries displayed in the Amazon footer
2014-05-06 18:36:07 +02:00
Kris Aubuchon
905c7c7204
few small consistency changes
2014-05-06 12:30:05 -04:00
Neil Lalonde
ee08bf561f
Fix a bunch of color issues
2014-05-06 11:44:28 -04:00
Kris Aubuchon
60bf76f152
a few small color fixes
2014-05-06 09:48:38 -04:00
Louis Rose
1574485443
Perform the where(...).first to find_by(...) refactoring.
...
This refactoring was automated using the command: bundle exec "ruby refactorings/where_dot_first_to_find_by/app.rb"
2014-05-06 14:41:59 +01:00
Régis Hanol
8cf937cdcb
BUGFIX: fix selected & unread notifications dropdown background color
2014-05-06 12:34:50 +02:00
Jeff Atwood
7870afbfd4
bring post borders back on mobile
2014-05-06 01:49:20 -07:00
Erick Guan
a4aeb21f0c
Add regular notification level into topic_view_serializer for the user who enter the new topic
2014-05-06 16:42:18 +08:00
Jeff Atwood
d1c876fcbc
don't clear:left the btn-primary on mobile
2014-05-06 01:40:05 -07:00
Jeff Atwood
bebdd0d290
some stray } there
2014-05-06 01:29:28 -07:00
Jeff Atwood
661e6984d3
drop views from mobile suggested topics
2014-05-06 01:23:50 -07:00
Jeff Atwood
27deae4ba4
unwanted editor border on Nexus 5 / iPhone 5
2014-05-06 01:17:35 -07:00
Jeff Atwood
1bf566ac8e
a few more mobile CSS tweaks
2014-05-06 01:14:56 -07:00
Jeff Atwood
65af49f828
CSS, how does it work?
2014-05-06 00:52:28 -07:00
Jeff Atwood
e023849657
a few more mobile CSS annoyances
2014-05-06 00:48:44 -07:00
Jeff Atwood
4346190b2c
fix some mobile CSS annoyances
2014-05-06 00:24:04 -07:00
Jeff Atwood
8e5888dee1
remove $quote-background color
2014-05-05 23:50:05 -07:00
Jeff Atwood
2a3993794b
correct the $primary_border_color error
2014-05-05 23:42:53 -07:00
Jeff Atwood
ab3ab26cc4
Merge pull request #2313 from awesomerobot/master
...
simplifying and segmenting color variables
2014-05-05 23:07:46 -07:00
Kris Aubuchon
8ea63006e4
simplifying and segmenting color variables
2014-05-06 01:50:51 -04:00
Régis Hanol
f20fba041c
BUGFIX: improved top ranking formula (+ filter topics based on their creation date)
2014-05-05 23:05:35 +02:00
Robin Ward
fd153623bb
Revert "Proof of concept: Load controller via ES6 module in Discourse"
...
This reverts commit 0327f469c1
.
2014-05-05 13:58:57 -04:00
Robin Ward
aa269c92a0
Revert "ES6: AvatarSelector
and HeaderController
- also includes support for controllers with"
...
This reverts commit 44b2f82be8
.
2014-05-05 13:58:57 -04:00
Robin Ward
69225a7ea9
Revert "ES6: Uses proper normalize
method, includes support for namespaced"
...
This reverts commit b98324a937
.
2014-05-05 13:58:57 -04:00
Robin Ward
389c50eb1e
Revert "ES6: Half a dozen more controllers converted"
...
This reverts commit bc2d87e5c1
.
2014-05-05 13:58:57 -04:00
Robin Ward
b17cd2f251
Revert "ES6: More controllers converted to ES6"
...
This reverts commit 23cc7c174a
.
2014-05-05 13:58:57 -04:00
Neil Lalonde
a15714899e
Better forgot password message
2014-05-05 13:48:11 -04:00
Robin Ward
23cc7c174a
ES6: More controllers converted to ES6
2014-05-05 13:23:45 -04:00
Robin Ward
bc2d87e5c1
ES6: Half a dozen more controllers converted
2014-05-05 13:23:45 -04:00
Robin Ward
b98324a937
ES6: Uses proper normalize
method, includes support for namespaced
...
controllers.
2014-05-05 13:23:45 -04:00
Robin Ward
44b2f82be8
ES6: AvatarSelector
and HeaderController
- also includes support for controllers with
...
camelcase via an error message.
2014-05-05 13:23:45 -04:00
Robin Ward
0327f469c1
Proof of concept: Load controller via ES6 module in Discourse
2014-05-05 13:23:45 -04:00
Régis Hanol
c21d3f41d0
BUGFIX: only redirect new users to top page once
...
Actually, new users will still be redirected to the top page during the first 30 seconds of their first visit.
2014-05-05 19:00:40 +02:00
Alexander
deb99e956e
RSS title element is SiteSetting.title + translated filter description
2014-05-05 09:33:19 -07:00
Jeff Atwood
5dd82bf723
add danger color to delete-and-block button
2014-05-04 00:38:29 -07:00
Jeff Atwood
04c3779985
and it wasn't even the correct glyph
2014-05-03 15:19:28 -07:00
Jeff Atwood
1cd62c37a4
wow I suck
2014-05-03 15:15:11 -07:00
Jeff Atwood
b902119f00
use glyph for "in reply to" chicklet to simplify
2014-05-03 15:04:15 -07:00
Régis Hanol
63c4f24319
BUGFIX: do not show PMs counters when the value is 0
2014-05-03 00:40:57 +02:00
Régis Hanol
4642218662
FEATURE: add private messages counters in user activity feed
2014-05-02 22:53:58 +02:00
Neil Lalonde
ce381860dc
Order latest.rss by created_at, not updated_at
2014-05-02 11:51:16 -04:00
Alexander
43ed6979be
feed titles get translations of "Topics"
2014-05-01 14:17:09 -07:00
Neil Lalonde
2e7b69f849
RSS feed for topics and posts now use a guid that will always be unique, unlike urls which can change when the topic slug changes
2014-05-01 14:09:15 -04:00
Alexander
891a1c4279
feed titles now prefixed with SiteSetting.title
2014-05-01 09:37:13 -07:00
Neil Lalonde
df538f63d9
Add Hebrew
2014-05-01 11:00:53 -04:00
Jeff Atwood
0f62a6f132
fix new user color
2014-05-01 01:39:08 -07:00
Régis Hanol
11bfd6b68c
Merge pull request #2309 from riking/cat-class
...
Add class to page based on topic category
2014-05-01 09:58:45 +02:00
Jeff Atwood
41cb378142
why does .cooked need a right margin of 60 px?!?
2014-05-01 00:25:07 -07:00
Jeff Atwood
3c05f97f9e
some /faq page layout fixes
2014-04-30 23:59:24 -07:00
riking
63ce01893b
Add class to page based on topic category
2014-04-30 22:24:02 -07:00
Jeff Atwood
0fa7aec74a
minor copyedits on faq and digest
2014-04-30 16:20:23 -07:00
Régis Hanol
02dd80170a
BUGFIX: revision history was messed up when doing quick edits
2014-04-30 22:42:56 +02:00
Neil Lalonde
dc0a758ec6
FIX: quote whole post button was broken
2014-04-30 14:21:43 -04:00
Régis Hanol
5fda4a613d
Merge pull request #2306 from awesomerobot/master
...
some alignment fixes for the new username position
2014-04-30 18:08:29 +02:00
Régis Hanol
11af466737
FEATURE: add a specific flag reason when a post has been hidden
2014-04-30 16:58:01 +02:00
Kris Aubuchon
e18f435318
some alignment fixes for the new username position
2014-04-30 10:14:27 -04:00
Jeff Atwood
f13e9e58e8
change "Log In" to "Sign In"
...
because
http://www.designcult.org/2011/08/why-do-we-call-in-logging-in.html
2014-04-30 01:10:32 -07:00
Sam
85e7033410
BUGFIX: styling
2014-04-30 17:04:54 +10:00
Sam
e964ca4d4e
BUGFIX: merge played up correct visual styles
2014-04-30 16:13:08 +10:00
Sam
d8046a395f
BUGFIX: improve alignment
2014-04-30 16:04:24 +10:00
Kris Aubuchon
7361519e52
some adjustments for the username relocation...
2014-04-30 00:45:11 -04:00
Sam
f6c22cc299
Merge pull request #2297 from ligthyear/custom-fields
...
Custom fields for Topic, Category, Post and Group
2014-04-30 13:15:50 +10:00
Sam
1d2cabc2a6
FEATURE: usernames are now on top.
2014-04-30 12:13:37 +10:00
Robin Ward
ad1a8db956
Support for linking to static pages with hash URLs like #section
. Also
...
refactor of static code to be more idomatic.
2014-04-29 18:01:13 -04:00
Robin Ward
87b4cd3323
FIX: Don't show undefined
query params
2014-04-29 16:18:01 -04:00
Robin Ward
f50039b48b
Support 404 routes in the Ember App
2014-04-29 15:29:13 -04:00
Neil Lalonde
f61f29439e
Track the ip address where user was registered
2014-04-29 14:37:56 -04:00
Benjamin Kampmann
f757706861
Ensure Reload reloads custom_fields, too
2014-04-29 19:34:56 +02:00
Benjamin Kampmann
0cf07d41ae
Move Concern from lib into app/models. refs #2279
2014-04-29 19:26:43 +02:00
Benjamin Kampmann
e502122c51
Add Custom Fields on Topics
2014-04-29 19:26:42 +02:00
Benjamin Kampmann
2450088c03
Add CustomFields to Post, Category and Group
2014-04-29 19:26:42 +02:00
Benjamin Kampmann
e6e03a1a96
move custom fields into its own concern
2014-04-29 19:26:42 +02:00
Régis Hanol
4371374ba6
FEATURE: support for enabling all upload file types
...
BUGFIX: authorized extensions is now case insensitive
2014-04-29 19:12:35 +02:00
Robin Ward
359d59242e
If a new user receives a mention, quote or response to their post, allow
...
them to continue posting in a topic.
2014-04-29 12:59:14 -04:00
Kris Aubuchon
449de0368e
updating d-dropdown so long lists of categories can scroll
2014-04-29 09:50:02 -04:00
Sam
d18b136e54
Merge pull request #2299 from borhub/new_html_containers_to_help_custom_theming
...
User profile page and post page templates: add extra wrappers
2014-04-29 12:31:56 +10:00
Boris
88734957bf
Topic page template: add extra wrapper around the username also for the deleted user case (missed in af69b78ecb
)
2014-04-29 11:55:16 +10:00
Sam
0fc4c47927
Merge pull request #2295 from vikhyat/badge-system
...
Titleable badges
2014-04-29 11:26:51 +10:00
Robin Ward
ba683bc611
FIX: XSS in markdown converter.
2014-04-28 14:44:15 -04:00
Neil Lalonde
1da59e7e2e
FIX: deactivated users shouldn't be able to log in
2014-04-28 13:46:28 -04:00
Neil Lalonde
340fd303c8
FIX: in multisite setup, links to the current forum are whitelisted when looking for spam hosts
2014-04-28 10:37:28 -04:00
Boris
c934411228
User profile page template: add extra wrapper into primary details section to allow laying textual items out on the right of the avatar
2014-04-28 17:51:15 +10:00
Vikhyat Korrapati
a8e2c5e616
Use PreloadStore for the badge pages.
2014-04-28 10:30:50 +05:30
Vikhyat Korrapati
b4e037dfb2
Allow badges to be marked as "titleable".
2014-04-28 10:30:38 +05:30
Sam
e88e43bfb6
Merge pull request #2279 from fantasticfears/concern
...
move concerns to the model/concerns
2014-04-28 09:48:33 +10:00
Robin Ward
89df580560
FIX: Reflected post links were being deleted when they shouldn't and
...
vice versa.
2014-04-25 16:49:48 -04:00
Robin Ward
b91c70cac3
FIX: Don't show quote controls when the post id is missing.
2014-04-25 15:41:24 -04:00
Benjamin Kampmann
64918c35f5
Improved Plugins SCSS management
...
- Moves the import of plugins for both mobile and desktop from common after discourse loading, allowing plugins to overwrite
- Make desktop-option behave like the mobile-option: SCSS/CSS marked with that option will only be loaded for desktop from now on and ignored in mobile
- Add variables-keyword, allowing plugins to ship and overwrite variables before they get imported by discourse (great for theming)
2014-04-25 18:25:45 +02:00
Neil Lalonde
20df262814
Add filters to colors ui
2014-04-25 10:10:17 -04:00
Régis Hanol
f8d9fb7bdc
Revert "Merge pull request #2284 from jaimeiniesta/patch-1"
...
This reverts commit a6b88d1e7e
, reversing
changes made to 9bee0b6e2d
.
2014-04-25 11:40:38 +02:00
Robin Ward
cf6cbb955b
REFACTOR: Introduce Discourse.computed.setting
to create a computed
...
property that links to a `Discourse.SiteSetting`
2014-04-24 18:36:02 -04:00
Robin Ward
cdd2101e4f
FIX: Don't hotlink links for new users
2014-04-24 18:36:02 -04:00
Robin Ward
f527ac33b0
FIX: Make sure the unread counter is updated following a "Dismiss New"
2014-04-24 18:36:02 -04:00
Neil Lalonde
feaaf55a0c
Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet.
2014-04-24 16:49:12 -04:00
Régis Hanol
c52ee665b4
FEATURE: do not bump topic when pulling hotlinked images
2014-04-24 16:07:47 +02:00
Régis Hanol
d1b96d0e8b
Merge pull request #2290 from vikhyat/badge-system
...
Incrementally load users in the badge page
2014-04-24 12:14:41 +02:00
Vikhyat Korrapati
0357370b0d
Use the user-badge component in the admin user badges page.
2014-04-24 14:48:30 +05:30
Vikhyat Korrapati
4e89b64e64
Load 100 users at a time for the badge page, with a button to load more.
2014-04-24 14:48:26 +05:30
riking
7da5d3fe78
Backoff-retry for hotlinked image pull + some style fixes
2014-04-23 22:25:43 -07:00
riking
b309deef11
Add site setting for domains to never download images from
2014-04-23 22:24:35 -07:00
Sam
a6b88d1e7e
Merge pull request #2284 from jaimeiniesta/patch-1
...
escape gravatar URLs to comply with W3C standards
2014-04-24 12:56:16 +10:00
Sam
9bee0b6e2d
BUGFIX: we don't need this param
2014-04-24 12:46:54 +10:00
Sam
05efc8df16
BUGFIX: likes would cause whole post to re-render
2014-04-24 12:42:04 +10:00
Sam
2d123ef1c7
REGRESSION: sortable columns were missing sortable class on first render
2014-04-24 11:24:58 +10:00
Sam
3ff1d63a8d
Improve mobile style for topic lists
...
This has been driving me nuts for a while now
2014-04-24 11:10:50 +10:00
Sam
2debf7d97d
Correct colors for tracking glyph in notification area
2014-04-24 10:48:04 +10:00
Sam
759f4b4fe9
BUGFIX: category name is reserved in multisite
2014-04-24 09:19:59 +10:00
Neil Lalonde
d8ebeef857
FIX: NotifyMailingListSubscribers can handle trashed posts, instead of raising an error and retrying
2014-04-23 15:50:52 -04:00
Robin Ward
e48cf06fc9
REFACTOR: Add urls for admin groups, make it more idiomatic ember
2014-04-23 15:15:46 -04:00
Neil Lalonde
448802f006
Merge pull request #2288 from yomybaby/i18n_plural_ko
...
add pluralization rules in ember for Korean (ko)
2014-04-23 12:59:56 -04:00
Régis Hanol
de53385ed2
display the copy & paste images hint to FF users too
2014-04-23 18:49:54 +02:00
Régis Hanol
ff1823beca
BUGFIX: backups logs page was busted since last Ember update
2014-04-23 11:20:22 +02:00
Sam
7c57d74e85
FEATURE: unicorn sidekiq will restart sidekiq on complete failure.
...
(checks every 30 minutes for complete failure)
2014-04-23 13:13:18 +10:00
Sam
8abf652dc3
SECURITY: self XSS by admin by editing badge name
2014-04-23 09:46:32 +10:00
Jeff Atwood
6538874064
remove unnecessary css witdh
2014-04-22 16:22:25 -07:00
Jong Eun Lee
00ff3f8953
add pluralization rules in ember for Korean (ko)
2014-04-23 08:08:39 +09:00
Robin Ward
af877781b7
Allow admins to choose if groups are visible or not.
2014-04-22 16:43:46 -04:00
Robin Ward
8538e31fb4
Don't show link counts in the body of posts for internal links. They are
...
already in the sidebar.
2014-04-22 15:40:08 -04:00
Régis Hanol
5fd4d88491
BUGFIX: pull hotlinked images job wasn't properly handling the InvalidParameters exception
2014-04-22 15:32:48 +02:00
Vikhyat Korrapati
ba862439f2
Move badge styles from desktop to common/base.
2014-04-22 11:50:16 +05:30
Vikhyat Korrapati
d54edc7c0e
Display username and granted at on badge page.
2014-04-22 11:49:31 +05:30
Sam
a3b2b4baca
FEATURE: custom fields on User
2014-04-22 13:52:13 +10:00
Robin Ward
78f8fbb7ea
FIX: Link to user profile broke the back button
2014-04-21 17:49:10 -04:00
Robin Ward
4eb5474858
Add a SiteSetting to configure how many topics are in the email digest.
2014-04-21 17:49:10 -04:00
Régis Hanol
64b8f2f759
TRIVIAL: remove puts statement (cc. @eviltrout)
2014-04-21 23:00:13 +02:00
Régis Hanol
39cc147138
BUGFIX: only redirect users top /top page once
2014-04-21 20:00:37 +02:00
Régis Hanol
561f7e0148
BUGFIX: add h2 with period when browsing top pages
2014-04-21 20:00:30 +02:00
Jeff Atwood
1623ec77e4
make top user link profile, not activity
2014-04-21 10:18:50 -07:00
Régis Hanol
362c6e443a
Merge pull request #2286 from awesomerobot/master
...
fixing the composer that I just re-broke
2014-04-21 18:01:16 +02:00
Kris Aubuchon
2c44f724f4
fixing the composer that I just re-broke
2014-04-21 11:54:57 -04:00
Robin Ward
b9ca124756
Support for /my/preferences to automatically redirect to the logged in
...
user.
2014-04-21 11:52:11 -04:00
Robin Ward
61e6eae728
FIX: /topics/period routes were broken
2014-04-21 10:26:24 -04:00
Robin Ward
4dc20e6855
FIX: Sanitize custom quote attributes
2014-04-21 10:19:39 -04:00
Kris Aubuchon
5fd874b74a
desktop composer fix
2014-04-21 09:56:10 -04:00
Jaime Iniesta
6084cb969d
escape gravatar URLs to comply with W3C standards
...
This fixes an HTML validation error due to & not being properly escaped on the gravatar URLs.
2014-04-21 00:46:00 +02:00
Kris Aubuchon
e4d1aaa290
pulling some more styles out of desktop/mobile to common/base
2014-04-20 15:17:11 -04:00
Kris Aubuchon
bffeba5e3b
pulling some more styles out of desktop/mobile to common/base
2014-04-20 15:16:06 -04:00
Kris Aubuchon
3f102a98da
initial move of common desktop/mobile styles to common/base
2014-04-19 14:04:22 -04:00
Erick Guan
6d45f71254
move concerns to the model/concerns
2014-04-19 12:00:40 +08:00
Régis Hanol
454f11e597
FEATURE: new title_sanitize site setting
2014-04-18 21:01:21 +02:00
Régis Hanol
756ea0178a
Merge pull request #2276 from vikhyat/badge-system
...
Badge system updates
2014-04-18 11:46:19 +02:00
Régis Hanol
b014d66b65
Merge pull request #2277 from vikhyat/fix-title-html
...
Fix HTML tags in topic titles
2014-04-18 11:37:33 +02:00
Jeff Atwood
b846eb4544
backup size column does not need to be so large
2014-04-17 23:49:58 -07:00
Vikhyat Korrapati
25a080a8e1
Fix HTML tags in topic titles.
...
We no longer sanitize titles before saving to the database since it
would cause problems like HTML entities showing up when you try to edit
a topic title. It isn't even really necessary since we only render
fancy_title directly and never title.
The escaping logic used here is the same that is used both in lodash and
onebox. See:
1. https://github.com/discourse/onebox/pull/190/files
2. https://github.com/lodash/lodash/blob/2.4.1/dist/lodash.compat.js#L6194
2014-04-18 10:47:00 +05:30
Vikhyat Korrapati
27b62df48b
Change "awarded" to "granted".
2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
e6eb16ee73
Fix infinite loading spinner for badges that have not been granted yet.
2014-04-18 09:20:55 +05:30
Vikhyat Korrapati
8113e8d897
Basic UI for selecting gold/silver badges as titles.
2014-04-18 09:20:51 +05:30
Vikhyat Korrapati
95b430df72
Link poster expansion "+x more" to user badges page.
2014-04-18 08:24:48 +05:30
Vikhyat Korrapati
5bb3a1a05a
Show badges filter in user profiles only when the user has badges.
2014-04-18 04:03:13 +05:30
Robin Ward
64faee0935
Break down new topic counts by category if a digest contains many.
2014-04-17 16:42:40 -04:00
Robin Ward
0e56157212
Basic "Also, there are x new topics" text for the digest
2014-04-17 16:04:26 -04:00
Robin Ward
fd4007eefc
FIX: Don't sort the new topics by score since the Top logic is already
...
sorting them by score.
2014-04-17 15:43:24 -04:00
Robin Ward
564b1d86b0
Digest should exclude muted topics.
2014-04-17 15:27:11 -04:00
Robin Ward
89aa2380c6
Use "Top" logic for digest emails. Leave out muted categories.
2014-04-17 15:22:19 -04:00
Robin Ward
2341118570
Add categories to the first topics in the email digest
2014-04-17 15:22:19 -04:00
Régis Hanol
b2cb4b27a1
Merge pull request #2273 from paully21/development-branch
...
Add blurb of post to search results via API
2014-04-17 21:06:03 +02:00
Régis Hanol
bda47c2bf8
Merge pull request #2274 from vikhyat/badge-system
...
Fix user_badges n+1 query
2014-04-17 21:05:48 +02:00
Neil Lalonde
890e53cd6e
Remove the default_invitee_trust_level+1 privilege from trust level 3.
2014-04-17 15:05:15 -04:00
Neil Lalonde
6c7863bbba
Show installed version on dashboard after upgrade
2014-04-17 14:26:44 -04:00
Robin Ward
a57f802048
If there's a TopicEmbed
record for a url, we don't have to crawl it.
...
This should help sites like Boing Boing where sometimes links are
crawled before saved in WordPress.
2014-04-17 14:00:22 -04:00
Robin Ward
ffc1634193
FIX: Only show link clicks on the title of a onebox, not repeatedly in
...
its body.
2014-04-17 13:01:44 -04:00
Robin Ward
87682f7539
FIX: Don't include image meta data when embedded in an email
2014-04-17 12:32:51 -04:00
Vikhyat Korrapati
843023d7c9
Fix user_badges n+1 query.
2014-04-17 21:58:05 +05:30
Robin Ward
b3ed8b6a32
Use query params for sortable table headings
2014-04-17 10:52:57 -04:00
Robin Ward
2eab288dc9
Port "Summarize Topic" to query-params-new
2014-04-17 10:46:33 -04:00
Robin Ward
fdb751296a
FIX: ZALGO test suite was causing failures in the wrong place due to
...
missing `async` bits.
2014-04-17 10:46:33 -04:00
Robin Ward
c9c95a9ac2
FIX: Ember doesn't allow one route name, basic
, and Discourse used it!
2014-04-17 10:45:06 -04:00
Robin Ward
c820747ea3
FIX: Malformed HTML in templates
2014-04-17 10:45:06 -04:00