Commit Graph

4122 Commits

Author SHA1 Message Date
Régis Hanol c10e44c0cf Merge pull request #2171 from Mikulas/patch-missing-localization
add localization to post multiselect
2014-03-25 14:35:36 +01:00
Régis Hanol ae98bc91a1 Merge pull request #2178 from vikhyat/badge-system
Don't display granted badges in the badge grant combobox
2014-03-25 12:04:23 +01:00
Vikhyat Korrapati 61ec2b390e Don't display granted badges in the badge grant combobox. 2014-03-25 15:45:34 +05:30
Vikhyat Korrapati fa6ff26061 Update combobox when contents are changed. 2014-03-25 15:29:13 +05:30
riking 87d47ece59 CSS rule for GitHub commit avatars 2014-03-24 21:52:40 -07:00
Kane York 473201c9a4 Change specified height to 450 2014-03-24 20:02:04 -07:00
Sam 3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Sam 4191972afe Merge pull request #2173 from vikhyat/badge-system
Forgot to specify "dependent: destroy" for UserBadges
2014-03-25 08:25:31 +11:00
Régis Hanol 9454ad1ef9 Merge pull request #2172 from vikhyat/firefox-paste-image
Fix pasting into the subject field in Firefox
2014-03-24 18:41:40 +01:00
Neil Lalonde ea86cfd4ef FIX: categories with non-ascii names will have broken next page urls 2014-03-24 13:36:23 -04:00
Mikulas fffe3dee6e add localization to multiselect popup 2014-03-24 18:23:29 +01:00
Vikhyat Korrapati b1e524e9c3 Specify `dependent: destroy` for UserBadges. 2014-03-24 22:39:58 +05:30
Vikhyat Korrapati 881340213e Fix pasting into the subject field in Firefox. 2014-03-24 22:33:20 +05:30
Neil Lalonde 36cbd0d348 FIX: broken admin user page when must_approve_users is enabled 2014-03-24 11:43:06 -04:00
Neil Lalonde e823558742 FIX: admin user page for suspended user was busted 2014-03-24 10:19:15 -04:00
Sam 7e7c4efcc0 FEATURE: on initial boot hint users on how to get admin 2014-03-24 18:03:39 +11:00
Sam c27c87911e FEATURE: refactor notice code, add optional global notice.
Set the global_notice site setting to notify users of a critical event.
2014-03-24 16:51:48 +11:00
riking c978eade56 Make Facebook login popup taller 2014-03-23 22:00:15 -07:00
Sam 1cd32ced33 FEATURE: update likes and flags live. 2014-03-24 13:22:03 +11:00
Sam 090f5c99c2 FEATURE: Live update edits 2014-03-24 12:19:08 +11:00
Sam 89b62e133d BUGFIX: overflow hidden messes stuff up for chrome on mac 2014-03-24 10:13:46 +11: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
Jeff Atwood 70fc006991 add img max width to embedded iframe comments 2014-03-22 15:51:46 -07:00
Jeff Atwood 7c19863d90 5px not 5 2014-03-22 15:17:37 -07:00
Jeff Atwood 129f82759c embedded iframe css improvements 2014-03-22 15:05:38 -07:00
Kris Aubuchon 7521a8d41a a few simple style clean-ups 2014-03-22 17:39:47 -04:00
Régis Hanol 6b8a5d1d78 BUGFIX: bound avatars in revision history UI 2014-03-22 17:39:59 +01:00
Jeff Atwood a8000c11a6 tighten up problem messages display 2014-03-22 00:37:18 -07:00
Jeff Atwood 73a9290d3f make header only box-shadow on bottom 2014-03-21 23:55:08 -07:00
Jeff Atwood 43f2e5b747 make user setting desc less big/dark 2014-03-21 23:09:48 -07:00
Jeff Atwood 57f33686cc make setting descriptions less big/dark 2014-03-21 23:06:53 -07:00
Neil Lalonde c3c5ac3ef7 Some tweaks to sub-category badges 2014-03-21 15:33:44 -04:00
Robin Ward 097125215a Merge pull request #2163 from awesomerobot/master
added the header shadow back in
2014-03-21 15:11:44 -04:00
Kris Aubuchon 3b8f6d3fe1 added the header shadow back in 2014-03-21 14:50:42 -04:00
Neil Lalonde c649959e34 Show parent category on category badges 2014-03-21 14:34:50 -04:00
Robin Ward 539890afdf Let's not show tons of extra information about invites unless you're the
person who invited them.
2014-03-21 14:16:11 -04:00
Kris Aubuchon 63eb7a60e5 dialing back the animations I added previously 2014-03-21 09:23:22 -04:00
Régis Hanol 88ba80b239 Merge pull request #2160 from borhub/fix-excessive-li-in-category-breadcrumb
Fix visual bug from excessive LIs being rendered around Category breadcrumbs
2014-03-21 10:00:04 +01:00
Boris 0a330544b3 Prevent rendering of excessive <li> wrapper around a category breadcrumb which already is a <li>.
The excessive <li> wrapper coming from the template is automatically closed by the browser during the HTML parsing step, causing an empty <li> being visible in the rendered source (preceding the first breadcrumb). This causes a visual bug when not using the default Discourse stylesheet, because the extra LI element pushes the content to the right and sometimes also renders an extra black pixel.
2014-03-21 16:58:06 +11:00
Vikhyat Korrapati dcaa069bb5 Log badge grant/revoke to the staff actions log. 2014-03-21 11:10:07 +05:30
Vikhyat Korrapati 0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati 8163fcade7 Combobox view: escape name string. 2014-03-21 11:09:19 +05:30
Vikhyat Korrapati 50ce93a850 Use render_serialized for rendering instances in UserBadgeController. 2014-03-21 11:09:19 +05:30
Sam 2dc5e3c81e Merge pull request #2118 from vikhyat/firefox-middle-click
Fix Firefox middle-click popup blocker issue
2014-03-21 16:27:02 +11:00
Jeff Atwood dbf3d29d9e Merge pull request #2158 from awesomerobot/master
adding a few simple animations to the topic list loading spinner and modals
2014-03-20 13:42:05 -07:00
Kris Aubuchon ca4d211268 adding a few simple anmiations to the topic list loading message and modals 2014-03-20 16:33:03 -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 a4daafa026 Support trailing `/` when retrieving comment counts. 2014-03-20 15:22:49 -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 e5cb1cac86 FIX: Weird spacing with lists in embedded comments 2014-03-20 11:20:12 -04:00
Robin Ward 83778138ad FIX: Discourse quoting class for embedded content 2014-03-20 11:11:33 -04:00
Robin Ward a22f6f6a02 Added `blockquote` class to embedded comments. 2014-03-20 11:08:30 -04:00
Robin Ward 375719edfb FIX: Links in the iframe should all be target=_blank 2014-03-20 10:57:36 -04:00
Jeff Atwood 764ba152d1 mobile notification options on own line 2014-03-19 21:43:28 -07:00
Sam 5c148faeb9 annotations were out of date 2014-03-20 15:35:51 +11:00
Sam c240fb0d83 BUGFIX: facebook does not always provide username
We key on facebook_user_id its the only thing that matters
2014-03-20 15:35:30 +11:00
Sam 619fa50d4b BUGFIX: twitter auth asking for a password 2014-03-20 14:49:25 +11:00
Robin Ward 52fbce07ed Add emoji style for blogs 2014-03-19 17:51:41 -04:00
Robin Ward faaada6e8a Consider URLs the same even with a trailing slash 2014-03-19 16:33:21 -04:00
Robin Ward d3f1eb395d Updated import for TypePad 2014-03-19 15:02:49 -04:00
Régis Hanol 44888f7acc FEATURE: upload button on mobile composer 2014-03-19 18:34:08 +01:00
Neil Lalonde a74764c833 Log when facebook doesn't provide an email address 2014-03-19 13:31:17 -04:00
Robin Ward 51e3d72461 Merge pull request #2141 from riking/correctness
Lots of JS correctness fixes
2014-03-19 11:20:15 -04:00
Neil Lalonde a9a8e649ba Oops, and these methods too 2014-03-19 10:36:24 -04:00
Neil Lalonde 986f6e9c2a Oops I meant to delete the old method 2014-03-19 10:35:35 -04:00
Neil Lalonde 3ea477b17d FIX: performance of CategoryDetailedSerializer and Category.update_stats on large databases 2014-03-19 10:14:15 -04:00
Jeff Atwood 42ea20b439 get rid of borders around mobile glyphs 2014-03-19 07:02:09 -07:00
Jeff Atwood e67ad58a8d Merge pull request #2149 from awesomerobot/master
removing border from topic list, making category sizes consistent
2014-03-19 06:45:06 -07:00
Kris Aubuchon c11965ed9f removing border from topic list, making category sizes consistent 2014-03-19 09:38:35 -04:00
Régis Hanol 80bfdeee82 Merge pull request #2147 from vikhyat/serialize-params
Route `serialize` hook argument is the model, not params
2014-03-19 09:30:26 +01:00
Vikhyat Korrapati 28731ea633 Route `serialize` hook argument is the model, not params. 2014-03-19 12:02:27 +05:30
Sam eab30d1c28 Merge pull request #2146 from vikhyat/badge-system
Badge creation UI improvements
2014-03-19 17:11:00 +11:00
Vikhyat Korrapati 89d3835d64 Badge creation UI improvements. 2014-03-19 10:43:38 +05:30
Vikhyat Korrapati a4461022a3 Move badges admin tab to after users, show only if enabled. 2014-03-19 09:48:04 +05:30
riking 4699136d83 Fix this/self usage warning
To clarify the intent of using 'this' inside the closure, it is first assigned to a variable.
2014-03-18 19:09:49 -07:00
riking 8136468ec7 Fix inefficent jQuery usage
Some jQueries can be cached and reused. This commit does that.
2014-03-18 19:09:49 -07:00
riking a871158c80 Fix some bad HTML 2014-03-18 19:09:49 -07:00
riking 2ade638d79 Remove unused variables 2014-03-18 19:09:44 -07:00
riking 834a721bbe Remove two noop backslashes in regexes 2014-03-18 18:24:36 -07:00
riking 86774fa5c1 Simplify return statements 2014-03-18 18:23:15 -07:00
riking 3f35d1062e Remove trailing commas, add trailing semicolons 2014-03-18 18:21:10 -07:00
riking 593f5df503 Corrections to JSDoc 2014-03-18 18:19:20 -07:00
Sam 9fc31932cf BUGFIX: don't alery myself when I link to myself 2014-03-19 12:07:48 +11:00
Régis Hanol 5bc8e7c19b BUGFIX: BackupChunksMerger
- actually remove the tmp directory
- merge all the chunks into a .tmp archive and then remove the .tmp extension once done
2014-03-19 01:05:47 +01:00
Régis Hanol a2483b95df BUGFIX: stabilize the buttons in revision history UI 2014-03-19 00:36:02 +01:00
Sam b77fe49150 Stop leaking site_email in rss 2014-03-19 09:46:48 +11:00
Robin Ward 84e608079b Ability to customize the logo in digest emails 2014-03-18 15:56:17 -04:00
Robin Ward d0edfe2179 Better error messages if the "Send Test Email" button fails. 2014-03-18 15:26:36 -04:00
Neil Lalonde fa4bc90fbb Remove another N+1 query from categories page 2014-03-18 15:24:29 -04:00
Neil Lalonde 0b1550f9d4 Add excerpt column to topics table to remove N+1 query in ListableTopicSerializer 2014-03-18 15:24:29 -04:00
Robin Ward 3cf0adaed0 Merge pull request #2139 from riking/s3-backup-warning
Add s3_backup_config_warning
2014-03-18 14:41:42 -04:00
Sam 5c26b3dad1 FIX: broken specs after new link alerting code 2014-03-18 15:22:53 +11:00
Sam 00a46253ae BUGFIX: Don't resolve oneboxes when cooking
Defer to post save job
2014-03-18 15:22:53 +11:00
Sam 24667cedee FEATURE: notify users when linked
Extract out PostAlerter from observer
Track outgoing post links correctly
Notify users they are linked when linked
2014-03-18 15:22:53 +11:00
Jeff Atwood 02bed953b3 Merge pull request #2140 from awesomerobot/master
fixing private category badges and mobile header logo
2014-03-17 21:08:40 -07:00
Kris Aubuchon fd2da91df0 fixing private category badges and mobile header logo 2014-03-17 23:18:15 -04:00
Kris Aubuchon 49a222f985 fixing private category badges and mobile header logo 2014-03-17 23:00:39 -04:00
riking ffd4f367e3 Add s3_backup_config_warning
Note that only one of the two warnings can be shown, because they are checked in the same method.
2014-03-17 12:56:59 -07:00
Neil Lalonde 2c725e2779 FEATURE: Trust level 4 abilities: pin/unpin, close, archive, make invisible, split/merge topic 2014-03-17 14:50:28 -04:00
Neil Lalonde f390c92578 Hide the Invite button in topics in secured categories 2014-03-17 10:59:15 -04:00
Régis Hanol 26578d1b73 Merge pull request #2137 from vikhyat/badge-system
Fix badge description i18n match
2014-03-17 14:57:03 +01:00
Vikhyat Korrapati 4f71256542 Fix badge description i18n match. 2014-03-17 18:43:09 +05:30
Benjamin Kampmann e63b9b362e allow apps to give custom admin javascripts 2014-03-17 13:19:08 +01:00
Régis Hanol 2085c82360 Merge pull request #2132 from vikhyat/firefox-paste-image
Support image copy-paste for Firefox 24+
2014-03-17 09:29:31 +01:00
Sam 02963b03dc BUGFIX: last_seen_at can be nil 2014-03-17 12:42:51 +11:00
Sam fe63db7953 Merge pull request #2115 from vikhyat/badge-system
Initial badge system implementation
2014-03-17 10:06:37 +11:00
Sam f4c2fef407 Merge pull request #2121 from LessonPlanet/disable-name-edit-for-sso
Adding name to the list of uneditable items in preferences UI
2014-03-17 10:05:11 +11:00
Sam 82e34eabb7 Merge pull request #2128 from vikhyat/crawler-detection
Improved crawler detection
2014-03-17 10:02:33 +11:00
Sam 0f359d3f62 Merge pull request #2122 from riking/extensible-share
Make Discourse.ShareLink fully extensible
2014-03-17 10:00:37 +11:00
Vikhyat Korrapati 4f910e1c82 Support image copy-paste for Firefox 24+. 2014-03-16 20:04:05 +05:30
Vikhyat Korrapati 5c1fe30cd6 Include opengraph/oembed tags in the crawler layout. 2014-03-16 19:30:26 +05:30
Kris Aubuchon b219450f3c fixing lists on mobile posts and changing highlight color 2014-03-15 12:01:17 -04:00
Jeff Atwood 724d30afec fix user admin for 1280px width 2014-03-15 02:16:29 -07:00
Robin Ward e22f1ae186 Support for a daily job at a certain hour. Convert backup job to run at
3am instead of randomly during the day.
2014-03-14 13:02:45 -04:00
Régis Hanol 2b5e4c3919 BUGFIX: revision numbers were unbound in revision history UI 2014-03-14 17:25:02 +01:00
Vikhyat Korrapati 9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
riking 996e5cf021 Make Discourse.ShareLink easy for plugins
For example, this javascript code, if added by a plugin, would enable a Tumblr share link:

Discourse.ShareLink.addTarget('tumblr', {
  iconClass: 'fa-tumblr',
  generateUrl: function(link, title) {
    return ("http://www.tumblr.com/share/link?url=" + encodeURIComponent(link) + "&description=" + encodeURIComponent(title));
  },
  shouldOpenInPopup: true
});
2014-03-13 23:38:57 -07:00
Kris Aubuchon 86a617f9b1 adding tiger striping to suggested topics 2014-03-13 16:49:44 -04:00
Forest Carlisle e904b2faad Adding name to the list of uneditable items in preferences UI
* If enable_names,  enable_sso, and sso_overrides_name settings are true.
  * Added serialization of can_edit_name so the UI has access to the right.
2014-03-13 13:26:40 -07:00
Régis Hanol d450c7e0de BUGFIX: only resize revision history UI after it has loaded the revision 2014-03-13 19:19:42 +01:00
Robin Ward e0dee0f10c Do not include moderator posts in the group area. 2014-03-13 14:06:40 -04:00
Régis Hanol fd1c824187 Revert "Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso"
This reverts commit 91aa21671a, reversing
changes made to f19596af0d.
2014-03-13 18:17:59 +01:00
Robin Ward 0293eb4a13 FIX: Couldn't unbookmark posts 2014-03-13 11:31:07 -04:00
Neil Lalonde 283dc7dd2d Trust level 4: add ability to edit any post and see edit history 2014-03-13 10:47:49 -04:00
Vikhyat Korrapati e798705aec Do not call preventDefault on right and middle-click/Ctrl+click.
This should fix the middle click popup blocker issue on Firefox.
2014-03-13 11:03:19 +05:30
Jeff Atwood 8fcc76bdd9 Merge pull request #2117 from awesomerobot/master
some iterative design changes
2014-03-12 20:23:50 -07:00
Kris Aubuchon bb49b3be82 some iterative design changes 2014-03-12 23:17:18 -04:00
Forest Carlisle e8c7c6fab7 Adding name to the list of uneditable items in preferences UI
* If enable_names,  enable_sso, and sso_overrides_name settings are true.
2014-03-12 17:09:53 -07:00
Neil Lalonde 5f34a621b5 Revert "Merge pull request #1896 from nickborromeo/category-list" 2014-03-12 16:41:15 -04:00
Robin Ward 085f7997a2 FEATURE: Upload backups to S3 when complete. 2014-03-12 16:24:45 -04:00
Neil Lalonde 3175c85fa6 FIX: pin/unpin button in topic admin menu needs to ignore whether the admin user cleared the pin 2014-03-12 14:47:15 -04:00
Robin Ward 42ca83ece5 FEATURE: New site setting to enable a daily automatic backup 2014-03-12 13:30:47 -04:00
Neil Lalonde 9ca516e58d Rename nickname to username in the code. Use new hub routes. (Old routes still exist as aliases for old Discourse instances.) 2014-03-12 12:39:36 -04:00
Robin Ward dc1d6decf5 Support for removal of old backups automatically via a site setting 2014-03-12 12:24:35 -04:00
Régis Hanol 363fabd3e7 add tests for ListController.best_period_for 2014-03-12 12:58:41 +01:00
Régis Hanol 2735f286c4 UI: add calendar icon to all top buttons 2014-03-12 11:34:01 +01:00
Régis Hanol bbde2aaa97 Merge pull request #1896 from nickborromeo/category-list
Refactor find_relevant_topics and find_categories
2014-03-12 09:44:41 +01:00
Nick Borromeo 5104c7365f Refactor find_relevant_topics and find_categories
This breaks down two private methods into smaller methods for
readability. This also moves logic into the Category model class.
2014-03-11 22:16:13 -07:00
Kris Aubuchon 441d01c5a6 going back to the white on blue new post notification badges 2014-03-11 17:26:25 -04:00
Régis Hanol 5ffcfb1a8c TRIVIAL: remove useless condition 2014-03-11 19:06:36 +01:00
Régis Hanol aece2b61a9 FIX: revision history UI 2014-03-11 18:51:26 +01:00
Vikhyat Korrapati 2e4a699b30 Set canvas height and width for Firefox image copy-paste. 2014-03-11 15:29:44 +05:30
Régis Hanol d25081ce07 Merge pull request #2104 from nschonni/additional-jshinting
Additional jshinting
2014-03-11 09:20:04 +01:00
Régis Hanol f71846f269 Merge pull request #2103 from awesomerobot/master
fixing the remnant borders left on the header buttons
2014-03-11 09:11:32 +01:00
Nick Schonning 635c0dbf7a JSHint i18n.js
- Mark the I18n object as an overridable global
- Normalize comma first style rather than turning on lax comma
- Add missing semicolons
- Remove unnecessary semicolons
- Fix options overloading in “lookup”
- Use strict comparison for typeof checks and remove unnecessary parens
2014-03-11 03:01:12 -04:00
Jeff Atwood 7482f07eaa reduce undocked header title font size slightly 2014-03-10 23:55:30 -07:00
Jeff Atwood 5cd672d396 reduce docked header title font size slightly 2014-03-10 23:24:01 -07:00