github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 04:31:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,182 Commits 190 Branches 500 Tags 938 MiB
05b923eac1
Commit Graph

7182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sam
ccb4248f20 Merge pull request #2131 from vikhyat/poll-plugin 
Poll plugin updates
 2014-03-17 10:00:03 +11:00
Jeff Atwood
1fed2c5a5a improve Welcome to Discourse post 2014-03-16 12:49:07 -07: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
Vikhyat Korrapati
e3702ecb30 Improved crawler detection: add Twitterbot, Facebook, curl, Bing, Baidu. 2014-03-16 19:30:20 +05:30
Vikhyat Korrapati
9ef104bbce Poll Plugin: Don't allow voting on closed topics. 2014-03-16 19:21:17 +05:30
Vikhyat Korrapati
ae3f135c33 Poll Plugin: Allow staff to edit options. 2014-03-16 19:21:17 +05:30
Vikhyat Korrapati
e4c793a7e3 Poll Plugin: Allow optional space before ":" for the French locale. 2014-03-16 19:21:17 +05:30
Jeff Atwood
5e93d60e9b PTR reminder, name 2014-03-15 19:56:23 -07:00
Jeff Atwood
0bb9b607cc add SPF DKIM reminder 2014-03-15 15:29:26 -07:00
Noel B. A
6e667476a0 updated spanish translation 2014-03-15 21:47:55 +03:00