Commit Graph

4470 Commits

Author SHA1 Message Date
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
Matthieu Guillemot c8b20277cc Bluepill load content of .env file 2013-09-13 14:24:08 +09:00
Neil Lalonde 5071d71294 Don't show custom header on mobile view 2013-09-12 18:46:35 -04:00
Jeff Atwood 731fd6a4ff improve copy on auto-blocking new users 2013-09-12 15:24:50 -07:00
Neil Lalonde 8f12212942 Remove duplicate css. Kris and I fixed the same thing. I imported variables.scss so we can use $red and $bookmarkColor 2013-09-12 18:08:12 -04:00
Neil Lalonde e3c68bc500 Merge pull request #1432 from awesomerobot/master
fixing bookmarks and blockquotes for mobile
2013-09-12 14:41:15 -07:00
Neil Lalonde 827680766e Show which domains were used in the spam_post_blocked notification 2013-09-12 17:33:30 -04:00
vagrant 4fbd011f39 fixing bookmarks and blockquotes for mobile 2013-09-12 16:00:53 -04:00
Neil Lalonde 90aaa27b98 Fix modal button spacing on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde c260ae622d Fix closing a modal on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde f0eede077d Show bookmark colours on mobile 2013-09-12 15:09:44 -04:00
Neil Lalonde 57dc8ed9f6 Add margin to auto-close message on mobile 2013-09-12 15:09:44 -04:00
Robin Ward 3fcd331d43 Add records that indicate a user's avatar has been checked 2013-09-12 14:58:20 -04:00
Sam 4599e5d732 oops did not have autospec running 2013-09-12 15:55:18 +10:00
Sam 691377b5af remove patches that have been upstreamed
clean up rails4 checks so they are consistent
2013-09-12 15:39:02 +10:00
Sam 00951e0578 remove "via sitename" from senders 2013-09-12 15:38:18 +10:00
Sam 4321c19759 upgrade flamegraph
upgrade rails 4
2013-09-12 15:38:01 +10:00
Sam fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10:00
Sam 6d5e20fe4a plugins need paths too 2013-09-12 11:29:45 +10:00
Sam aa26f9b2ad I need to figure out how to make a .try variant that does not call respond_to. 2013-09-12 11:29:44 +10:00
Neil Lalonde bded4b26fa Ask admins to fill in site_description on the dashboard, and send it to the hub 2013-09-11 16:32:49 -04:00
Neil Lalonde 4fa11f159f Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO 2013-09-11 15:33:27 -04:00
Robin Ward 06ea8140aa New job (default off) to detect whether users have uploaded custom avatars by contacting Gravatar. 2013-09-11 15:14:18 -04:00
Robin Ward fcff4e80d1 New `user_stats` table to keep track of queried information on a user.
This is information that is not usually needed when representing a user
and is in a separate table with a has one relationship to avoid querying
it all the time.
2013-09-11 14:50:26 -04:00
Robin Ward 95bfebefa4 Merge pull request #1425 from cfstras/locale-de
Updated German locale
2013-09-11 07:42:43 -07:00
Neil Lalonde fe3693cdef Merge branch 'master' of github.com:discourse/discourse 2013-09-11 10:20:27 -04:00
Sam def4f15795 Merge pull request #1427 from awesomerobot/master
Reducing margins on mobile view
2013-09-11 00:36:57 -07:00