github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 11:04:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,308 Commits 214 Branches 500 Tags 960 MiB
090f5c99c2
Commit Graph

4003 Commits

Author SHA1 Message Date
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