Commit Graph

4755 Commits

Author SHA1 Message Date
Neil Lalonde 43fc772a53 Merge pull request #1514 from cfstras/youtube-https
YoutubeOnebox: FIX HTTP-specific URLs
2013-10-09 12:33:49 -07:00
Claus Strasburger 109c10c883 YoutubeOnebox: FIX HTTP-specific URLs
by replacing with protocol-agnostic URLs.
This fixes the mixed-content warning for secure instances of discourse, at least for Youtube
2013-10-09 20:43:59 +02:00
Rafael George ff4169a9ed Merge branch 'refactor-topic-invite-by-email' of github.com:cored/discourse into refactor-topic-invite-by-email 2013-10-09 13:55:40 -04:00
Rafael George 3a1e1e046b Refactor: Topic#invite_by_email
Extract Topic#email_already_existas_for? and Topic#grant_permission_to_user
Fix failing spec due to missing variable in extracted method
2013-10-09 13:55:02 -04:00
Régis Hanol c48030f1ef Merge pull request #1508 from abbat/master
Russian translation (actual version)
2013-10-09 09:44:08 -07:00
Régis Hanol 3854c2d24f Merge pull request #1510 from velesin/model_refactoring
refactors Discourse.Model
2013-10-09 09:26:15 -07:00
Wojciech Zawistowski 708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Régis Hanol 9eb0644983 Merge pull request #1511 from velesin/site_self_refactoring
removes unused context binding from Discourse.Site
2013-10-09 09:11:51 -07:00
Anton Batenev 75df60c600 Russian translation (actual version)
Fix YML numeric keys
2013-10-09 20:07:50 +04:00
Wojciech Zawistowski 41a4f15d62 removes unused context binding from Discourse.Site 2013-10-09 18:06:48 +02:00
Wojciech Zawistowski 56a519c583 refactors Discourse.Model to bind context to self plus some minor clean-ups 2013-10-09 18:00:55 +02:00
Neil Lalonde acca220380 Allow Youtube onebox with start time. All params are used in the youtube onebox now. 2013-10-09 11:40:10 -04:00
Neil Lalonde 4a0b17bb16 Pressing enter in username field of login form will submit the form 2013-10-09 11:07:42 -04:00
Anton Batenev 7d6b93b660 Russian translation (actual version)
* Migrating from crowdin to transifex translation service (free & less bugs)
 * Reformats YML as transifex service do
2013-10-09 18:30:38 +04:00
Neil Lalonde 24598c80af Improve login modal on mobile 2013-10-09 10:16:22 -04:00
Sam 939a452293 require dependency was leading to errors in dev 2013-10-09 17:22:41 +11:00
Sam 7993845bfa add current_user_provider so people can override current_user bevior cleanly, see
http://meta.discourse.org/t/amending-current-user-logic-in-discourse/10278
2013-10-09 15:11:54 +11:00
Robin Ward 8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04:00
Neil Lalonde bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Neil Lalonde 32af23884e FIX: category validation in composer was still using categoryName instead of categoryId 2013-10-08 14:41:20 -04:00
Régis Hanol 94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol 2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward 0bda906da4 Merge pull request #1494 from ScotterC/present-user-name
Presenting name for user stream description
2013-10-08 08:42:59 -07:00
Scott Carleton 256d82b916 Present Name for stream description 2013-10-08 11:40:16 -04:00
Robin Ward 50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -04:00
Robin Ward e7935d4263 Merge pull request #1501 from velesin/debounce_promise_tests
adds unit tests for Discourse.debouncePromise
2013-10-08 07:56:07 -07:00
Cyril Rohr a7b8481c8f Allow to set SMTP settings via environment variable. 2013-10-08 15:48:57 +01:00
Robin Ward 158ff76e71 Merge pull request #1469 from kewubenduben/patch-1
Minor fixes
2013-10-08 07:46:07 -07:00
Robin Ward b12fcec2db Merge pull request #1500 from velesin/qunit_helpers_self
refactors asyncTestDiscourse to bind context as self
2013-10-08 07:31:30 -07:00
Robin Ward f9517f7240 Merge pull request #1503 from ofgeek/patch-2
Update client.zh_CN.yml
2013-10-08 07:31:05 -07:00
Cyril Rohr 4f32b8a9ae Copy default production.rb file. 2013-10-08 15:20:57 +01:00
Cyril Rohr a2fa70ab5c Standardize on 'worker' for sidekiq Procfile entry (expected by buildpack). 2013-10-08 14:45:32 +01:00
Cyril Rohr 43ce16a6dc Add script to install mandatory config files from their .sample version. 2013-10-08 13:52:29 +01:00
ofGEEK b6545de423 Update client.zh_CN.yml 2013-10-08 11:26:26 +08:00
Neil Lalonde 6713db7133 Close notifications dropdown on mobile after you click something 2013-10-07 16:11:54 -04:00
Robin Ward cf4666d363 FIX: If the user asks for 0 similar topics, don't show an empty box 2013-10-07 15:14:01 -04:00
Robin Ward 744266374a FIX: Invalid i18n string appearing at bottom of topic 2013-10-07 15:01:51 -04:00
Robin Ward 6949bc6611 Make clickable area for progress much bigger on mobile 2013-10-07 14:41:17 -04:00
Robin Ward 75aaafc06e Don't show the user expansion on mobile 2013-10-07 14:32:15 -04:00
Wojciech Zawistowski 034d00b83a adds unit tests for Discourse.debouncePromise 2013-10-07 17:45:09 +02:00
Wojciech Zawistowski 7106b27860 refactors asyncTestDiscourse to bind context as self 2013-10-07 17:36:20 +02:00
Sam 094b5eccca bug fixes for user_stat extraction, decrease querying 2013-10-07 15:05:00 +11:00
Sam e18b93026a defer view creation on so updates are not performed when people navigate to topics 2013-10-07 15:04:59 +11:00
Sam 5bf26ec34e large refactor, ship a few columns from the user table into user_stats 2013-10-07 15:04:59 +11:00
Jeff Atwood 4613006ae3 minor copyedit to reduce repetition on dialog 2013-10-04 15:36:35 -07:00
Robin Ward d2a1118e67 Make date on User expansion gray 2013-10-04 17:50:56 -04:00
Robin Ward 7da01e2389 Changes to user expansion 2013-10-04 16:55:54 -04:00
Robin Ward 7eac7303cd Better unloading of Poster expansion 2013-10-04 15:35:43 -04:00
Robin Ward 89e78f5c64 User expansion loading improvements 2013-10-04 15:33:03 -04:00
Robin Ward d126259f03 Fixes #1496 - Ember 1.0 regression 2013-10-04 13:47:30 -04:00