Commit Graph

753 Commits

Author SHA1 Message Date
Sam a82530012a FEATURE: Allow selection of highlight js languages
PERF: stop loading highlight js on load

To get latest highlight js run bin/rake highlightjs:update
2015-03-13 16:18:59 +11:00
Robin Ward de4e4f2b98 Replace $LAB with path aware `loadScript` that uses jQuery 2015-03-09 14:39:39 -04:00
Sam f5af4768eb FEATURE: add clean support for running Discourse in a subfolder
To setup set DISCOURSE_RELATIVE_URL_ROOT to the folder you wish
2015-03-09 13:14:29 +11:00
Régis Hanol 1b2381d5a0 FIX: only remove custom CSS in admin on first load 2015-03-02 23:31:04 +01:00
Robin Ward bcb0346595 FIX: Support text only logos when activating account. 2015-02-25 11:36:06 -05:00
Arpit Jalan ddb8378ab0 UX: unified About / Privacy / ToS / FAQ topnav 2015-02-23 18:26:19 +05:30
Sam 17927b2e8b FIX: don't use flash cause we are not redirecting
(we should probably change that though)
2015-02-20 10:28:58 +11:00
Robin Ward 3ce2077aa8 Migrate unsubscribe keys to the database.
This should reduce a lot of the keys in redis.
2015-02-13 14:24:15 -05:00
Robin Ward 8ec4d07bf2 Minor refactoring to help with Tags RSS 2015-02-12 11:53:21 -05:00
Régis Hanol 521d3de10d revert: ⬆️ update font-awesome 2015-02-05 17:26:18 +01:00
Régis Hanol 4ac82f45bf FIX: force font-awesome update 2015-02-05 14:25:27 +01:00
Arpit Jalan 68377ba4ab add class for container div on 404 page 2015-02-04 00:40:21 +05:30
riking c6e27399b3 FIX: Add Google Analytics code to crawler view 2015-02-02 00:49:58 -08:00
Robin Ward d6fa248093 UX: Update 404 page category badge to use centralized helper and style 2015-01-28 14:56:38 -05:00
Régis Hanol cd2c9edb46 FIX: 🐛 upload on IE9 wasn't working :'(
- FIX: make sure we set a default name to a pasted image only on Chrome (the only browser that supports it)
- FIX: use ".json" extension to uploads endpoints since IE9 doesn't pass the correct header
- FIX: pass the CSRF token in a query parameter since IE9 doesn't pass it in the headers
- FIX: display error messages comming from the server when there is one over the default error message
- FIX: HACK around IE9 security issue when clicking a file input via JavaScript (use a label and set `visibility:hidden` on the input)
- FIX: hide the "cancel" upload on IE9 since it's not supported
- FIX: return "text/plain" content-type when uploading a file for IE9 in order to prevent it from displaying the save dialog
- FIX: check the maximum file size on the server 💥
- update jQuery File Upload Plugin to v. 5.42.2
- update JQuery IFram Transport Plugin to v. 1.8.5
- update jQuery UI Widget to v. 1.11.1
2015-01-28 19:43:20 +01:00
Jeff Atwood 246ae75a31 FIX: language was not being inserted into RSS 2015-01-23 15:57:29 -08:00
Arpit Jalan 63556a904a FIX: full user names were showing up in crawlers and rss feeds in spite enables_names setting being disabled 2015-01-22 22:34:35 +05:30
Robin Ward 350554e198 UX: Change category badge style to use stripes 2015-01-20 14:56:06 -05:00
Robin Ward 987504c6ab Rename `no_js` layout to `no_ember`
While *sometimes* `no_js` was used for visitors without js (for example
disabling it on your browser) it was also used for some pages that were
disabled to JS capable browsers, including the 404 page.

Even worse, sometimes it was used on pages that *had* Javascript, such
as our `/activate-account` route. It has been renamed to `no_ember` to
indicate what it really is, a layout for the site that doesn't load our
Ember.js application.
2015-01-15 15:56:53 -05:00
Jeff Atwood 3ab2f105b4 switch no_js view back to old layout 2015-01-15 12:29:37 -08:00
Jeff Atwood ef8976d68a better no-js and crawler image sizing 2015-01-15 02:20:38 -08:00
Jeff Atwood 71bfde3b4d meant device-width there, oops 2015-01-15 01:37:02 -08:00
Jeff Atwood 6b30f8444e normalize crawler and no-js views 2015-01-15 01:31:30 -08:00
Jeff Atwood 5c92c39003 remove csrf, font-face, css from js-off + crawler 2015-01-15 00:41:30 -08:00
Jeff Atwood 6a6e254096 move viewport meta tag out of shared header 2015-01-15 00:24:39 -08:00
Jeff Atwood 655dd66884 change JS-off "emergency" viewport to 720px 2015-01-14 17:06:45 -08:00
Jeff Atwood 0a4582fbc7 add meta viewport tag to JS-off view just in case 2015-01-14 16:56:01 -08:00
Régis Hanol 6734a51b6a move SiteText.{head,top,bottom} to SiteCustomization 2015-01-14 12:15:53 +01:00
Robin Ward f3b72f5d96 Revert "move SiteText.{head,bottom} to SiteCustomization and remove redundant SiteText.top"
This reverts commit 6ee2849df6.
2015-01-12 20:21:22 -05:00
Régis Hanol 6ee2849df6 move SiteText.{head,bottom} to SiteCustomization and remove redundant SiteText.top 2015-01-12 19:59:43 +01:00
Robin Ward 114cc1c851 FIX: We missed some references to `/category/xyz` in the ruby code base. 2015-01-07 11:47:01 -05:00
Jeff Atwood 86c13ada44 fix a few places we were using /category vs /c 2015-01-06 15:56:07 -08:00
Régis Hanol 853e2ee535 FIX: rss link in category pages 2015-01-02 13:06:57 +01:00
Sam f23eb475a4 FEATURE: remove override stylesheet option, too confusing 2014-12-23 13:03:48 +11:00
Régis Hanol 45dbdb6896 FEATURE: custom emojis 2014-12-23 01:12:26 +01:00
Robin Ward 25755efeee FIX: Safari 7 changed popstate behavior 2014-12-19 10:56:19 -05:00
Robin Ward 72efcc8e86 UX: Make category link text black in digest emails 2014-12-09 11:28:45 -05:00
Robin Ward e035b07e92 Put Ember 1.8.1 + fixes back. 2014-12-04 08:51:35 -05:00
Sam 8977d5917b revert 2014-12-04 09:35:11 +11:00
Robin Ward 39fde5b9fb Upgrade to 1.8.1: So long, metamorphs! 2014-12-03 10:49:18 -05:00
Robin Ward 37a3e956b6 UX: Link categories in digest emails 2014-11-28 13:44:40 -05:00
Jeff Atwood a85a3da167 move digest email featured post category underneath 2014-11-28 00:38:08 -08:00
Régis Hanol 07211489f0 FIX: hide restricted profile info from TL0 users to anonymous in 'JS-off' page 2014-11-27 19:51:13 +01:00
Arpit Jalan 55e2126b1e FEATURE: add topic status namespace in RSS feed 2014-11-25 00:52:26 +05:30
Jeff Atwood e3ff168e42 specify max-width 100% on digest email logos 2014-11-17 02:10:33 -08:00
Jeff Atwood 64140c5fe0 digest email style tweak 2014-11-13 13:44:53 -08:00
Jeff Atwood e78149a97e bg transparency for user profiles 2014-11-12 23:33:45 -08:00
Régis Hanol fe541891fc remove unnecessary <footer> tags 2014-11-12 14:35:20 +01:00
Jeff Atwood 36d094856c normalize footer div on all emails 2014-11-11 23:19:15 -08:00
Sam 1a775aa784 Merge pull request #2784 from chancancode/upgrade-to-rails-master-4-2
[WIP] Upgrade to rails master/4.2
2014-11-11 09:46:02 +11:00
Régis Hanol ec76be964e UX: better footer handling 2014-11-10 21:51:55 +01:00
Godfrey Chan 5d7aca3cc6 Use *_url instead of *_path to avoid a deprecation warning 2014-11-10 01:05:47 -08:00
Jeff Atwood a90176550c let's try no table border on email digests 2014-11-10 00:54:59 -08:00
Robin Ward 0777efe74d FIX: 1000 was a crazy threshold for showing categories at the bottom of
digests
2014-11-07 17:16:52 -05:00
Robin Ward bfe2021859 UX: In digest email lists of topics, show striped version of category
badge
2014-11-07 17:00:09 -05:00
Jeff Atwood 8e38c129c5 minor login copy tweaks 2014-11-06 02:27:27 -08:00
Régis Hanol a5616146eb FIX: remove meta data from lightbox in both excerpt (html & text) 2014-11-05 20:37:00 +01:00
Robin Ward c9eb809dad FIX: The text to users who signed up when approval was required was
misleading.
2014-11-04 15:48:03 -05:00
Robin Ward e66c53a4a7 Add /badges to robots.txt for now, we don't have a crawlable view so
it's better to exclude it.
2014-10-30 14:32:42 -04:00
Robin Ward 572842721d FIX: Better page titles for SEO 2014-10-30 14:26:56 -04:00
Sam 9445000b58 Merge pull request #2920 from yomybaby/patch-1
Update list.rss.erb (unescape tag)
2014-10-27 13:58:42 +11:00
Jong Eun Lee 7679189f28 Update list.rss.erb (unescape tag) 2014-10-27 06:39:09 +09:00
Dean Taylor 715b81ea88 UX: Improve username readability in search results
Avoid lower-case usernames in search results output to improve readability and accuracy - avoid users reading words that don't exist.
2014-10-25 16:52:04 +01:00
Dean Taylor 4ad84c4a2c UX: Improve username readability in search results
Avoid lower-case usernames in search results output to improve readability and accuracy - avoid users reading words that don't exist.
2014-10-25 16:46:47 +01:00
Sam aa9b3bb35a FEATURE: allow long polling to go to a different url
Added the site setting long_polling_base_url , this allows you
to farm long polling to a different server.

This setting is very important if a CDN is serving dynamic content.
2014-10-24 13:38:38 +11:00
Jeff Atwood 736dd6c948 Revert "jQuery-ize the 404 page Google search"
This reverts commit 6b209f0d7e.
2014-10-20 00:22:24 -07:00
Jeff Atwood 6b209f0d7e jQuery-ize the 404 page Google search 2014-10-20 00:19:48 -07:00
Robin Ward a967d4dfba FIX: Support popState on static 404 page 2014-10-15 14:42:18 -04:00
Neil Lalonde 4762b4ac24 FIX: on completion of external auth, window.close may fail because of iOS Safari bug. Prompt user to manually close the window. 2014-10-15 11:00:34 -04:00
Neil Lalonde 96e4d2b662 remove the notification_email_top customization 2014-10-06 17:00:20 -04:00
Sam 29bb9eaa89 Merge pull request #2835 from techAPJ/patch-2
add user email on account created page
2014-10-02 17:29:26 +10:00
Arpit Jalan 41af2d79b5 add user email on account created page 2014-10-02 12:43:44 +05:30
Sam 489078bfcf Merge pull request #2834 from techAPJ/patch-1
trigger "browser password manager" for password reset page
2014-10-02 16:49:00 +10:00
Arpit Jalan 14bc197cf6 trigger password manager for password reset page 2014-10-01 20:43:56 +05:30
Robin Ward be93f224a6 Revert "add user email on account created page"
This reverts commit 164fc1108a.
2014-10-01 10:30:26 -04:00
Arpit Jalan 164fc1108a add user email on account created page 2014-10-01 13:53:50 +05:30
Neil Lalonde 6e11ae4f5c remove deprecated TOS text content 2014-09-29 14:04:53 -04:00
Robin Ward bc53d48bd7 Renaming site contents to site text 2014-09-24 16:08:14 -04:00
Robin Ward d073b908a9 Merge pull request #2818 from techAPJ/patch-4
Trigger browser password manager after signing up
2014-09-23 15:43:31 -04:00
Arpit Jalan b3838c2c1c Trigger browser password manager after sigining up 2014-09-24 01:04:36 +05:30
Régis Hanol 7bc223ef7c FEATURE: improve flags reminder email 2014-09-23 18:37:31 +02:00
Sam 7de33125f3 improve debuggability of code 2014-09-23 09:51:22 +10:00
riking 34db30396c FIX: Bracked category link in no-JS view 2014-09-14 21:55:30 -07:00
lidlanca 33e1790408 stripping port information from Discourse.BaseUrl
Port information if presented in Discourse.BaseUrl may break user avatar URL in the template generation.

https://github.com/discourse/discourse/edit/master/app/assets/javascripts/discourse/models/user.js
avatarTemplate()

In the future there should be a way to reference baseUrl with or without port information
2014-09-12 16:29:17 -04:00
riking 2c6d03f87f SECURITY: Limit passwords to 200 characters
Prevents layer 8 attack.
2014-09-12 12:07:11 -04:00
cpradio 3bd0c94d96 UX: Add password instructions to Reset Password page
Added the password instructions to the reset password page.
https://meta.discourse.org/t/reset-password-doesnt-give-password-requirements/19799
2014-09-09 20:37:39 -04:00
Neil Lalonde a8e4c4caa1 Add classes to the FAQ, Terms of Service, and Privacy nav links so they can be individually styled 2014-09-08 09:32:26 -04:00
Arpit Jalan 362c05db43 Show category badge on 404 page topics 2014-09-06 17:06:12 +05:30
Jeff Atwood 3e74a19b67 remove hard-coded CSS on 404 page 2014-09-06 01:01:05 -07:00
Sam 8ab9c57ca5 Merge pull request #2707 from eyalev/rtl-email
Enable RTL direction in emails.
2014-08-29 09:54:57 +10:00
Robin Ward 8bf27642ad FIX: Refresh was losing top controls after bulk operation. Removed
console.log
2014-08-28 14:44:38 -04:00
Robin Ward bf8528b6ec FIX: Use the `bumped_at` date for the RSS feed for a topic 2014-08-27 12:34:47 -04:00
Eyal Levin e0c2f3df3a Enable RTL direction in emails. 2014-08-27 14:38:03 +03:00
Jeff Atwood 79f7a922ef add <hr> between sections of digest email 2014-08-22 12:15:02 -07:00
Jeff Atwood 4508fbe9e6 remove <hr> between Popular Posts in email digest 2014-08-19 23:23:20 -07:00
Konrad Borowski 14486a2e19
Allow translating "Log In" button in HTML code. 2014-08-12 11:23:45 +02:00
Jeff Atwood a51bf08346 change "Sign In" back to "Log In" for now 2014-08-11 16:08:55 -07:00
Robin Ward 39c7101c4b TWEAK: Remove `TransitionAborted` exceptions from logging. They are
apparently normal when you abort a router transition and can be ignored.
2014-08-07 16:52:31 -04:00
Neil Lalonde 1530f33833 FIX: use iso8601 timestamp format in crawler view of a topic 2014-08-06 17:27:28 -04:00
Robin Ward 6783565d8f Revert "Enable RTL direction in emails." 2014-08-06 15:30:07 -04:00
Eyal Levin f8c99a35d0 Enable RTL direction in emails. 2014-08-06 15:27:15 +03:00
Neil Lalonde 5a33e6f00c Move FAQ, Terms of Service, and Privacy Policy into topics in the Staff category. First post of those topics will be rendered on their respective pages. Site settings and content are not used for these documents anymore. Translations of the default text is moved into the standard YML files. 2014-07-25 14:41:20 -04:00
Neil Lalonde b4ad70d767 FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds 2014-07-23 12:32:12 -04:00
M Smart 0d9e2b5df5 Move the scripts helper into a better place. 2014-07-22 20:14:57 -04:00
M Smart ec280913b2 Enumerate deferred scripts with a sprockets helper 2014-07-22 19:46:43 -04:00
Robin Ward eafde36228 FIX: If a site has no logo, don't show a broken image in the digest. 2014-07-21 14:18:32 -04:00
Robin Ward ede8f22971 Use the header background color for a site in the digest email. 2014-07-17 12:31:37 -04:00
Robin Ward f2dd35ab08 Improve the unsubscribe to digest experience. Give a link in case it
fails, provide a different message if you are logged in as a different
user, increase expiry to 2 months from 1 week.
2014-07-15 17:20:59 -04:00
Robin Ward 4f416bf6ce Check honeypot/challenge value on activation too 2014-07-15 14:07:35 -04:00
Neil Lalonde 766196af87 FEATURE: add site setting allow_new_registrations which can be used to block all new account registrations 2014-07-14 15:42:22 -04:00
Robin Ward cce7cf8c85 FEATURE: Require Javascript to activate an account via email link 2014-07-14 12:26:10 -04:00
Sam 5477325376 FIX: should use "script" to allow cdn 2014-07-14 08:47:06 +10:00
Neil Lalonde e565ae2528 FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting 2014-07-10 12:58:41 -04:00
Sam 5032c96486 FIX: disable x accl redirect for CDN assets
We need to keep headers in tact
2014-07-10 16:32:46 +10:00
Jeff Atwood 97979c1a32 Merge pull request #2522 from awesomerobot/master
adapting the layout to fit more viewports
2014-07-09 17:28:32 -07:00
Kris Aubuchon 291459bb91 first steps to making discourse more responsive 2014-07-09 19:56:35 -04:00
Jeff Atwood 1ee3cf8c1d fix some minor 404 search page issues 2014-07-08 15:57:41 -07:00
Sam decff6dc85 revert viewport change on mobile
(truncates stuff on iphone)
2014-07-03 20:34:13 +10:00
Sam 9157f51618 FEATURE: upgrade font awesome to head 2014-07-03 17:58:12 +10:00
Kris Aubuchon aee73d901a fixing a handful of issues 2014-07-02 23:21:45 -04:00
Régis Hanol 7feab2fc99 Revert "background on topic-list, more width on extra-info-wrapper, meta viewport fix" 2014-07-02 16:55:43 +02:00
Kris Aubuchon e0194e69a5 adding background to topic-list, making max-width larger on extra-info-wrapper, and changing viewport config 2014-07-02 09:54:40 -04:00
Jeff Atwood dfd011e986 put the actual GitHub URL in the meta="generator" 2014-07-01 00:03:07 -07:00
Sam fd52c88548 Add classes for styling 2014-06-25 09:47:12 +10:00
Jeff Atwood fa415cd120 de-duplicate <footer> ids 2014-06-24 00:12:07 -07:00
Neil Lalonde 753610f8db Add meta generator tag with the Discourse version. Use a partial for common head elements. 2014-06-19 18:18:09 -04:00
Neil Lalonde 82693daa3d Put the 'Powered by Discourse...' message shown to crawlers and no-js visitors in a footer element so that SEO something something. 2014-06-19 18:18:09 -04:00
riking cd186aee56 Allow a sepearate mobile logo URL 2014-06-18 12:44:00 -07:00
Robin Ward 17d341ff86 FIX: crawler versions of the page need the updated bio relationships. 2014-06-13 14:55:32 -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
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 24cde6c604 Actually, it *should* be `user_path` and not `userpage_path` 2014-06-04 16:51:48 -04:00
Archon ed72d4665e Remove useless table border 2014-05-31 23:03:55 +02: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
Janusz Skonieczny ff8f70cb1d New translation per instructions:
https://github.com/discourse/discourse/pull/2383#issuecomment-44501238
2014-05-29 09:54:44 +02: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 8267a451b2 Disallow /users/ in robots.txt 2014-05-23 10:28:26 -04:00
Jeff Atwood e34321af7a add sign in user glyph to 404 page 2014-05-23 01:01:09 -07: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
riking 7f0b66246b Tweak the no-js layout 2014-05-20 16:34:18 -07:00
Harry Seo 2ef2afa06c korean translation: *.ko.html.erb 2014-05-20 14:40:21 +09: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
Robin Ward ab319de4f9 FIX: Github commit oneboxing formatting in emails 2014-05-14 16:40:54 -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
Neil Lalonde 9f4171e487 Fix my prev_page code, thanks to riking 2014-05-13 10:15:28 -04: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
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
Robin Ward e713cc40c4 First attempt: Move username on top of embedded posts 2014-05-09 15:14:00 -04: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
Neil Lalonde 63a1f87806 Use topic excerpts and category desriptions in meta description tags for crawlers 2014-05-07 11:21:37 -04: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
Jeff Atwood 0fa7aec74a minor copyedits on faq and digest 2014-04-30 16:20:23 -07: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
Robin Ward f50039b48b Support 404 routes in the Ember App 2014-04-29 15:29:13 -04:00
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 2341118570 Add categories to the first topics in the email digest 2014-04-17 15:22:19 -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
Robin Ward fc65bc28be FIX: Use the container to register Discourse's custom location handler 2014-04-17 10:45:06 -04:00
Neil Lalonde f0e8423445 FIX: don't show hidden posts to crawlers, disabled javascript, and in rss feeds 2014-04-15 12:49:08 -04:00
Neil Lalonde cb11967715 Add transifex config. Reconcile client.yml and server.yml translations in github and transifex. Transifex is now the source of all client.yml and server.yml files. 2014-04-10 15:42:38 -04:00
Sam ac097e2d0f Merge pull request #2244 from vikhyat/css-import
Site Customization @import fixes
2014-04-10 07:01:34 +10:00
Neil Lalonde 7d760a5145 Add subcategory badge to digest emails 2014-04-09 13:59:39 -04:00
Vikhyat Korrapati 33307a50b3 Get rid of plugins.css, inject it using DiscourseSassImporter. 2014-04-09 19:42:43 +05:30
Benjamin Kampmann d22df7731d Allow plugins to ship custom styles only for mobile
- adds another :mobile-flag to register_assets
- adds test for plugin registering of assets
- load plugins when on desktop and plugins_mobile when on mobile
2014-04-07 16:33:35 +02:00
Neil Lalonde ecf211aa3f Send email to contact_email if there are flags submitted more than 48 hours ago. Configurable with the notify_about_flags_after site setting. 2014-04-03 14:34:40 -04:00
Vikhyat Korrapati ef99ab59a5 Allow importing Discourse styles in custom stylesheets to modify vars. 2014-04-01 23:04:50 +05:30
Régis Hanol 77a8a4083a Revert "Merge pull request #2125 from vikhyat/css-variables"
This reverts commit b537de3ca5, reversing
changes made to b925827e5b.
2014-04-01 16:24:29 +02:00
Vikhyat Korrapati ddd1dfe896 Allow importing Discourse styles in custom stylesheets to modify vars. 2014-04-01 15:25:43 +05:30
Onaldanm 750745ba5f French Translations Updates
Updates client and server
Fix wrong "active" in privacy.html
Use same same terms between faq/tos/privacy page.
2014-03-26 11:24:58 +01:00
Robin Ward 9d1855f92f Always use lower case URLs, fix date formatting and add full date title 2014-03-23 15:22:02 -04:00
Robin Ward f1b11327dd Also link avatar to user profile 2014-03-20 16:12:41 -04:00
Robin Ward f2e17af130 Add staff and new user colours to embedded discourse. Also link
usernames to profiles.
2014-03-20 16:04:50 -04:00
Robin Ward e8ee490778 Extract breaking up a string into a separate file, include it in
embedded view.
2014-03-20 14:34:51 -04:00
Robin Ward db8f4ea58f Don't show "in reply to" when there's a quote 2014-03-20 14:02:21 -04:00
Robin Ward 3fbb2cd728 Improve date displaying on embedded comments 2014-03-20 13:25:17 -04:00
Robin Ward 375719edfb FIX: Links in the iframe should all be target=_blank 2014-03-20 10:57:36 -04:00
Sam b77fe49150 Stop leaking site_email in rss 2014-03-19 09:46:48 +11:00
Vikhyat Korrapati 5c1fe30cd6 Include opengraph/oembed tags in the crawler layout. 2014-03-16 19:30:26 +05:30
Robin Ward 158487dfc2 FIX: Clean up next/prev rel links 2014-03-03 12:56:37 -05:00
Jeff Atwood 66ae439ded rel="prev" and rel="next" for topic also 2014-03-01 02:16:40 -08:00
Neil Lalonde 7288bf1f31 Add previous page link for crawlers 2014-02-25 12:15:48 -05:00
Neil Lalonde 8134113b22 Add rel=next to next page link for crawlers 2014-02-25 10:18:07 -05:00
Kris Aubuchon 6b050825ff revising color variables appwide, also some adjustments to "topic not found" page 2014-02-23 20:47:44 -05:00
Robin Ward d95887c57d CHANGE: We now include the `_escaped_fragment_` support by default, but
only if the crawler check fails. It is a fallback for non-google search
engines that support the Ajax crawling API.
2014-02-20 17:02:26 -05:00
Robin Ward c4b5455c21 REFACTOR: Rename `GooglebotDetection` to `CrawlerDetection` because we
will likely whitelist more crawlers in the future.
2014-02-20 16:07:02 -05:00
Neil Lalonde 7f6b2e5563 Show login button on 404 page. Add routes to show login and signup modals when page/route loads. If logged in and showing 404 page, load ember app. 2014-02-18 17:18:53 -05:00
Neil Lalonde d298e2e065 Detect Googlebot from user agent and use a different layout that doesn't load javascript 2014-02-15 17:54:34 -05:00
Neil Lalonde 9c4dc9a966 Block browser-update.js in robots.txt. Move noscript block above everything else in application layout. 2014-02-14 15:33:00 -05:00
Sam 4803d387bc BUGFIX: another broken rss page when it includes system user 2014-02-12 14:29:58 +11:00
Sam 03619917f0 BUGFIX: rails is choking on userpage_url for System user, breaks rss 2014-02-12 14:08:09 +11:00
Robin Ward 14f075e812 Missing semicolon; 2014-02-11 14:57:14 -05:00
Sam 7ad00f426c FEATURE REMOVAL: persona login
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
2014-02-11 16:56:48 +11:00
Robin Ward fc36a87e72 FIX: Invalid ruby code for universal google analytics 2014-01-30 15:45:24 -05:00
Robin Ward 88e1fadd0f Merge pull request #1863 from ecuk/analytics
Google Universal Analytics
2014-01-27 12:33:17 -08:00
Shiv Kumar 8cf467042e make google search url protocol independent 2014-01-26 15:24:38 -08:00
Shiv Kumar 2b837827ae make search on 404 page secure 2014-01-26 14:48:12 -08:00
Eric Carlson bc033283c6 Google Universal Analytics 2014-01-25 17:42:25 -07:00
Robin Ward c9cca78ab2 FIX: Show "Begin Discussion" button when there are 0 replies 2014-01-23 12:59:10 -05:00
Robin Ward 39c6e48aa5 FEATURE: Return only the first paragraph of text in HTML digests, unless
there is only one post. In that case return everything. Remove
dependency on 'html_truncator'
2014-01-22 12:37:37 -05:00
Robin Ward 502b4730c8 FIX: Don't show uncategorized badges in digest emails 2014-01-22 11:27:57 -05:00
Neil Lalonde ba74226346 FIX: invited users get clearer messaging when setting a password for the first time 2014-01-21 12:42:26 -05:00
Régis Hanol 8d2e5041bc BUGFIX: proper handling of /none subcategory 2014-01-18 19:27:25 +01:00
Sam a247389d4e FEATURE: automatically update site to latest version of assets
if a user neglects to move around the site it will prompt to do so 2 hours in
2014-01-15 12:08:35 +11:00
Sam fd95dbe75a FEATURE: Automatically force a full refresh between pages if assets change 2014-01-15 12:08:35 +11:00
Robin Ward c82279b9bd FIX: When embedded, don't show button at the top unless there are more than 10 posts. 2014-01-14 16:06:04 -05:00
Neil Lalonde b9bda77abd Page title includes page number for web crawlers 2014-01-14 11:16:10 -05:00
Neil Lalonde 88d9f3a786 Disallow auth callbacks in robots.txt 2014-01-14 10:42:22 -05:00
Robin Ward 819ac61eb9 Let's put the "5 replies" back at the top of a comments section 2014-01-13 14:15:48 -05:00
Robin Ward 55918e6835 Adjustments to embedded content 2014-01-13 10:59:46 -05:00
Neil Lalonde 7cbcd72ea4 Add site_description to meta description tag for real 2014-01-09 16:42:22 -05:00
Sam 60a3641cc5 BUGFIX: rss feed link for topics has been broken ever since we upgraded rails 2014-01-08 17:20:46 +11:00
Robin Ward b268ea8363 Improved Embedded templates slightly. 2014-01-07 15:48:39 -05:00
Robin Ward 25caec0e62 Change text at the bottom of embedded comments to be (x more replies) 2014-01-03 14:55:37 -05:00
Robin Ward c762e3c4b1 Support for scrolling to another post in the iframe; more complicated than you'd think! 2014-01-03 14:45:59 -05:00
Robin Ward 59ea1c3c2c Embedded: Change bottom link to last post, show deleted posts correctly. 2014-01-03 13:08:52 -05:00
Robin Ward 1ffcf39448 Make embedded comments look nicer 2014-01-03 12:52:42 -05:00
Robin Ward 9f2150faea FIX: Logo needs target=_blank 2014-01-02 16:41:08 -05:00
Robin Ward 01be681a95 Link embeded topic to second post. They've already read the first. 2014-01-02 11:59:20 -05:00
Robin Ward 1478f08e4f In development mode, relax restrictions on embedding. 2014-01-02 11:32:50 -05:00
Régis Hanol abf910d210 FEATURE: allow for custom HTML inside the <head> tags 2014-01-02 16:22:04 +01:00
Robin Ward 4f8aed295a FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra 2013-12-31 15:01:22 -05:00
Robin Ward 62db063e1e Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
which not every server has. Have to rethink this.

This reverts commit e3e4c62887.
2013-12-31 12:52:31 -05:00
Robin Ward e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
Régis Hanol 567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Sam b67a3a85dd split js with vendor/application
avoid one huge js bundle and instead break it down
to application and vendor (3rd party) our app changes
a lot, vendor changes a lot less
2013-12-23 10:32:07 +11:00
Robin Ward 40327c25e8 Merge pull request #1747 from alxndr/rss-tweak
tweak RSS elements for W3C compatibility
2013-12-19 08:26:04 -08:00
Neil Lalonde 1f0a59584b Revert "Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-18 14:47:22 -05:00
Neil Lalonde 58e5d532c5 Revert "Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server." 2013-12-18 14:47:12 -05:00
Alexander 8294dced6c tweak RSS elements for W3C compatibility
installation needs to have contact_email set in the admin settings in
order for that installation to have truly valid feeds
2013-12-18 11:06:36 -05:00
Régis Hanol 4c6b535cc0 move arbitrary html content out of noscript and into the preloadstore 2013-12-17 18:25:27 +01:00
Alexander d93e4fc65d add more info to rss feeds 2013-12-15 01:17:39 -08:00
Sam 8ccab6d140 Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server. 2013-12-13 15:17:05 +11:00
voisintotoro cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Neil Lalonde 5171a23a9c Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-11 11:19:22 -05:00
Neil Lalonde ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Neil Lalonde 2596f7dec2 Revert "Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-09 16:28:11 -05:00
Neil Lalonde ca5d4d5e54 Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations. 2013-12-09 13:28:42 -05:00
Neil Lalonde e3660e59b4 Strip http(s) from SiteSetting.ga_domain_name 2013-12-06 11:46:52 -05:00
Neil Lalonde 7bbb32bac2 Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason. 2013-12-02 15:57:23 -05:00
Robin Ward 48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
MK 2d4e62dd64 Fixed broken links in Digest email
Based on @eviltrout's fix from 7a60eacca9.
2013-12-02 01:11:55 -05:00
Sam 8d859a9f68 break cache of fonts 2013-12-02 08:19:34 +11:00
Robin Ward 7a60eacca9 FIX: Broken unsubscribe link in HTML email 2013-11-29 17:13:16 -05:00
Robin Ward 781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Robin Ward 8c8645f158 FIX: Code and Emoticon formatting in HTML emails. 2013-11-28 17:21:14 -05:00
Neil Lalonde 4ec0543362 FIX: emails with embedded posts should always use absolute URLs 2013-11-28 15:57:21 -05:00
Neil Lalonde 746e115f99 Fix path of browser-update 2013-11-27 13:56:22 -05:00
Neil Lalonde 8a9bef944f Fix browser-update.js so it doesn't depend on jQuery 2013-11-27 12:26:27 -05:00
jjangg96 c2e7e72b74 faq.ko.html.erb Added
Korean translate updated.
2013-11-27 12:21:59 +09:00
Gilles Manzato 231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Régis Hanol dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
Régis Hanol 07cbf8f4e3 do not customize the admin section 2013-11-14 16:41:16 +01:00
Sam 8339337cd1 strip out docker stuff, put into a plugin 2013-11-13 17:42:31 +11:00
Régis Hanol e9f9d22482 add query parameter to temporarily disable customization 2013-11-12 18:14:22 +01:00
Sam 932c2675a7 work in progress, admin page for upgrades (provides source lives in git) 2013-11-12 16:42:35 +11:00
Régis Hanol 934ede7d91 shorter message for untranslated strings 2013-11-04 11:52:12 +01:00
Sam 8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Sam b567bd3d37 shift site settings in front of routes 2013-10-18 11:10:10 +11:00
voisintotoro b997cc2486 New update of the french translation
I hope i didn't missed some of the previous remarks.
2013-10-16 22:10:29 +02:00
Régis Hanol c38ba8acdd add rss links to anonymous homepages 2013-10-11 18:43:29 +02:00
Wojciech Zawistowski cd3a2143d2 remove unnecessary return statement inside Discourse.Router.map
Ember's Router.map(callback) method doesn't expect any value to be
returned by callback function. Therefore, return statements present
inside Discourse.Router.map are unnecessary (and are silently ignored by
Ember).
2013-09-19 17:26:43 +02:00
Neil Lalonde 13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Neil Lalonde f86aead49e Disable custom stylesheets on mobile for now. 2013-09-13 14:54:57 -04:00
Neil Lalonde 5071d71294 Don't show custom header on mobile view 2013-09-12 18:46:35 -04:00
Neil Lalonde b73f4e9864 Put category description in meta description tag 2013-09-09 11:38:09 -04:00
Neil Lalonde 45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Sam c9321cae7f Our JS includes belong at the top of the file, that way we can start
downloading and parsing them earlier and not wait for the rest of the page

Our noscript stuff belongs at the bottom, we should not hold off any js work
while noscript is downloading
2013-09-05 10:41:11 +10:00
Neil Lalonde 4827634df9 rename application.css.erb to desktop.css.erb 2013-08-28 16:41:05 -04:00
Neil Lalonde 3cfc9a7bba Create a mobile css manifest 2013-08-27 16:40:30 -04:00
Neil Lalonde 9efa29e688 Detect whether to use mobile view. Session var mobile_view can override automatic detection. 2013-08-27 14:57:42 -04:00
Neil Lalonde 89265c3a8b FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything. 2013-08-27 11:31:14 -04:00
Sam ac905d4a08 defer persona init till after people launch the login dialog 2013-08-26 17:51:41 +10:00
Sam 075002a6d5 refactoring the plugin interfaces to allow for better extensible 2013-08-26 12:59:17 +10:00
Robin Ward 40599d20e8 FIX: Footer formatting in digest emails 2013-08-16 12:19:26 -04:00
Jeff Atwood 8303f48004 add dimmed color to digest footer 2013-08-15 15:18:11 -07:00
Robin Ward 652169daf6 Include a list of more new topics in the digest emails at the bottom 2013-08-09 14:43:02 -04:00
Don Denton a53a6667aa Added a missing "#" to href for TOS. 2013-08-07 00:45:55 -04:00
Jeff Atwood 0f067a2ad3 we need that <hr> in notification emails, I think 2013-08-01 15:15:32 -07:00
Sam d51dcd1705 improve email styling, include extra respond link 2013-07-26 17:27:46 +10:00
Sam 366cb13140 restyle all user notification emails to use a custom html template 2013-07-24 17:24:55 +10:00
J. Bruni e257cfc56c Merge branch 'master' into pt_BR 2013-07-22 16:00:09 -03:00
J. Bruni 1c78b485d3 Brazilian Portuguese translation (FAQ) - improvements and corrections 2013-07-22 15:46:26 -03:00
J. Bruni 701eac17c7 Brazilian Portuguese translation (Terms of Service) 2013-07-22 15:45:40 -03:00
Robin Ward 0c4e3d5233 Merge pull request #1221 from jbruni/patch-1
Update faq.en.html.erb (only fixed a comma position)
2013-07-22 07:35:00 -07:00
J Bruni 695d2abdbc Update tos.en.html.erb
Substituted literal "Wordpress" (as seen at http://en.wordpress.com/tos/) by company domain tag
2013-07-21 23:20:39 -03:00
J. Bruni af8ea2d87d Brazilian Portuguese translation (Privacy) 2013-07-20 18:57:07 -03:00
J. Bruni d38caed7fb Brazilian Portuguese translation (FAQ) 2013-07-20 18:56:45 -03:00
J Bruni d474944043 Update fq.en.html.erb (only fixed a comma position)
you love pull requests, and I care about details
2013-07-20 04:24:00 -03:00
Sam e9d37f395f hmm I totally missed that it was already there 2013-07-16 21:06:04 +10:00
Sam 06bd9e3234 allow login required screen to be customized 2013-07-16 20:49:04 +10:00
Robin Ward 19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Anton Batenev ed1fb847ed Russian translation (actual version) 2013-07-09 18:26:59 +04:00
Sam e993d6b29b upgrade font awesome to version 3.2.1, use scss instead of css for the include. 2013-07-09 10:06:57 +10:00
Sam 180d887481 title for category pages 2013-07-08 16:01:40 +10:00
Sam 2f096083d0 custom title for user page 2013-07-08 15:56:13 +10:00
Robin Ward dd6530f45c Merge pull request #1151 from abbat/patch-1
Fix title for plain view
2013-07-06 17:09:44 -07:00
Anton Batenev 3dc850e3d4 Add "Next page" link to plain topic view
"Next page" link also under noscript tag and not indexed by old crawlers.
2013-07-06 18:57:08 +04:00
Anton Batenev 8cac92dd11 Fix title for plain view
Fix title for plain view - remove <a href=> tag from title.
2013-07-06 16:58:44 +04:00
Neil Lalonde 1c0e0da683 Add rss feed for latest and hot 2013-07-05 16:49:06 -04:00
Robin Ward 7335f5fb7f Merge pull request #1145 from abbat/yandex-workaround
Workaround solution to help Yandex crawler index discourse.
2013-07-05 10:04:40 -07:00
Neil Lalonde 594cb50f18 Use the correct locale in html lang attribute 2013-07-04 14:32:16 -04:00
Neil Lalonde 227294897e Remove .rss from the link element of channel in a category's rss feed 2013-07-04 14:17:01 -04:00
Anton Batenev af36d32f7f Workaround solution to help Yandex crawler index discource.
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
2013-07-04 22:08:23 +04:00
Robin Ward ce0a7739cf FIX: Invalid Unicode in preload store JSON 2013-07-02 20:43:52 -04:00
Sam 12f866a727 Merge pull request #1120 from abbat/master
Russian translation (actual version)
2013-07-01 22:44:30 -07:00
Sam 46c6949b6e Merge pull request #1123 from stephankaag/rails4-new
Refactor routes in order to be compatible with Rails 4
2013-07-01 16:07:22 -07:00
Stephan Kaag e39cc464b1 Refactor routes in order to be compatible with Rails 4 2013-07-01 20:00:06 +02:00
Anton Batenev 5281ba5af3 Russian translation (actual version) 2013-07-01 11:14:19 +04:00
Robin Ward bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Robin Ward 89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Anton Batenev fe51fd87cc Russian translation (actual version) 2013-06-24 15:55:44 +04:00
Anton Batenev f1a1b8ca11 Russian translation (actual version) 2013-06-20 03:44:07 +04:00
Sam e6e81efe85 correct information leak in page not found 2013-06-13 10:27:17 +10:00
Anton Batenev f6060d5ff6 Russian translation (draft) 2013-06-12 06:58:16 +04:00
Robin Ward 8b4e3402c2 Small improvements to digest emails and preview mechanism. 2013-06-11 12:27:11 -04:00
Chris Hunt 268a5debbf Add 'apple touch icon url' site setting 2013-06-06 14:43:05 -07:00
Robin Ward 8f32aed944 Only use HTML templates for the digest email. 2013-06-06 15:08:56 -04:00
Robin Ward 7bc80c2dcf Changed HTML Digest template. Removed margins, shrunk logo. 2013-06-06 14:45:32 -04:00
Robin Ward 6384518599 Allow images in the daily digest for top scoring posts 2013-06-05 18:55:27 -04:00
Robin Ward 4d1e8356b8 FIX: Again, try to get a flexible absolute logo_url 2013-06-05 18:23:43 -04:00
Robin Ward 8328aa97fd FIX: HTML email should use image_tag to get the correct path to the image 2013-06-05 18:01:40 -04:00
Robin Ward 0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Robin Ward dfba2b6e0a FIX: Strip links from google indexed bios when the users are new. 2013-06-05 15:28:10 -04:00
Chris Hunt 3074300f76 Allow customization of 'login required' message 2013-06-04 18:53:36 -07:00
Chris Hunt 28aeb1d36c Remove static navigation from login page 2013-06-04 18:20:03 -07:00
Chris Hunt 122f9188c9 Redirect Ember routes to login if login required 2013-06-04 16:10:10 -07:00
Jeff Atwood 0606725b29 fix some /tos and /privacy issues 2013-05-31 16:43:29 -07:00
Jeff Atwood 2982c23265 add quotes around favicon URL 2013-05-31 12:18:41 -07:00
Robin Ward fea3f326a9 FIX: Persona login was not using promises 2013-05-31 13:16:14 -04:00
Neil Lalonde 5d444be72b Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number 2013-05-30 10:39:15 -04:00
Robin Ward 560fb15d8a Include pinned topics in category list.
- removes an (n+1) query for user data
- supports the preload store for the data to avoid a second request
- fix a bug where uncategorizes was reporting (0, 0, 0) for topics by week, month, year
2013-05-28 15:36:16 -04:00
Robin Ward bd99d5a40c Calls to Discourse.ajax no longer need `getURL` -- will be done automatically. 2013-05-07 15:16:27 -04:00
slainer68 ac66f25043 Google Analytics Domain name site setting 2013-05-03 21:58:10 +02:00
Sam 42494b5bb1 we can't trust CSRF for anon the way it is designed.
The page they have loaded may be cached we need a different way of delivering the CSRF potentially
2013-05-03 16:43:11 +10:00
Sam 5ec52bd2e9 :s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff 2013-05-02 17:22:27 +10:00
Sam 65cd00cf25 moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5
allow pms to be targetted at groups
2013-05-02 15:15:53 +10:00
Sam e5c5c0bbb3 no_js to use site customisations 2013-05-01 11:04:47 +10:00
Régis Hanol ede9d2a0a8 show diff in post history view 2013-04-29 03:20:51 +02:00
Neil Lalonde 6063f81946 Show something on categories page when js is disabled 2013-04-26 13:10:41 -04:00
Sam d0a8cfa6c0 more persona supression 2013-04-19 11:07:15 +10:00
Sam 6ae212235c move persona a bit, still should be yanked out further 2013-04-19 10:34:39 +10:00
Kuba Brecka 38ea6cff62 extracting one more hardcoded title 2013-04-18 11:24:47 +02:00
Paul Young aad9fc1032 Fixes #718: Changed password field type on Access Code entry page. 2013-04-16 18:03:21 -04:00
Sam 3bc4aefe87 fix double include 2013-04-16 18:43:07 +10:00
Jeff Atwood 00d0072d2d make ToS clear that USA stuff applies to USA only 2013-04-14 12:12:04 -07:00