github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 23:20:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,496 Commits 190 Branches 500 Tags 938 MiB
7da10c0149
Commit Graph

4496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wojciech Zawistowski
7da10c0149 Remove duplicate mixing in of Discourse.Presence 
AdminEmailIndexController and AdminEmailPreviewDigestController explicitely mix in Discourse.Presence, but they extend base classes Discourse.Controller and Discourse.ObjectController that already mix in Discourse.Presence, so this explicit inclusion is redundant.
 2013-09-18 18:40:57 +02:00
Jeff Atwood
aca567b4d7 Merge pull request #1446 from awesomerobot/master 
mobile: blockquote title fix
 2013-09-17 21:38:56 -07:00
Kris Aubuchon
c60912f714 mobile: blockquote title fix 2013-09-18 00:37:56 -04:00
Jeff Atwood
b4f9b9880d Merge pull request #1445 from awesomerobot/master 
mobile: reduce vertical space between posts, prevent title wrap
 2013-09-17 21:14:38 -07:00
Kris Aubuchon
05c4173723 mobile: suggested topics will now fill the viewport width 2013-09-17 23:46:12 -04:00
Kris Aubuchon
9808ae2970 mobile: reduce vertical space between posts, prevent titles from wrapping 2013-09-17 23:32:11 -04:00
Neil Lalonde
21b018192f Style categories page for mobile 2013-09-17 17:02:10 -04:00
Neil Lalonde
fdc7267ad9 Add margin to topic list footer message 2013-09-17 16:40:23 -04:00
Neil Lalonde
be71dbfd94 Topic list styling for mobile 2013-09-17 16:07:14 -04:00
Neil Lalonde
c04613f269 Fix resolver for mobile templates 2013-09-17 16:07:14 -04:00
Robin Ward
99b6a62fcb New composer message for people dominating a topic 2013-09-17 14:38:39 -04:00
Robin Ward
16dc0a7001 New user education notification was off by one. Also, remove the "basic" restriction on the 
"posting too often" message.
 2013-09-17 12:12:03 -04:00
Neil Lalonde
0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Robin Ward
2baf5fda8e Merge pull request #1438 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-17 08:03:48 -07:00
Robin Ward
09d32f5600 Merge pull request #1444 from davidcelis/spoiler-padding 
Better padding for spoiler text
 2013-09-17 08:02:12 -07:00
Neil Lalonde
b15e629f46 Strip trailing slashes from ScreeningUrl records 2013-09-17 10:26:05 -04:00
Sam
6183e9bb6c flamegraph upgrade 2013-09-17 21:34:38 +10:00
Viktor Palmkvist
37673e3412 Make the composer and TopicCreator use category id instead of category name 
Also fixes #1171
Includes backwards compatibility for topic creation
 2013-09-17 12:13:19 +02:00
Sam Saffron
fef39ee4c9 Mini Profiler and fast stack update, resolves infinite loop in flame graphs 2013-09-17 17:14:45 +10:00
Sam
3c2b10ddaf tidy up method 2013-09-17 10:24:15 +10:00
Sam
6af1e12cc1 after_initialize callback for plugins 2013-09-17 10:24:15 +10:00
David Celis
279b1fbf48 Better padding for spoiler text 
With no padding currently surrounding [spoiler] text, the white text
gets close enough to the white post background that it's a bit more
difficult to read than it reasonably could be. Pad spoiler text with 2px
to alleviate this difficulty.

Signed-off-by: David Celis <me@davidcel.is>
 2013-09-16 12:49:38 -07:00
Neil Lalonde
ba2c4139fe Use absolute urls in notifications for automatic spammer handling. 2013-09-16 15:07:58 -04:00
Neil Lalonde
e4e8d2fc34 Allow switching between mobile and desktop view on any device. 2013-09-16 14:26:20 -04:00
Neil Lalonde
c845071066 Fix an error with mobile custom header 2013-09-16 12:55:44 -04:00
Neil Lalonde
13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Robin Ward
c9ebf23561 Merge pull request #1443 from NeutralAngel/issue_1133 
Allow TextSentinel#seems_unpretentious? to accept words joined with dash...
 2013-09-16 07:46:41 -07:00
Nathan Nontell
d95172cb5d Allow TextSentinel#seems_unpretentious? to accept words joined with dashes or forward slashes. (Issue 1133) 2013-09-16 09:45:57 -04:00
Régis Hanol
406c29e79a Merge pull request #1442 from ZogStriP/patch-1 
Add a link to the email setup doc
 2013-09-16 01:22:59 -07:00
Régis Hanol
7afa8b7bd4 Add a link to the email setup doc 2013-09-16 10:18:26 +02:00
Sam
6ca6853392 disable XML params, they are just used by malicious bots to determine if we have XML vuls. 2013-09-16 12:58:26 +10:00
Sam
1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email 
Enable/disable the possibility of editing user's nickname or email
 2013-09-15 19:24:35 -07:00
Sam
3d069c219c Merge pull request #1437 from abbat/master 
Russian translation (actual version)
 2013-09-15 19:15:14 -07:00
Sam
c2ceced747 Merge pull request #1439 from zvikara/master 
HandlebarsOneboxes: avoid constants multiple declarations
 2013-09-15 19:14:41 -07:00
Sam
0909beebc2 Merge pull request #1440 from awesomerobot/master 
fixed history modal, topic progress now sticky to last post, others...
 2013-09-15 19:12:37 -07:00
Kris Aubuchon
045b1b0d96 fixed history modal, topic progress now sticky to last post, edits heatmap is back, date/edit links now grey 2013-09-14 23:28:28 -04:00
Zvika Rap
b071927ced HandlebarsOneboxes: avoid constants multiple declarations 2013-09-14 22:40:11 +03:00
Matthieu Guillemot
3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Anton Batenev
567121c436 Russian translation (actual version) 
Plus crowdin service reformats some strings
 2013-09-14 15:19:43 +04:00
Robin Ward
10c4dee67c Merge branch 'master' of git://github.com/awesomerobot/discourse into awesomerobot-master 
Conflicts:
	app/assets/stylesheets/mobile/topic-post.css.scss
	app/assets/stylesheets/mobile/topic.css.scss
 2013-09-14 00:39:08 -04:00
Robin Ward
b39d39dbb6 FIX: Use post_count instead of topic_reply_count in education for replies. 2013-09-14 00:32:18 -04:00
Kris Aubuchon
e1b11c62ea reintroducing the post progress indicator, fixing gutter links, reducing white space between posts 2013-09-13 23:03:29 -04:00
Neil Lalonde
09b640b782 Disable onebox of user pages 2013-09-13 17:01:28 -04:00
Neil Lalonde
f86aead49e Disable custom stylesheets on mobile for now. 2013-09-13 14:54:57 -04:00
Neil Lalonde
8de91e3789 Also put a class on html element for desktop view 2013-09-13 14:54:57 -04:00
Robin Ward
cca09e1436 Merge pull request #1433 from mguillemot/bluepill_env 
Bluepill load content of .env file
 2013-09-13 11:11:52 -07:00
Robin Ward
c365bd0070 Notify users posting sequential replies that there's a better way to do it. 2013-09-13 13:49:34 -04:00
Robin Ward
5d8cfd69f7 FIX: JSHint errors 2013-09-13 12:29:57 -04:00
Robin Ward
7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users 
who don't have avatars.
 2013-09-13 12:23:53 -04:00
Neil Lalonde
32163bc356 Show post number in share dialog when clicking post date 2013-09-13 10:35:22 -04:00