IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 11:44:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,437 Commits 214 Branches 500 Tags 897 MiB
a561cbc5fa
Commit Graph

4080 Commits

Author SHA1 Message Date
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
Kris Aubuchon
81b5b6de0e fixing the remnant borders left on the header buttons 2014-03-10 20:22:37 -04:00
Jeff Atwood
8cf29e1339 add envelope icon to invite friends default btn 2014-03-10 17:10:40 -07:00
Jeff Atwood
258ebaf1a8 add calendar icon to best of 2014-03-10 17:05:53 -07:00
Sam
eb2f04d458 PERF: Don't blur all elements on a page 2014-03-11 09:03:24 +11:00
Jeff Atwood
4ce422dc26 Merge pull request #2101 from awesomerobot/master 
fixing regression, adding max-height to #site-logo
 2014-03-10 13:47:30 -07:00
Kris Aubuchon
15484fa394 fixing regression, adding max-height to #site-logo 2014-03-10 16:41:54 -04:00
Robin Ward
9929560c40 FIX: Suggested Topics had a hardcoded 5 and was ignoring the 
SiteSetting
 2014-03-10 15:36:45 -04:00
Robin Ward
f5e6bcc585 Create a cold age helper, make sure the first age column is strictly 
`created_at`, add cold to the second column.
 2014-03-10 15:02:39 -04:00
Robin Ward
c430c6dd30 FIX: Only add home class when there is no badge 2014-03-10 13:31:07 -04:00
Régis Hanol
455ff61626 Merge pull request #2071 from nschonni/autocomplete-js-cleaning 
Autocomplete js cleaning
 2014-03-10 17:06:51 +01:00
Robin Ward
9f67d476ef Add bookmarked class to bookmarks button. Also remove duplicated code, 
use fewer observers.
 2014-03-10 12:03:46 -04:00
Robin Ward
33f483a47e Add home class to dropdown for categories 2014-03-10 11:43:24 -04:00
Robin Ward
6626a6c3ea FIX: Don't increase link counts when they are in the thousands 2014-03-10 11:21:48 -04:00
Robin Ward
d200e68bab FIX: Link counter was broken for some https links 2014-03-10 11:16:21 -04:00
Benjamin Kampmann
680197200e Add support for arrays to PluginStore 2014-03-10 14:59:59 +01:00
Régis Hanol
c5beb3852f Merge pull request #2092 from nschonni/jshinting 
Jshinting during CI build
 2014-03-10 09:51:11 +01:00
Jeff Atwood
3186ca8c99 Merge pull request #2094 from vikhyat/firefox-paste-image 
Fix Firefox image paste contenteditable hack
 2014-03-09 22:48:56 -07:00
Vikhyat Korrapati
3b1ed996e7 Firefox: Reuse same contenteditable <div> instead of creating a new one on paste. 
This fixes the issue where every alternate paste from a different source
would not work because the content wasn't getting pasted into the
contenteditable div randomly.
 2014-03-10 10:50:52 +05:30
Kris Aubuchon
ef0e636307 making the mobile composer opaque, may fix clicks from falling through 2014-03-10 00:55:12 -04:00
Sam
e49ad34bfc Revert "Hack for supporting pasting images into the composer in Firefox." 
Reverted cause it broke https://meta.discourse.org/t/when-creating-a-reply-pasting-only-works-once/13587

This reverts commit c8c150dfbe.
 2014-03-10 13:43:28 +11:00
Sam
e68e106be7 UI: we only intended to add the word "new" for new topics 2014-03-10 13:40:49 +11:00
Sam
bf23c7a0c4 Merge pull request #2066 from riking/red-popup 
Style 'urgent' composer popups differently
 2014-03-10 10:46:15 +11:00
Sam
0de759e734 UI: remove usercard hacks, specify width explictly 2014-03-10 10:27:58 +11:00
Sam
68630af718 Merge pull request #2083 from vikhyat/firefox-paste-image 
Hack for supporting pasting images into the composer in Firefox
 2014-03-10 10:06:31 +11:00
Sam
5e83778fc1 PERF: remove ember renderspeed until we make it optional (disabled by default in prd) 2014-03-10 09:50:23 +11:00
Sam
c1d998cd4b Merge pull request #2086 from vikhyat/new-unread-i18n 
i18n of new/unread text next to topics
 2014-03-10 09:27:04 +11:00
Vikhyat Korrapati
b0d1d7a3e8 i18n of new/unread text next to topics. 2014-03-09 16:31:44 +05:30
Kris Aubuchon
c751567c04 fixing mobile notificaiton badge 2014-03-08 23:08:32 -05:00
Vikhyat Korrapati
c8c150dfbe Hack for supporting pasting images into the composer in Firefox. 2014-03-09 04:24:05 +05:30
Kris Aubuchon
10858d3c87 some incremental style enhancements, as discussed here https://meta.discourse.org/t/discourse-design-experiments/13479 2014-03-08 00:55:02 -05:00
Nick Schonning
96bf38757d Update indexOf polyfill 
Updated from the same source as the original comment. If IE8 isn’t
supported then this can be removed.
 2014-03-08 00:37:28 -05:00
Jeff Atwood
4efabef8f2 add btn-primary class to PM in usercard 2014-03-07 14:27:13 -08:00
Robin Ward
145b2931c6 FIX: Forward button would break on some topics 2014-03-07 16:28:53 -05:00
Jeff Atwood
1403d303b6 Merge pull request #2074 from awesomerobot/master 
fixing close topic/footer button/suggested topics alignment
 2014-03-07 12:13:30 -08:00
Kris Aubuchon
3be1b0decf fixing close topic/footer button/suggested topics alignment 2014-03-07 15:04:18 -05:00
Robin Ward
055b367e2b Add link counts to alt tags of their badges. 2014-03-07 14:43:29 -05:00
Robin Ward
f5c3199b38 FIX: Do not consider hidden elements when wanting to load more 2014-03-07 14:23:13 -05:00
Régis Hanol
8214536614 BUGFIX: don't show redirect reason if you aren't redirected 
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
 2014-03-07 18:58:53 +01:00
Nick Schonning
8b3f2a8685 Remove unused variable 
It is only set to empty then passed
 2014-03-07 12:23:23 -05:00
Nick Schonning
db5ff5f311 Combine single path conditional 2014-03-07 12:23:22 -05:00
Nick Schonning
8961a2ee28 Simplify characterCode lookup 
Reduce String.fromCharCode that can’t be optimized by the minifier.
 2014-03-07 12:23:16 -05:00
Robin Ward
78889163bf BUGFIX: We were tring to delete the mail string, not the mail itself. 2014-03-07 11:28:55 -05:00