Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,193 Commits 260 Branches 502 Tags 851 MiB
Commit Graph

7193 Commits

Author SHA1 Message Date
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
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
Robin Ward 5c6895c3e6 Merge pull request #2143 from czarneckid/patch-1 
Minor fix for location of osx_dev script
 2014-03-18 14:23:31 -04:00
David Czarnecki 05b923eac1 Minor fix for location of osx_dev script 2014-03-18 13:27:50 -04:00
Régis Hanol 5ce84eed82 Merge pull request #2134 from Onaldanm/patch-1 
Poll - Topic Term
 2014-03-18 17:42:43 +01:00
Régis Hanol a627a062de Merge pull request #2135 from Onaldanm/poll-badge-fr 
Translation: Badges, poll and french updates
 2014-03-18 17:41:06 +01:00
Régis Hanol a279ad06d9 Merge pull request #2142 from sanderdatema/patch-5 
Dutch translation updated
 2014-03-18 17:40:37 +01:00
Sander Datema 580a55ec03 Dutch translation updated 2014-03-18 11:47:50 +01:00
Sander Datema 5c0b6eaac1 Dutch translation updated 2014-03-18 11:46:47 +01:00
Sam 5c26b3dad1 FIX: broken specs after new link alerting code 2014-03-18 15:22:53 +11:00
Sam 9fd7b0b814 use 1.9 syntax 2014-03-18 15:22:53 +11:00
Sam 76c7d42027 require rbtrace in development cause it is handy 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
Jeff Atwood 7a3eceed76 remove SSH key generation, not for beginners 2014-03-17 14:39:19 -07: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
Jeff Atwood 2cff3c20f7 clarify invite copy 2014-03-17 12:07:21 -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
Robin Ward 5b0d8d5ffd Trivial typo 2014-03-17 13:13:05 -04:00
Robin Ward 38f2c778fb Update ember-cloaking for latest fixes/tweaks 2014-03-17 12:01:17 -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
Régis Hanol 3fb7d0c3f8 Merge pull request #2136 from ligthyear/plugins-admin-js 
Enable Admin-Javascript for plugins
 2014-03-17 14:33:56 +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
Sébastien Miquerolle 1f71a4d4bc Poll - Topic Term 
Use topic instead of thread to keep the same term for the user.
 2014-03-17 11:27:41 +01:00
Onaldanm 134af37cbd Badges, poll and french Translation 
New Badges system
New string in the poll plugin + change the term "poll option"
Re-add some empty strings (like notifications.title)
And updates
 2014-03-17 11:21:47 +01:00
Régis Hanol 2d49374357 Merge pull request #2130 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-17 09:31:17 +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
Régis Hanol 473c054070 Merge pull request #2133 from Aselox/master 
Update Italian Translation
 2014-03-17 09:29:10 +01:00
Sam 798b8444cf BUGFIX: work correctly if process forks 2014-03-17 15:22:11 +11:00
Sam 90139efc6f Fix spec, remove pointless have_many etc preamble 2014-03-17 12:47:47 +11:00
Sam 02963b03dc BUGFIX: last_seen_at can be nil 2014-03-17 12:42:51 +11:00
Sam 2c8ae22b87 FEATURE: add a simple queue Scheduler::Defer.later {} 
For quick jobs that do not need to be sent to sidekiq,
runs inline in a single thread but does not block
 2014-03-17 12:16:19 +11:00
Aselox 9a8dff1d32 Update server.it.yml 2014-03-17 00:26:45 +01:00
Aselox 3f4ad3a29d Update client.it.yml 2014-03-17 00:25:29 +01: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