Commit Graph

2513 Commits

Author SHA1 Message Date
Régis Hanol e6e04ca0e9 FIX: new user username color 2013-12-20 00:58:48 +01:00
Régis Hanol 452232096f smaller images in oneboxes 2013-12-20 00:32:39 +01:00
Neil Lalonde 66616c9574 Categories page is even better on Nexus 7 (and probably iPad mini) 2013-12-19 16:51:18 -05:00
Neil Lalonde 854d9c8fc6 Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length. 2013-12-19 16:15:47 -05:00
Robin Ward 4f7d440fa4 Remove unused hook. 2013-12-19 14:43:36 -05:00
Robin Ward 1cac9fa257 New users can only post `newuser_max_replies_per_topic` times per topic. 2013-12-19 13:45:55 -05:00
Neil Lalonde 39e711783d FIX: alignment of avatars and category badge on mobile 2013-12-19 11:55:54 -05:00
Robin Ward 3be026b1da Merge pull request #1748 from alxndr/profile-bio-newlines
respect newlines in About Me on profile page
2013-12-19 08:24:18 -08:00
Régis Hanol 8dad928557 Add setupTopicController event 2013-12-19 17:01:22 +01:00
Alexander 7b2835b73f respect newlines in About Me on profile page 2013-12-19 10:54:37 -05: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 eeed9abcf0 Style categories page for mobile 2013-12-18 11:50:51 -05:00
Harry Seo dfc95d0f6f FIX: Title text should be correctly escaped since we are generating a raw html. 2013-12-18 12:18:59 +09:00
Neil Lalonde 39a360f6e3 Improve tooltip on categories stats. 2013-12-17 17:43:04 -05:00
Neil Lalonde 47c6bb4cf2 Improve how category stats are rendered 2013-12-17 17:43:04 -05:00
Régis Hanol 94fda12795 use a helper instead of a view for custom HTML content 2013-12-17 18:56:59 +01:00
Neil Lalonde 24d81e2364 FIX: deprecation warning in create_account_controller.js. Need to move createAccount into actions. 2013-12-17 12:39:29 -05:00
Neil Lalonde 7fa07f3401 create_account_controller.js passwordRequired needs the same logic as user_authenticator. Make twitter and facebook signup work again. 2013-12-17 12:39:29 -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
Régis Hanol 1b6050bdb0 only display inline HTML revision history on mobile 2013-12-17 17:45:04 +01:00
Régis Hanol 76c246664d FIX: ensureMaximumDimensionForImagesInPreview wasn't always working 2013-12-17 17:20:06 +01:00
Sam 5bd595c9a6 FEATURE: default_code_lang for syntax highlighting is configurable 2013-12-17 12:08:29 +11:00
Neil Lalonde 7fb985a02e Improve spacing of registration form, and add instructions to the password field. 2013-12-16 17:31:21 -05:00
Robin Ward 2326d4ceb7 FIX: text node emitters should always take strings as parameters even if they
return JsonML.
2013-12-16 15:41:46 -05:00
Neil Lalonde 341adc93a4 Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories. 2013-12-16 15:13:57 -05:00
Robin Ward 30d1801703 Merge pull request #1739 from vikhyat/uncategorized-topics
Don't show "uncategorized" in the category dropdown if allow_uncategorized_topics is false.
2013-12-16 10:57:45 -08:00
Robin Ward acf262b631 Support for "no subcategories" 2013-12-16 13:06:35 -05:00
Régis Hanol 8fff53775a revision history: no hover state on buttons when disabled 2013-12-16 16:02:25 +01:00
Régis Hanol fd749a9c6e revision history: proper word-wrap in markdown view 2013-12-16 15:57:13 +01:00
Vikhyat Korrapati 03e152ee21 Don't show "uncategorized" if allow_uncategorized_topics is false. 2013-12-15 15:56:06 +05:30
Neil Lalonde 49c3482464 Show topic and post counts by day/week/month/year on categories page 2013-12-13 15:37:45 -05:00
Robin Ward a7a7387da1 Automatically convert some quotes to blockquotes 2013-12-13 15:31:25 -05:00
Robin Ward 1bbd1a94bb Cold/Hot classes in Topic Map 2013-12-13 13:43:20 -05:00
Robin Ward 26e75c5ceb Double reading speed estimate. People skim. 2013-12-13 12:23:20 -05:00
Neil Lalonde eadf5e9b02 Move columns around on wide categories page 2013-12-12 17:27:25 -05:00
Neil Lalonde ee5637d4ff FIX: font-awesome issue on site settings buttons 2013-12-12 16:09:44 -05:00
Neil Lalonde 9f9852a8dd FIX: broken font-awesome icons on user activity pages 2013-12-12 16:07:34 -05:00
Neil Lalonde 52cf27b0a6 FIX: layout problems on categories page 2013-12-12 15:52:36 -05:00
Neil Lalonde 6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Régis Hanol cf44b9e9d9 add image dimensions & size in lightbox 2013-12-12 17:39:20 +01:00
Régis Hanol dd93407789 FIX: images should also be inlined in the cooked view 2013-12-12 16:57:56 +01:00
Régis Hanol 06dd7ffe3c better revision history 2013-12-12 03:41:34 +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
Robin Ward 6853f37bee Show estimated reading time near summarize button. 2013-12-10 13:47:36 -05:00
Robin Ward b0e6475b07 FIX: Staff should be able to see PMs 2013-12-10 11:30:45 -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
Robin Ward ef432902ce Missing percentage. CANADIAN SORRY! 2013-12-09 14:48:32 -05:00
Robin Ward 744add9ece FIX: Post count progress was a little off. Minor fix to hidden posts 2013-12-09 14:28:32 -05:00
Robin Ward 5280e279f7 FIX: Merge conflict; "of" number in progress bar was incorrect. 2013-12-09 13:44:37 -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
Vikhyat Korrapati 621b2b5972 enable_names site setting implementation. 2013-12-08 19:31:25 +05:30
Robin Ward f9243a10cc Don't debouce `afterRender`, debounce the preview refreshing mechanism. 2013-12-06 17:14:18 -05:00
Neil Lalonde 9a24d2651d Allow category to auto-close topics in X hours instead of days. FIX: the system message that says a topic was automatically closed was only counting in days. 2013-12-06 16:39:35 -05:00
Robin Ward 8cc6cd933a Don't allow filtering by user in summary mode and vice versa. It's just confusing. 2013-12-06 13:53:19 -05:00
Robin Ward b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Robin Ward 314a0e3fad Some style changes for omitted posts, also mobile style. 2013-12-06 12:51:00 -05:00
Régis Hanol e103176400 FIX: actually show the upload avatar modal when allow_uploaded_avatars is true 2013-12-06 12:13:24 +01:00
Régis Hanol a7eced3a06 Merge pull request #1723 from vikhyat/disable-uploads
Don't show uploading forms if the relevant site settings are disabled
2013-12-06 00:26:50 -08:00
Vikhyat Korrapati 483c9f9826 Don't show the upload avatar modal is allow_uploaded_avatars is false. 2013-12-06 11:31:11 +05:30
Vikhyat Korrapati 2850279c45 Don't show the upload option if max_attachment_size_kb is 0. 2013-12-06 10:29:15 +05:30
Neil Lalonde 082f131b27 Add a site setting for when progress bar should only show post number. Default is 1000. 2013-12-05 17:17:44 -05:00
Robin Ward 79427732b2 Show Gaps in the post stream when filters are active
Conflicts:
	app/assets/javascripts/discourse/templates/topic.js.handlebars
2013-12-05 16:46:59 -05:00
Neil Lalonde 0fe5ecbb24 When there are 2000 or more posts, only show the post number on the progress bar 2013-12-05 15:50:15 -05:00
Régis Hanol 6b618a805a FIX: do not destroy current draft when *NOT* abandoning the current reply 2013-12-05 18:08:33 +01:00
Régis Hanol 50bc23c2be Merge pull request #1718 from awesomerobot/master
fixing the user column on the topic-list page
2013-12-04 12:52:05 -08:00
Robin Ward 2a809d7855 Migrate over slackRatio to vendored helper 2013-12-04 13:26:00 -05:00
Robin Ward 3a2ae97668 Vendor the CloakedView stuff 2013-12-04 13:23:20 -05:00
Neil Lalonde 3a6ba907d9 FIX: enter key in login form works again 2013-12-04 11:45:07 -05:00
Robin Ward 0ece195723 Blacklist <center> 2013-12-04 11:43:20 -05:00
Kris Aubuchon 15516f34c7 fixing the user column on the topic-list page 2013-12-04 10:38:01 -05:00
Vikhyat Korrapati 243acb4f05 Auto close topic on form submit rather than button click. 2013-12-04 18:17:28 +05:30
Neil Lalonde b622edad7d FIX: edit category modal is too short 2013-12-03 17:24:25 -05:00
Neil Lalonde 3cfd2dd667 FIX: quote text twice overwrites the first quote 2013-12-03 16:39:35 -05:00
Robin Ward cb9fb2acfa FIX: A post via the message bus wasn't updating `highest_post_number` properly. 2013-12-03 16:25:51 -05:00
Neil Lalonde 915861a646 FIX: suspended users still appear suspended after their suspension expires 2013-12-03 15:53:30 -05:00
Robin Ward c4394688de FIX: CSRF token retrieval bug 2013-12-03 15:30:33 -05:00
Robin Ward 50fe117d7c FIX: Load order bug 2013-12-03 15:11:33 -05:00
Robin Ward 274743b877 Refactor: Move initialization code into separate initializers that use the API we
developed for plugins.
2013-12-03 14:22:32 -05:00
Robin Ward de78ee302a - Extract Browser capabilities from Discourse namespace into a Singleton.
- Change Scrolling slack based on Android / Touch / Desktop
2013-12-03 13:03:19 -05:00
Sam bf2663346a Merge pull request #1712 from awesomerobot/master
making the category dropdown taller
2013-12-02 21:34:54 -08:00
Sam e16621077a semicolon for the greater good 2013-12-03 16:09:57 +11:00
Kris Aubuchon d6ddc70fea making the category dropdown taller 2013-12-02 21:09:16 -05:00
Robin Ward bdac13b636 FIX: If there are no featured topics in a category, don't fail. 2013-12-02 17:44:57 -05:00
Robin Ward 0c259af374 FIX: Don't give weird progress numbers when there are deleted posts. 2013-12-02 15:09:25 -05:00
Robin Ward b37fae50e3 OOPS: Commented out the wrong line 2013-12-02 14:28:01 -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
Neil Lalonde 79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Régis Hanol 3842097698 add lightbox extra-zoom on click 2013-12-02 11:03:47 +01:00
Régis Hanol bfd2fd8607 update magnific popup to latest (v. 0.9.9) 2013-12-02 10:38:15 +01:00
Sam ea835b78dc Merge pull request #1710 from benjaminbrent/master
Fix email_preview AJAX call to use Discourse.ajax
2013-12-01 23:51:09 -08:00
Sam a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Benjamin Brent 761da7d380 Fix email_preview AJAX call to use Discourse.ajax 2013-12-01 13:30:41 +11:00
Kris Aubuchon a9060fac70 added KBD style back 2013-11-29 22:44:00 -05:00
Robin Ward 769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00
Régis Hanol 298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward 008151e90d FIX: Too much white space between posts on mobile 2013-11-29 13:06:52 -05:00
Régis Hanol 9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00
Neil Lalonde a13c7c26f9 Put that autoclose regexp back. Firefox, take it easy. 2013-11-28 14:49:11 -05:00
Robin Ward 5fd87ae45f Merge pull request #1701 from velesin/sitemap_refactoring
refactors site map
2013-11-28 11:21:36 -08:00
Robin Ward f1bce7cc42 Uncomment the loading logic :) 2013-11-28 14:18:32 -05:00
Robin Ward 924a88b5c0 Different Slack ratio on Touch devices, show loading indicator 2013-11-28 14:18:13 -05:00
Robin Ward 488e9ca9dd On mobile, keep topic map collapsed by default. Also, when collapsed don't show as many
data turds.
2013-11-28 11:45:16 -05:00
Neil Lalonde 1cc72d564f Add specs for topic create with auto_close_time. Just ignore auto_close_time from users who are not authorized to use it instead of raising an error. 2013-11-28 11:06:04 -05:00
Wojciech Zawistowski 8eef779d38 refactors site map 2013-11-27 21:58:36 +01:00
Robin Ward 09155a9969 FIX: Upward scrolling jumps 2013-11-27 15:58:13 -05:00
Neil Lalonde 13b31e9833 FIX: broke all the things on Firefox 2013-11-27 14:52:29 -05:00
Robin Ward 40f86829f7 Post Cloaking:
* We now use a new custom view, {{cloaked-collection}} to display posts in a topic.

* Posts are removed and inserted (cloaked/uncloaked) into the DOM dynamically based on whether they
  are visible in the current browser viewport.

* There's been a lot of refactoring to ensure the relationship between the post views and the topic
  controller is sane.

* Lots of fixes involving jumping to a post, including a new LockOn component to that tries to stay
  focused on an element even if stuff is loading before it in the DOM that would normally push it
  down.
2013-11-27 12:53:32 -05:00
Neil Lalonde 8a9bef944f Fix browser-update.js so it doesn't depend on jQuery 2013-11-27 12:26:27 -05:00
Neil Lalonde 3442d3adb2 Add left margin to ol and ul 2013-11-27 10:55:54 -05:00
Neil Lalonde a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
Robin Ward 549060867d Updated documentation for `inlineRegexp` 2013-11-25 11:35:28 -05:00
Sam 6544f39bcc fix topic counts not updating automatically in various spots (top menu / categories page / drop down) 2013-11-25 17:37:51 +11:00
Sam 92528d7207 message bus update, extract message bus js out into gem 2013-11-25 17:37:01 +11:00
Robin Ward f1a681aa46 Fix: Participant filter was broken. 2013-11-22 17:02:12 -05:00
Wojciech Zawistowski afd198a387 removes unused property from HeaderController 2013-11-22 21:07:03 +01:00
Neil Lalonde 4e45c5ff3d Fix js for handling click of header buttons. They were adding /# to the url, which broke routing. 2013-11-22 11:50:57 -05:00
Neil Lalonde 35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Wojciech Zawistowski 1d3097245c header sitemap integration tests 2013-11-21 20:38:56 +01:00
Wojciech Zawistowski b6de8324be FIX: removes invalid, unpaired closing tag 2013-11-21 17:33:03 +01:00
Robin Ward 50005e2ef9 FIX: Back button wasn't reusing scroll position on category filter 2013-11-21 11:31:10 -05:00
Neil Lalonde 97cb9e1545 Signup with 3rd party auth can find the matching username from the Discourse Hub 2013-11-20 14:56:21 -05:00
Robin Ward ea8e4bfbcf FIX: Double footer navigation 2013-11-20 14:16:33 -05:00
Robin Ward d09735ff46 Merge pull request #1680 from velesin/user_activity_link_title_fix
FIX: repairs title attr in the link
2013-11-20 09:04:43 -08:00
Robin Ward fa0b5d3b0e FIX: Missing Private message topic map 2013-11-19 18:59:29 -05:00
Sam d16298b1d7 Merge pull request #1679 from velesin/logo_improvement
removes redundant enclosing tag
2013-11-19 14:59:45 -08:00
Sam 325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales
Provides Japanese locales
2013-11-19 14:58:06 -08:00
Neil Lalonde 1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
German Viscuso 3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Wojciech Zawistowski 3a470939f0 FIX: repairs title attr in the link 2013-11-19 21:32:02 +01:00
Wojciech Zawistowski e7c6abde3e removes redundant enclosing tag 2013-11-19 21:28:05 +01:00
Neil Lalonde 981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward 58b275665b Oops, missing translation 2013-11-19 12:57:54 -05:00
Robin Ward f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Robin Ward b98456a65f Hide some values from the topic map if they're 0 2013-11-19 12:24:41 -05:00
Robin Ward 20e4a2ef80 Renamed components so they don't all have the annoying discourse- prefix 2013-11-19 11:59:50 -05:00
Sam 3ce6a7be4a defer rendering of the site map
add new and unread links in the site map categories section
2013-11-19 10:41:57 +11:00
Robin Ward 89a96b9e94 FIX: Topic map expansion broken without links. 2013-11-18 17:06:52 -05:00
Robin Ward 9aa2bd068a FIX: Broken links on categories page 2013-11-18 16:59:19 -05:00
Régis Hanol 6e3de67977 fix edit reason when editing a reply 2013-11-18 19:51:30 +01:00
Robin Ward a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Robin Ward 2f39a4ac6d Don't shorten links in Topic Map 2013-11-18 13:49:53 -05:00
Neil Lalonde ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Neil Lalonde 281f839e54 Site settings page tweak 2013-11-18 13:45:10 -05:00
Robin Ward 629fe8b426 If the topic can be summarized, expand the topic map by default 2013-11-18 13:43:35 -05:00
Robin Ward 4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward 34e451ef25 Removed extra comma 2013-11-18 12:16:14 -05:00
Robin Ward f2659a5916 Moved more into components, including summary stuff. 2013-11-18 12:08:21 -05:00
Robin Ward 52048d2d2b Converted Private Message map to a component 2013-11-18 12:08:21 -05:00
Robin Ward 039acd6ead Convert some TopicMap stuff to Ember components 2013-11-18 12:08:21 -05:00
Robin Ward ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
Kris Aubuchon 2e9d0ecac4 adjusting badges a bit 2013-11-17 22:32:58 -05:00
Sam 805feca5f2 message at the bottom for uncategorized was all mangled, fallback to the old way it used to behave 2013-11-18 11:42:40 +11:00
Neil Lalonde 6eb5f1aec2 FIX: site settings page layout at smaller widths 2013-11-16 14:14:49 -05:00
Régis Hanol 482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde b921478cbb Use debounce to make filtering on the All Results tab faster 2013-11-15 16:46:19 -05:00
Neil Lalonde d3c84b60c8 Add an All Results tab when filtering the site settings 2013-11-15 16:43:56 -05:00
Neil Lalonde 97bc187735 Use stacked nav on left to navigate site settings categories 2013-11-15 15:22:42 -05:00
Neil Lalonde e01ce546e8 When you click Quote Reply, and then cancel the reply, don't ask if you're sure. 2013-11-15 13:13:58 -05:00
Régis Hanol 6a3000ffef Merge pull request #1655 from awesomerobot/master
embedded response width fix
2013-11-15 00:52:51 -08:00
Kris Aubuchon ad9cb01263 embedded response width fix 2013-11-14 21:44:45 -05:00
Neil Lalonde 726b985ece FIX: a js error when reloading /admin/site_settings/category/:id 2013-11-14 16:50:34 -05:00
Neil Lalonde d9e4eec49f Style the site setting category links. Required and Basic Setup are bigger and all other links are to the right of them. 2013-11-14 16:02:14 -05:00
Neil Lalonde ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00
Neil Lalonde 1e37abc310 Add site setting category support 2013-11-14 16:02:13 -05:00
Robin Ward 968c0672ef Enable column sorting main topic list 2013-11-14 15:50:36 -05:00
Robin Ward 41dfcd2774 FIX: Pagination while sorting on column headers 2013-11-14 12:35:18 -05:00
Sam 23deecfe44 Merge pull request #1651 from awesomerobot/master
New onebox styles, and a few small fixes
2013-11-13 22:49:54 -08:00
Sam e57ddcf276 remove discourse dependency from message bus 2013-11-14 16:37:50 +11:00
Kris Aubuchon 5bf2b40dbc quick fix 2013-11-13 23:19:37 -05:00
Kris Aubuchon 829346468c new onebox style (similar to blockquotes), spacing for auto-close message, making link badge easier to read 2013-11-13 23:10:47 -05:00
Robin Ward d30721f06b Remove "sorting" color 2013-11-13 16:39:49 -05:00
Robin Ward 9cbfd8362d FIX: Warnings in Qunit suite 2013-11-13 14:26:29 -05:00
Robin Ward bda5a72c6a Server side support for custom ordering of topics 2013-11-13 14:17:06 -05:00
Robin Ward df568df9dc Controls for sorting topic columns 2013-11-13 11:48:38 -05:00
Jeff Atwood c23c8a7e3a we forgot word-wrap: break word on post body 2013-11-13 01:28:36 -08:00
Régis Hanol e9f9d22482 add query parameter to temporarily disable customization 2013-11-12 18:14:22 +01:00
Robin Ward a1a89d01c4 JSHint 2013-11-12 11:25:27 -05:00
Robin Ward d9008374aa Merge pull request #1643 from zachwlewis/fix-admin-customize-header
Updated styles on admin customize page.
2013-11-12 08:17:10 -08:00
Robin Ward 2711a9eef0 Merge pull request #1644 from demil/patch-1
Update discourse.js
2013-11-12 08:16:42 -08:00
Régis Hanol aeacfb2acc widened the edit title/category 2013-11-12 14:36:00 +01:00
demil adcfa4cf9f Update discourse.js
Inserted  if (url.indexOf(u) != -1) return url; in getURL function because of bug in subdirectory install on some urls doubles relative url prefix, for example /forum/forum/latest.json. With this fix it works fine.
2013-11-12 02:36:03 +01:00
Zachary Lewis 53f2d4b66c Updated styles on admin customize page. 2013-11-11 15:20:58 -06:00
Robin Ward e5fd2946e0 Some topic list re-organization. 2013-11-11 15:07:08 -05:00
Neil Lalonde 2f8866add5 Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows. 2013-11-11 15:03:17 -05:00
Robin Ward 428fcb9841 Merge pull request #1638 from velesin/i18n_helper_self_refactoring
refactors context binding from _this to self
2013-11-11 07:36:27 -08:00
Sam 817423db84 very bad idea to remove glyphs from privat / deleted and read restricted topics 2013-11-11 17:11:16 +11:00
Wojciech Zawistowski e27f944ed1 refactors context binding from _this to self 2013-11-10 21:33:16 +01:00
Wojciech Zawistowski 67a1da7af4 refactors header notifications (renders them via separate controller / template) 2013-11-08 21:06:27 +01:00
Robin Ward 965a0a91a2 FIX: Unloading categories page failed in some circumstances; update to latest Ember. 2013-11-08 14:09:27 -05:00
Régis Hanol be589da5dc Merge pull request #1630 from awesomerobot/master
using max-width on the #main-logo versus setting a static width
2013-11-08 09:44:06 -08:00
Robin Ward 127c3d0e21 FIX: Performance regression on Markdown renderer. 2013-11-08 11:42:26 -05:00
Kris Aubuchon 78f9c83604 using max-width on the #main-logo versus setting a static width 2013-11-08 11:29:39 -05:00
Neil Lalonde 630ef0f322 Should be able to see edits to your own posts 2013-11-08 10:18:41 -05:00
Kris Aubuchon 40aa62f613 adding highlight & fade to linked topic 2013-11-07 23:12:18 -05:00
Neil Lalonde dbd2332b74 Public user profile page shows if the user is suspended and why. 2013-11-07 16:34:31 -05:00
Robin Ward ac9a763ab3 FIX: Extra space before tags in blockquotes 2013-11-07 16:06:50 -05:00
Neil Lalonde 0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Robin Ward 902b6bc79f FIX: Oneboxes were losing formatting in preview after being cached. 2013-11-06 15:58:41 -05:00
Robin Ward 914b723b97 Category dropdown should be in the `position` order 2013-11-06 15:50:47 -05:00
Robin Ward 3dd4741ce4 FIX: Larger click target for topic progress bar 2013-11-06 15:33:17 -05:00
Robin Ward de30af9302 Support for inviting to a forum from a user's invite page. 2013-11-06 12:56:50 -05:00
Robin Ward 4a7ef8b460 Adjust margins of ul, ol: they were slightly to the left 2013-11-05 17:57:05 -05:00
Robin Ward 25ef66c60b User invites page now has search, displays first `invites_shown` records 2013-11-05 17:53:26 -05:00
Neil Lalonde 8838b555cd The entire notification when there are new topics is clickable 2013-11-05 16:56:32 -05:00
Neil Lalonde 6597738322 Improve how banned fields are rendered on admin user page 2013-11-05 15:00:54 -05:00
Robin Ward 84b0792db8 Merge pull request #1616 from velesin/remove_notifications_view
removes unused view
2013-11-05 10:38:51 -08:00
Régis Hanol 37fd7ab574 pull hotlinked images 2013-11-05 19:07:29 +01:00
Wojciech Zawistowski 2f2b99f766 removes unused view 2013-11-05 18:10:04 +01:00
Sam 15996bc52f even on mobile it can be important 2013-11-05 13:44:18 +11:00
Sam 2c1b58c8cc mini profiler is there for a reason :) 2013-11-05 13:43:50 +11:00
Neil Lalonde bd9b85f076 Screened Urls page shows results for each domain instead of each url 2013-11-04 16:24:48 -05:00
Robin Ward 0b79636b99 Typo! 2013-11-04 15:56:03 -05:00
Robin Ward ec7298d548 FIX: Regression on topic list for best of links. 2013-11-04 15:48:51 -05:00
Robin Ward b8e63719f8 FIX: Don't autolink within a markdown link. 2013-11-04 14:24:40 -05:00
Robin Ward cc47ade2ed missing semi colon 2013-11-04 13:59:31 -05:00
Robin Ward 69503345c4 FIX: Some more non-english category errors 2013-11-04 13:43:33 -05:00
Robin Ward ee6b97754a Merge pull request #1611 from awesomerobot/master
Category-dropdown items have consistent widths... other fixes
2013-11-04 10:17:21 -08:00
Robin Ward a13d05660f FIX: Show status icons on user topic pages 2013-11-04 13:13:22 -05:00
Kris Aubuchon 5c3f12f369 merging
Merge remote-tracking branch 'upstream/master'
2013-11-04 12:59:17 -05:00
Neil Lalonde ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Kris Aubuchon 1c2b5015a3 fixing user title line-height, adding @mention style back in, consistent category width/alignment 2013-11-04 12:45:18 -05:00
Robin Ward 7360112759 Merge pull request #1600 from GManzato/user_page_flat
Flatter design on User Page
2013-11-04 07:25:57 -08:00
Régis Hanol b063c4326f Merge pull request #1609 from awesomerobot/master
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
Kris Aubuchon 70fd4f7f6b merging local with master
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
Kris Aubuchon 4ce711a3b7 some general simplification to modal, menus, etc 2013-11-04 09:16:47 -05:00
Régis Hanol 4f8d0a1a96 revert changes to magnific-popup.scss 2013-11-04 14:44:52 +01:00
Régis Hanol 12ac2f2e99 FIX issues with quote button
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
2013-11-04 12:51:39 +01:00
Régis Hanol 934ede7d91 shorter message for untranslated strings 2013-11-04 11:52:12 +01:00
Robin Ward 7a567d730d Merge pull request #1601 from awesomerobot/master
main logo size consistency fix
2013-11-01 13:32:37 -07:00
Robin Ward 52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward 04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00
Kris Aubuchon 1f283b5ca9 main logo size consistency fix 2013-11-01 15:45:56 -04:00
Robin Ward bbf0312e72 FIX: Non-Admins couldn't send private messages through the new user expansion 2013-11-01 15:18:26 -04:00
Neil Lalonde 0060050c08 Replace data-dismiss=modal with action close. It's better to use our own ember code instead of relying on bootbox magic. 2013-11-01 12:14:08 -04:00
Neil Lalonde 92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00
Gilles Manzato 3826e67007 Flatter design on User Page
- Cleanup of the design ( remove border-radius ... )
- Fixed some alignment and width in mobile and lower screen size
2013-11-01 15:38:07 +01:00
Robin Ward b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Robin Ward 5a78c1cb34 Changed confusing 'all categories' text 2013-10-31 16:41:13 -04:00
Robin Ward 6ff2abd6aa Move category badge to left of topic name in non-fixed header 2013-10-31 16:31:01 -04:00
Robin Ward 7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward 744cd93f28 FIX: Non-English category name regression 2013-10-31 16:25:26 -04:00
Neil Lalonde e1d956f5ee Improve styling of staff action logs UI 2013-10-31 12:17:06 -04:00
Neil Lalonde d3c7bbe268 Merge pull request #1597 from awesomerobot/master
topic vertical alignment fixes, admin logs table width fix
2013-10-31 06:58:10 -07:00
Kris Aubuchon 396b626bdc topic vertical alignment fixes, admin logs table width fix 2013-10-31 09:35:49 -04:00
Régis Hanol 727d628a0e Merge pull request #1595 from velesin/logo_component
extracts logo component from header
2013-10-30 14:52:04 -07:00
Sam c97ab672c7 Merge pull request #1593 from awesomerobot/master
Some code cleanup, touch/non-touch gutter, little design/alignment tweaks
2013-10-30 14:45:29 -07:00
Wojciech Zawistowski 489dab333a extracts logo component from header 2013-10-30 21:56:48 +01:00
Robin Ward 3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Kris Aubuchon d01185215d some reorganization, touch optimization, poster expansion design 2013-10-30 12:40:16 -04:00
Robin Ward 2305cf94ea Don't wait for loading to finish before resetting category 2013-10-30 11:28:51 -04:00
Kris Aubuchon 9f42bde110 fixing topic title line height to accomodate overflow 2013-10-30 09:57:56 -04:00
Régis Hanol 689c4cd947 Merge pull request #1592 from awesomerobot/master
fixing errors in formatting from last commit
2013-10-30 06:33:23 -07:00
Kris Aubuchon 032997ccff fixing errors in formatting from last commit 2013-10-30 09:31:26 -04:00
Régis Hanol 9a2e3245b8 Merge pull request #1591 from awesomerobot/master
fixing pre/sub/sup/code/kbd formatting, post selection buttons
2013-10-30 06:20:59 -07:00
Kris Aubuchon 7900fa0184 fixing pre/sub/sup/code/kbd formatting 2013-10-30 09:11:05 -04:00
Kris Aubuchon ef954f46ba fixing blockquote that I just broke 2013-10-29 22:33:09 -04:00
Kris Aubuchon be27e1dfee fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent 2013-10-29 22:00:18 -04:00
Sam 4fa32c4dc0 Merge pull request #1590 from awesomerobot/master
fixing the category creation/edit modal alignment
2013-10-29 18:40:35 -07:00
Kris Aubuchon 0337c293c1 fixing the category creation/edit modal alignment 2013-10-29 21:01:41 -04:00
Sam 36352e437f Merge pull request #1589 from awesomerobot/master
Some underlying topic title clean-up, fixed private message user list alignment
2013-10-29 17:49:28 -07:00
Kris Aubuchon 60d9b4d808 fixing private message users, post title alignment 2013-10-29 20:47:37 -04:00
Kris Aubuchon 3043efcb0a cleaning up the topic-title alignment a bit 2013-10-29 17:15:56 -04:00
Robin Ward bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Robin Ward 6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Robin Ward be0d5bd1f0 Let's try the category on the left side of the title 2013-10-29 13:12:12 -04:00
Robin Ward 5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Kris Aubuchon 4c8944626a making post-info text brighter, making category nav dropdown text smaller and bold 2013-10-29 00:37:18 -04:00
Kris Aubuchon 0d0a2cb947 category nav style 2013-10-28 17:37:31 -04:00
Kris Aubuchon 5d19e66470 merging with the new category nav feature
Merge remote-tracking branch 'upstream/master'
2013-10-28 17:08:00 -04:00
Neil Lalonde e52f6e0f6d FIX: weird scroll position on visiting a topic page for the first time (chrome OS X, maybe mobile safari too) 2013-10-28 16:17:06 -04:00
Neil Lalonde 8ea1a1069e Use the debounce parameter instead of hard-coding 100 2013-10-28 16:17:06 -04:00
Robin Ward 8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Kris Aubuchon c016a081f1 further simplification over all, changes include: flatter button style, styling admin table, topic-list style 2013-10-28 13:46:59 -04:00
Robin Ward 70ce07ae49 Oops JSHint again :(
)
2013-10-28 13:00:34 -04:00
Robin Ward 26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks
are enabled.
2013-10-28 12:44:10 -04:00
Kris Aubuchon cafc1a088d catching up with the master
Merge remote-tracking branch 'upstream/master'
2013-10-28 12:26:12 -04:00
Kris Aubuchon 1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward 098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward 1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Sam 88ccd287b4 allow uncategorized category in 2 more spots (hamburger and drop down) 2013-10-28 08:39:55 +11:00
Régis Hanol c77a20eea5 do not deselect text when clicking on the reply button below the post 2013-10-27 19:44:46 +01:00
Neil Lalonde ce2af5c6d1 Show Log In button at the bottom of the page body when login_required and not logged in 2013-10-25 16:08:59 -04:00
Robin Ward a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde 90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
Sam a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Sam 572f036e74 filter down the top level navs 2013-10-25 11:15:20 +11:00
Neil Lalonde 017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward 61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Robin Ward 9adcd1579d Renamed `components` to `lib` in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Sam b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam 636976e5d4 fix alignment of n person liked this. 2013-10-24 15:30:41 +11:00
Sam 24d732b12a regressions post merge 2013-10-24 12:25:20 +11:00
Sam 666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
Robin Ward cc9b11ecc5 Simple category breadcrumb component 2013-10-23 17:00:02 -04:00
Robin Ward 541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Robin Ward 49a11e51df Ember support for parent categories 2013-10-23 15:22:49 -04:00
Neil Lalonde 237312dbde Styling on screened ip addresses page 2013-10-23 13:01:50 -04:00
Neil Lalonde 3db7529ad4 More icons on screened ip addresses page 2013-10-23 13:01:50 -04:00
Régis Hanol a98d4d9b35 régis' git-fu at his best... 2013-10-23 11:35:27 +02:00
Régis Hanol 3cc08c3b27 fixed JSHINT 2013-10-23 11:27:50 +02:00
Régis Hanol e39242b6ff missed a single quote 2013-10-23 11:25:16 +02:00
Régis Hanol d05547e7f3 fix arrow direction in post incoming links 2013-10-23 11:16:03 +02:00
Régis Hanol a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam 9ae4245955 Merge pull request #1565 from awesomerobot/master
topic page: alignment fixes for replies, minor alignment changes
2013-10-22 23:09:44 -07:00
Kris Aubuchon ca82d07f6d simplfying the header, some more alignment adjustments on the topic page 2013-10-23 00:22:24 -04:00
Kris Aubuchon 0ef064fd93 removed white line in quotes, cleaned up some markup 2013-10-22 18:31:40 -04:00
Robin Ward 348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Jeff Atwood 5e2d8dcf37 even out blockquote top/bottom padding 2013-10-22 14:18:41 -07:00
Jeff Atwood d90001e857 even out blockquote paras w/top & bottom margin 2013-10-22 14:17:19 -07:00
Kris Aubuchon 649b3d44a6 topic page: alignment fixes for replies, minor alignment changes 2013-10-22 16:36:32 -04:00
Neil Lalonde 7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde b8d586251c Use i18n for the word Cancel in admin/.../user.js.handlebars 2013-10-22 16:30:46 -04:00
Kris Aubuchon c2865e3e2c fixing alignment on replies, buttons - also making topic new gutter link visible on touch 2013-10-22 15:37:44 -04:00
Robin Ward 13fa473c6d Fix JSHINT 2013-10-22 11:33:45 -04:00
Robin Ward e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward 97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Régis Hanol f96ea42974 fix last activity column in suggested topics 2013-10-22 10:43:00 +02:00
Jeff Atwood d2cc9c39ac don't define bgcolor on in-reply-to 2013-10-22 01:33:51 -07:00
Jeff Atwood 5203ba41eb tighten up spacing on notification control 2013-10-21 23:56:46 -07:00
Jeff Atwood 4693019e90 remove bottom border on posts-wrapper 2013-10-21 23:39:17 -07:00
Jeff Atwood e994ac451b fix quote reply z-order 2013-10-21 23:31:54 -07:00
Régis Hanol 9aca8e14ba fix code highlithing in list 2013-10-21 22:57:06 +02:00
Régis Hanol 6adba747b9 fix images height on IE 2013-10-21 22:56:59 +02:00
Robin Ward 0f5bd08aee Merge pull request #1558 from awesomerobot/master
differentiating visited topics better, fixing extra white space & alignment in header
2013-10-21 13:45:51 -07:00
Kris Aubuchon 2feb82b4b7 differentiating visited topics better, fixing extra white space in the title header (also realigning title header) 2013-10-21 16:23:55 -04:00
Robin Ward 51b2f512a3 Merge pull request #1557 from awesomerobot/master
fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...
2013-10-21 12:19:11 -07:00
Kris Aubuchon ecb6ec0b6d fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small 2013-10-21 15:15:32 -04:00
Robin Ward b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Neil Lalonde 648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Régis Hanol c9dd83cba4 force max-width on images/svgs in composer preview and post view
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
2013-10-21 20:01:10 +02:00
Régis Hanol 9c820443fa do not select the marker in Chrome 2013-10-21 19:59:18 +02:00
Robin Ward d9a16079a5 FIX: Do not allow users to create tables 2013-10-21 13:32:15 -04:00
Robin Ward 7a5c3bfcd8 whitelist acceptable syntax highlighting classes 2013-10-21 13:11:10 -04:00
Robin Ward d10f9f756f FIX: `[code]` blocks with `#` headers within 2013-10-21 12:12:58 -04:00
Robin Ward 1783089d64 FIX: [quote] without params was failing. 2013-10-21 11:12:47 -04:00
Robin Ward f565766b1e Merge pull request #1555 from awesomerobot/master
fixed progress indicator a bit, line under title doesn't span full width...
2013-10-21 07:51:07 -07:00
Robin Ward 4d9ca99929 Merge pull request #1542 from velesin/debounce_refactoring
refactors Discourse.debounce
2013-10-21 07:50:26 -07:00
Robin Ward c5f14cdd0e Merge pull request #1549 from velesin/debounce_promise_refactoring
refactors Discourse.debouncePromise
2013-10-21 07:49:47 -07:00
Kris Aubuchon 2c384e0073 fix for long usernames 2013-10-21 10:13:16 -04:00
Kris Aubuchon 77540ed999 fixed progress indicator a bit, line under title doesn't span full width anymore 2013-10-21 09:38:35 -04:00
Jeff Atwood 21ee05583c no line above topic footer buttons please 2013-10-21 01:38:01 -07:00
Jeff Atwood cec9bcfb5d make user titles smaller than usernames 2013-10-21 01:22:36 -07:00
Jeff Atwood 1a0e800afb fix line-height on topic titles 2013-10-21 00:51:11 -07:00
Jeff Atwood 2ac8f3d20b extra-info-wrapper at top of topic too narrow now 2013-10-21 00:38:24 -07:00
Sam e7a037709f allow ordering categories in the edit category ui 2013-10-21 17:21:34 +11:00
Sam a241ddf9d2 Merge pull request #1554 from awesomerobot/master
gutter links shouldn't fade, fixed
2013-10-20 22:20:10 -07:00
Kris Aubuchon d4db161133 css transitions were too slow, sped up 2013-10-21 00:45:19 -04:00
Kris Aubuchon 94b5b24d88 gutter links shouldn't fade, fixed 2013-10-21 00:41:16 -04:00
Sam 29c8d2ebec oops add security 2013-10-21 15:33:42 +11:00
Sam 6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Sam 38a33a8c1b work in progress sortable categories 2013-10-21 15:25:20 +11:00
Sam 243a6ae291 Merge pull request #1552 from awesomerobot/master
a few general fixes to the new flatter theme
2013-10-20 19:33:38 -07:00
Kris Aubuchon 5d88bfa8e3 a few more fixes, detailed here: http://meta.discourse.org/t/flatter-styling-now-deployed/10515 2013-10-20 22:16:02 -04:00
Kris Aubuchon aa42a36b8a a few general fixes to the new flatter theme 2013-10-20 21:59:46 -04:00
Sam 6cfdd083d5 Merge pull request #1525 from squareleaf/logo_header_height
Change fixed width of logo in header to max-height.
2013-10-20 17:37:55 -07:00
Sam 614f45d003 correct topic and category counting query
revive old styling that was stripped
2013-10-21 10:20:16 +11:00
Tiffany Green 6681751531 Change fixed width of logo in header to max-height. Addresses issue #1045
Add max width
2013-10-20 17:35:37 -05:00
Wojciech Zawistowski 4c4a2f220e refactors Discourse.debouncePromise 2013-10-20 10:38:26 +02:00
Kris Aubuchon 88a97bcb71 minimizing the desktop topic view, also effects the background on all pages and removed bootstrap 2013-10-19 18:18:25 -04:00
Wojciech Zawistowski d0f3765967 refactors Discourse.debounce 2013-10-19 09:13:00 +02:00
Robin Ward aef4227073 Remove debug message 2013-10-18 17:49:33 -04:00
Robin Ward db2283b9d3 FIX: JSHint 2013-10-18 17:48:19 -04:00
Robin Ward 1113b8d7a8 FIX: Don't double sanitize values, allow blockquotes with leading text 2013-10-18 17:34:54 -04:00
Robin Ward d7182d0b14 FIX: Only wrap inline html tags in <p> 2013-10-18 15:21:05 -04:00
Régis Hanol 28fd63bd11 don't stretch images in the mobile view 2013-10-18 16:43:53 +02:00
Sam 6f32cb52d6 minor styling changes, kill n+1 query 2013-10-18 11:23:08 +11:00
Sam e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam 1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam 9ad01a1afb more work in progress, wide category list 2013-10-18 11:10:10 +11: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
Jeff Atwood e26cbe79ad add "this" to category year stats for clarity 2013-10-17 15:54:48 -07:00
Jeff Atwood 4b53c45d3d make category descriptions plain black 2013-10-17 15:32:11 -07:00
Robin Ward 3408fc395d FIX: User stream pagination 2013-10-17 16:10:11 -04:00
Robin Ward 5fa47984b4 Link large user avatar to user profile 2013-10-17 16:06:58 -04:00
Neil Lalonde 3927913a7e FIX: composer for creating a new topic on mobile 2013-10-17 13:17:54 -04:00
Neil Lalonde 71571b9316 Never show preview pane in composer on mobile. 2013-10-17 12:19:28 -04:00
Robin Ward a215fc5bdc Collapse user details when not viewing index view 2013-10-17 11:27:03 -04:00
Robin Ward d206e1416c Merge pull request #1533 from velesin/remove_return_from_attach_view_with_args
removes unused return statement from ContainerView.attachViewWithArgs
2013-10-17 06:57:24 -07:00
Robin Ward 7e9b119c9c Minor tweaks to user view 2013-10-16 16:22:16 -04:00
Robin Ward dd63e6d28f Two Column User View 2013-10-16 15:51:01 -04:00
Robin Ward f81b2dc3f2 Extra comma 2013-10-16 14:16:14 -04:00
Robin Ward c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Wojciech Zawistowski 3f02e0bca6 removes unused return statement from Discourse.ContainerView.attachViewWithArgs 2013-10-16 17:52:04 +02:00
Neil Lalonde c7aaee907b When system flags users as sockpuppets, show a reason in the admin flags ui 2013-10-16 11:47:16 -04:00
Robin Ward 67771d6bdf FIX: New line after blockquote 2013-10-16 10:28:48 -04:00
Robin Ward f27413219e Support for MDTest 2013-10-16 10:28:42 -04:00
Neil Lalonde 42cdad9d1d FIX: edit category modal with no title, empty modals that can't be closed. Added a better way to hide a modal without really closing it. 2013-10-15 15:41:15 -04:00
Neil Lalonde 7dcd3117fe On mobile, show new user usernames in grey, and highlight system posts like the desktop site does. 2013-10-15 12:53:14 -04:00
Robin Ward afff145bd3 FIX: Query params were going a bit haywire when going from topic to topic. 2013-10-15 12:40:12 -04:00
Robin Ward 5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now!
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
2013-10-15 10:53:11 -04:00
Nathaniel Palmer 20ab14e1b8 prevent share-view being clipped at viewport bounds 2013-10-12 10:45:21 -04:00
Robin Ward af931f0444 Reverting the Sanitizer commit in case we have to do something urgent
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
2013-10-11 16:44:26 -04:00
Robin Ward 9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now!
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
2013-10-11 16:25:40 -04:00
Régis Hanol 7938843b50 ooops. régis can't refactor... 2013-10-11 18:49:17 +02:00
Régis Hanol 35214f0b3a Merge pull request #1522 from velesin/syntax_highlighting_context_refactoring
removes unused context binding from Discourse.SyntaxHighlighting
2013-10-11 09:46:47 -07:00
Régis Hanol cf3c4fd743 no need for a computed property 2013-10-11 18:43:10 +02:00
Wojciech Zawistowski c446cc6ce1 removes unused context binding from Discourse.SyntaxHighlighting 2013-10-11 18:37:18 +02:00
Wojciech Zawistowski b4a6a5e841 removes unused context binding from Discourse.Lightbox 2013-10-11 17:40:30 +02:00
Robin Ward 20cba4e092 Never bind the poster expansion twice. 2013-10-10 15:18:38 -04:00
Wojciech Zawistowski 107932576e removes redundant context binding 2013-10-10 18:33:24 +02:00
Robin Ward ea9398467b For @Sam - hide the poster expansion if you click on the avatar of the user who's expanded 2013-10-10 12:03:52 -04:00
Régis Hanol ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
Neil Lalonde c3fd79d61c Fix rendering of muted topic button 2013-10-10 11:26:20 -04:00
Sam 8afff108bf css.scss makes rails 4 sad 2013-10-10 15:23:14 +11:00
Sam b490fd2f88 Merge pull request #1513 from velesin/computed_self_refactoring
refactors Discourse.Computed to bind context to self
2013-10-09 21:16:19 -07:00
Régis Hanol 3854c2d24f Merge pull request #1510 from velesin/model_refactoring
refactors Discourse.Model
2013-10-09 09:26:15 -07:00
Wojciech Zawistowski 708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Wojciech Zawistowski 41a4f15d62 removes unused context binding from Discourse.Site 2013-10-09 18:06:48 +02:00
Wojciech Zawistowski 56a519c583 refactors Discourse.Model to bind context to self plus some minor clean-ups 2013-10-09 18:00:55 +02:00
Neil Lalonde 4a0b17bb16 Pressing enter in username field of login form will submit the form 2013-10-09 11:07:42 -04:00
Neil Lalonde 24598c80af Improve login modal on mobile 2013-10-09 10:16:22 -04:00
Robin Ward 8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Neil Lalonde 32af23884e FIX: category validation in composer was still using categoryName instead of categoryId 2013-10-08 14:41:20 -04:00
Régis Hanol 94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol 2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward 0bda906da4 Merge pull request #1494 from ScotterC/present-user-name
Presenting name for user stream description
2013-10-08 08:42:59 -07:00
Scott Carleton 256d82b916 Present Name for stream description 2013-10-08 11:40:16 -04:00
Robin Ward 50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -04:00
Robin Ward e7935d4263 Merge pull request #1501 from velesin/debounce_promise_tests
adds unit tests for Discourse.debouncePromise
2013-10-08 07:56:07 -07:00
Neil Lalonde 6713db7133 Close notifications dropdown on mobile after you click something 2013-10-07 16:11:54 -04:00
Robin Ward cf4666d363 FIX: If the user asks for 0 similar topics, don't show an empty box 2013-10-07 15:14:01 -04:00
Robin Ward 744266374a FIX: Invalid i18n string appearing at bottom of topic 2013-10-07 15:01:51 -04:00
Robin Ward 6949bc6611 Make clickable area for progress much bigger on mobile 2013-10-07 14:41:17 -04:00
Robin Ward 75aaafc06e Don't show the user expansion on mobile 2013-10-07 14:32:15 -04:00
Wojciech Zawistowski 034d00b83a adds unit tests for Discourse.debouncePromise 2013-10-07 17:45:09 +02:00
Robin Ward d2a1118e67 Make date on User expansion gray 2013-10-04 17:50:56 -04:00
Robin Ward 7da01e2389 Changes to user expansion 2013-10-04 16:55:54 -04:00
Robin Ward 7eac7303cd Better unloading of Poster expansion 2013-10-04 15:35:43 -04:00
Robin Ward 89e78f5c64 User expansion loading improvements 2013-10-04 15:33:03 -04:00
Robin Ward d126259f03 Fixes #1496 - Ember 1.0 regression 2013-10-04 13:47:30 -04:00
Robin Ward baa2ab8604 Small visual tweaks to user expansion 2013-10-03 16:12:17 -04:00
Robin Ward db1f8370ee Don't show private message button when not logged in 2013-10-03 15:51:12 -04:00
Robin Ward 88476800f8 FIX: Private Message link was broken 2013-10-03 15:41:38 -04:00
Robin Ward 3cb6bb6c54 FIX: Missing username in link to user 2013-10-03 14:36:24 -04:00
Robin Ward 46219bbe02 Increase size of click target on topic progress 2013-10-03 14:33:57 -04:00
Robin Ward fc00269b7f Pop up with user information when clicking avatar on topic page 2013-10-03 13:06:30 -04:00
Robin Ward 578ef2098b Merge pull request #1488 from cfstras/removeAllowedUser
Allow removing users from private conversations
2013-10-03 08:02:41 -07:00
Sam ac56b119a7 refactor actions, try keeping them short so indenting does not confuse us 2013-10-03 16:01:52 +10:00
Claus Strasburger 15a973fd45 Improved private message user removal, locale edit
replaced array iteration with findProperty (will be renamed and aliased to findBy with Ember 1.1)
added modal dialog to verify
catched nil-error on topic.rb
2013-10-02 19:16:43 +02:00
Robin Ward 89c25d355d FIX: Progress bar not updating properly sometimes 2013-10-02 11:24:55 -04:00
Régis Hanol af96ef2994 FIX: deleting a flagged post issue
cf. http://meta.discourse.org/t/deleting-a-flagged-post-issue/10061

The bug was only happening when you were about the delete the first post, which means deleting the entire topic.
2013-10-02 16:59:57 +02:00
Robin Ward 7caefded86 Merge pull request #1484 from velesin/resolver_refactoring
refactors Discourse.Resolver
2013-10-02 07:28:29 -07:00
Sam ee286cc270 fix inability to save posts when navigated away,
oh my ... what a mess, there must be a better way
2013-10-02 16:18:16 +10:00
Sam 30bedff2c9 BUG: editing first PM was showing category selector 2013-10-02 07:43:57 +10:00
Robin Ward 9e815dbef9 FIX: Blockquote issue 2013-10-01 16:45:45 -04:00
Robin Ward 63d86eb9eb FIX: Allow Spoiler plugin (and others that use prototype.on) to work even if ListView was not initialized. 2013-10-01 13:53:26 -04:00
Robin Ward be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Claus Strasburger b089805dc0 Added method removeAllowedUser to topic_details.js
perform a request to /t/:id/remove-allowed-user,
then delete the user from the local list
2013-10-01 16:44:07 +02:00
Sam 75a8dfc467 rename all css.scss to scss 2013-10-01 17:35:26 +10:00
Sam f0a122a66c move job files so they live underneath app/ and not in lib/
introduce new setting email_always, that will force emails to send to users regardless of presence on site
2013-10-01 17:04:02 +10:00
Robin Ward ca0c41fd40 Merge pull request #1477 from velesin/remove_builders_from_merge_attributes
removes unused builders param from Discourse.Model.mergeAttributes
2013-09-30 10:07:50 -07:00
Wojciech Zawistowski f388226217 refactors Discourse.Resolver 2013-09-30 18:18:03 +02:00
Tiffany Green 4d9dba6d27 Adjust css for user page to work at mobile sizes
Style user page for mobile sizes

Remove guard

Bundle without guard

Remove guardfile
2013-09-30 09:18:52 -05:00
Robin Ward 37304b7eba FIX: Too many new lines in long quotes 2013-09-27 15:08:56 -04:00
Wojciech Zawistowski 5905669270 removes unused builders param from Discourse.Model.mergeAttributes 2013-09-27 19:46:26 +02:00
Régis Hanol cd4cda5b4c allow users to specify thumbnail size 2013-09-27 10:57:31 +02:00
Robin Ward 175e48b061 Revert "remove unnecessary (empty) view class"
This reverts commit 58ba8a0e49.
2013-09-22 10:38:41 -07:00
Robin Ward a70e9cac4d Merge pull request #1452 from velesin/remove_application_view
remove unnecessary (empty) view class
2013-09-20 17:13:02 -07:00
Robin Ward 5bc0f7e9ee Merge pull request #1454 from awesomerobot/master
mobile: fixed quote control jump
2013-09-20 14:42:45 -07:00
Kris Aubuchon 67c2560f8c mobile: fixed quote control jump 2013-09-20 17:28:00 -04:00
Sam 13527a1df7 Merge pull request #1448 from velesin/remove_redundant_presence
Remove duplicate mixing in of Discourse.Presence
2013-09-20 14:22:10 -07:00
Wojciech Zawistowski 58ba8a0e49 remove unnecessary (empty) view class
Discourse.ApplicationView does not provide any functionality above what
already automatically happens via Ember's "convention over
configuration" behavior and is therefore redundant.
2013-09-20 17:52:38 +02:00
Robin Ward e3a56864dd Changes to support Spoiler Alert plugin 2013-09-19 18:01:30 -07:00
Neil Lalonde 147887bc63 Remove duplicate list.js.handlebars 2013-09-19 16:52:57 -07:00
Neil Lalonde 5b455152d0 Add wrench icon to Edit Category button 2013-09-19 16:41:52 -07:00
Neil Lalonde 0a07b37ae9 Add email icon to password reset email button 2013-09-19 16:37:37 -07:00
Neil Lalonde 95257a192a Remove posts icon and make post count bold in mobile topic lists 2013-09-19 16:24:46 -07:00
Neil Lalonde 01180e78cc Use two lines per topic list item on mobile 2013-09-19 14:36:38 -07:00
Wojciech Zawistowski 7da10c0149 Remove duplicate mixing in of Discourse.Presence
AdminEmailIndexController and AdminEmailPreviewDigestController explicitely mix in Discourse.Presence, but they extend base classes Discourse.Controller and Discourse.ObjectController that already mix in Discourse.Presence, so this explicit inclusion is redundant.
2013-09-18 18:40:57 +02:00
Kris Aubuchon 79b8991ed8 fixing blockquote on mobile 2013-09-18 11:05:23 -04:00
Kris Aubuchon c60912f714 mobile: blockquote title fix 2013-09-18 00:37:56 -04:00
Kris Aubuchon 05c4173723 mobile: suggested topics will now fill the viewport width 2013-09-17 23:46:12 -04:00
Kris Aubuchon 9808ae2970 mobile: reduce vertical space between posts, prevent titles from wrapping 2013-09-17 23:32:11 -04:00
Neil Lalonde 21b018192f Style categories page for mobile 2013-09-17 17:02:10 -04:00
Neil Lalonde fdc7267ad9 Add margin to topic list footer message 2013-09-17 16:40:23 -04:00
Neil Lalonde be71dbfd94 Topic list styling for mobile 2013-09-17 16:07:14 -04:00
Neil Lalonde c04613f269 Fix resolver for mobile templates 2013-09-17 16:07:14 -04:00
Neil Lalonde 0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Robin Ward 2baf5fda8e Merge pull request #1438 from Elegios/composer_use_category_id
Make the composer and TopicCreator use category id instead of category name
2013-09-17 08:03:48 -07:00
Viktor Palmkvist 37673e3412 Make the composer and TopicCreator use category id instead of category name
Also fixes #1171
Includes backwards compatibility for topic creation
2013-09-17 12:13:19 +02:00
David Celis 279b1fbf48 Better padding for spoiler text
With no padding currently surrounding [spoiler] text, the white text
gets close enough to the white post background that it's a bit more
difficult to read than it reasonably could be. Pad spoiler text with 2px
to alleviate this difficulty.

Signed-off-by: David Celis <me@davidcel.is>
2013-09-16 12:49:38 -07:00
Neil Lalonde e4e8d2fc34 Allow switching between mobile and desktop view on any device. 2013-09-16 14:26:20 -04:00
Neil Lalonde 13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Sam 1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email
Enable/disable the possibility of editing user's nickname or email
2013-09-15 19:24:35 -07:00
Kris Aubuchon 045b1b0d96 fixed history modal, topic progress now sticky to last post, edits heatmap is back, date/edit links now grey 2013-09-14 23:28:28 -04:00
Matthieu Guillemot 3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Robin Ward 10c4dee67c Merge branch 'master' of git://github.com/awesomerobot/discourse into awesomerobot-master
Conflicts:
	app/assets/stylesheets/mobile/topic-post.css.scss
	app/assets/stylesheets/mobile/topic.css.scss
2013-09-14 00:39:08 -04:00
Kris Aubuchon e1b11c62ea reintroducing the post progress indicator, fixing gutter links, reducing white space between posts 2013-09-13 23:03:29 -04:00
Robin Ward 5d8cfd69f7 FIX: JSHint errors 2013-09-13 12:29:57 -04:00
Robin Ward 7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users
who don't have avatars.
2013-09-13 12:23:53 -04:00
Neil Lalonde 32163bc356 Show post number in share dialog when clicking post date 2013-09-13 10:35:22 -04:00
Neil Lalonde 8f12212942 Remove duplicate css. Kris and I fixed the same thing. I imported variables.scss so we can use $red and $bookmarkColor 2013-09-12 18:08:12 -04:00
Neil Lalonde e3c68bc500 Merge pull request #1432 from awesomerobot/master
fixing bookmarks and blockquotes for mobile
2013-09-12 14:41:15 -07:00
vagrant 4fbd011f39 fixing bookmarks and blockquotes for mobile 2013-09-12 16:00:53 -04:00
Neil Lalonde 90aaa27b98 Fix modal button spacing on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde c260ae622d Fix closing a modal on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde f0eede077d Show bookmark colours on mobile 2013-09-12 15:09:44 -04:00
Neil Lalonde 57dc8ed9f6 Add margin to auto-close message on mobile 2013-09-12 15:09:44 -04:00
Sam fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10:00
Neil Lalonde fe3693cdef Merge branch 'master' of github.com:discourse/discourse 2013-09-11 10:20:27 -04:00
Sam def4f15795 Merge pull request #1427 from awesomerobot/master
Reducing margins on mobile view
2013-09-11 00:36:57 -07:00
Sam 8516059025 remove global check 2013-09-11 15:58:55 +10:00
Kris Aubuchon a8bc789b81 reducing margins on mobile 2013-09-10 23:56:55 -04:00
Sam 681ff74cb8 Revert "inject currentUser into controllers & routes"
This reverts commit 7ec34b205a.
2013-09-11 13:26:46 +10:00
Neil Lalonde e8ef55c446 Rename StaffActionLog to UserHistory 2013-09-10 22:01:20 -04:00
Robin Ward 30eed4c8b4 FIX: Showing suggested topics when composing a reply 2013-09-10 20:00:04 -04:00
Robin Ward f2a1ef8d7d FIX: When expanding embedded replies, adjust the scroll position to not lose your place 2013-09-10 17:15:07 -04:00
Neil Lalonde cc2acafc9a Enable mobile view. Use local storage to remember whether you chose mobile or desktop view. Mobile device detection needs to be replaced with a better solution. 2013-09-10 16:44:17 -04:00
Robin Ward 886787b157 Remove extra comma 2013-09-10 12:31:58 -04:00
Robin Ward 0de96a6059 Adds support for dynamic composer messages. 2013-09-10 12:30:56 -04:00
Robin Ward 84a8a358c3 Trivial: Rename dialect action to block quotes rather than simple quotes 2013-09-09 14:11:56 -04:00
Robin Ward 49910b860b FIX: Regression that removed the ability to quote code 2013-09-09 13:20:03 -04:00
Neil Lalonde 199584824b Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users) 2013-09-09 12:24:26 -04:00
Robin Ward 360b8e32ca Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file
staff can always upload a file
2013-09-09 08:55:47 -07:00
Gosha Arinich 7ec34b205a inject currentUser into controllers & routes
Through Ember's DI, instead of doing so via a mixin.
2013-09-07 19:34:25 +03:00
Régis Hanol eae30d7816 staff can always upload a file 2013-09-07 10:49:11 +02:00
Robin Ward b87a78f7b2 Merge branch 'master' of github.com:discourse/discourse 2013-09-06 18:01:33 -04:00
Robin Ward c8ad977c8a Revert "Merge pull request #1215 from Elegios/composer_use_category_id"
This reverts commit 763859d439, reversing
changes made to b62caf80fb.
2013-09-06 18:00:57 -04:00
Neil Lalonde 2ea6a61a17 Show post number in the share dialog 2013-09-06 17:34:31 -04:00
Robin Ward a9f3489237 FIX: Don't onebox links with labels unless the labels are the same as the URL 2013-09-06 16:47:26 -04:00
Robin Ward 94917f47ed Remove brackets from `username_filters[]` URL 2013-09-06 15:58:54 -04:00
Neil Lalonde eef34eea80 Fix IE9 bug in browser-update. Unable to get value of the property 'insertBefore': object is null or undefined 2013-09-06 14:57:26 -04:00
Robin Ward 763859d439 Merge pull request #1215 from Elegios/composer_use_category_id
Make the composer and TopicCreator use category id instead of category name
2013-09-06 11:55:27 -07:00
Robin Ward b62caf80fb Merge pull request #1402 from LaunchAcademy/fix_index_out_of_range_error
FIX: Index out of range error
2013-09-06 11:53:59 -07:00
Régis Hanol 45b838009c proper content-disposition header when downloading attachments 2013-09-06 19:23:56 +02:00
Neil Lalonde cbe38075ac Fix asset compile problems 2013-09-05 18:04:45 -04:00
Robin Ward 63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde f47400fe2d Make post body have font-size 14px again 2013-09-05 16:45:38 -04:00
Neil Lalonde 9b526364ed Merge branch 'mobile' 2013-09-05 16:29:27 -04:00
Neil Lalonde 66d1cacdbd Hide flag modal while flag is submitted 2013-09-05 16:29:13 -04:00
Neil Lalonde c0b3a0ec45 Merge .deleted-user-avatar into mobile topic-post 2013-09-05 16:28:16 -04:00
Robin Ward 38fb727c00 JSHINT: missing comma 2013-09-05 16:05:04 -04:00
Neil Lalonde 17585c7152 Merge branch 'mobile' of https://github.com/awesomerobot/discourse into mobile 2013-09-05 16:03:06 -04:00
Neil Lalonde 45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward 2d6759d5a0 Add cancel button to delete replies dialog 2013-09-05 15:54:16 -04:00
Kris Aubuchon b8493b024b adding missing files back in 2013-09-05 15:37:07 -04:00
Neil Lalonde c2f37d36ab Hide flag modal while flag is submitted 2013-09-05 15:14:07 -04:00
Kris Aubuchon 80c4e02335 new mobile styles, some structure changes 2013-09-05 12:09:40 -04:00
Robin Ward 71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Neil Lalonde 117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -04:00
Sam 61d3e43744 better split logic for names starting with capitols eg: ABBob should split to AB Bob 2013-09-04 15:02:04 +10:00
Neil Lalonde dc1efd6c78 If mobile view, don't switch to small logo in the header when scrolled down in a topic 2013-09-02 16:26:12 -04:00