Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,231 Commits 181 Branches 498 Tags 917 MiB
Commit Graph

5231 Commits

Author SHA1 Message Date
Régis Hanol 9a2e3245b8 Merge pull request #1591 from awesomerobot/master 
fixing pre/sub/sup/code/kbd formatting, post selection buttons
 2013-10-30 06:20:59 -07:00
Kris Aubuchon 7900fa0184 fixing pre/sub/sup/code/kbd formatting 2013-10-30 09:11:05 -04:00
Sam ab6efe8323 I tire of sample files, make number of workers configurable 2013-10-30 16:34:25 +11:00
Sam ef2b8cbe5d configurable worker process count for unicorn 2013-10-30 16:33:08 +11:00
Sam a84997ebc7 rails4 magic sauce 2013-10-30 16:18:18 +11:00
Kris Aubuchon ef954f46ba fixing blockquote that I just broke 2013-10-29 22:33:09 -04:00
Kris Aubuchon be27e1dfee fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent 2013-10-29 22:00:18 -04:00
Sam 4fa32c4dc0 Merge pull request #1590 from awesomerobot/master 
fixing the category creation/edit modal alignment
 2013-10-29 18:40:35 -07:00
Kris Aubuchon 0337c293c1 fixing the category creation/edit modal alignment 2013-10-29 21:01:41 -04:00
Sam 36352e437f Merge pull request #1589 from awesomerobot/master 
Some underlying topic title clean-up, fixed private message user list alignment
 2013-10-29 17:49:28 -07:00
Kris Aubuchon 60d9b4d808 fixing private message users, post title alignment 2013-10-29 20:47:37 -04:00
Sam 34be27f425 table_exists should be called aggresively while it is false or nil, to avoid bootstrapping issues 
don't test 1.9.3 in travis, it blows up randomly due to incorrect implementation of weak refs in 1.9.3
 2013-10-30 11:02:10 +11:00
Kris Aubuchon 3043efcb0a cleaning up the topic-title alignment a bit 2013-10-29 17:15:56 -04:00
Robin Ward bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Régis Hanol caeb91a55f Merge pull request #1588 from GManzato/fix_fr_translation 
Update french locale
 2013-10-29 13:55:25 -07:00
Gilles Manzato b3e65c937b Update french locale 2013-10-29 21:14:48 +01:00
Robin Ward 49abdbaaf7 Merge pull request #1587 from velesin/logo_tests 
integration tests for the logo part of header
 2013-10-29 12:39:02 -07:00
Robin Ward 6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Robin Ward be0d5bd1f0 Let's try the category on the left side of the title 2013-10-29 13:12:12 -04:00
Robin Ward 5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Wojciech Zawistowski 97b907e309 integration tests for the logo part of header 2013-10-29 17:33:53 +01:00
Neil Lalonde c9c7dc2002 A better script for bumping the version 2013-10-29 12:30:29 -04:00
Robin Ward f7d6ab579c Merge pull request #1571 from novemberkilo/master 
Refactor User#update_last_seen! and User#update_tracked_topics
 2013-10-29 08:28:08 -07:00
Robin Ward 84d531cff7 Merge pull request #1583 from velesin/header_test_fix 
fixes wrong placement of expect in header integration test
 2013-10-29 08:04:19 -07:00
Robin Ward 5ae2681293 Merge pull request #1584 from velesin/view_topic_test_fix 
fixes wrong placement of expect in View Topic integration test
 2013-10-29 08:03:55 -07:00
Robin Ward d0eecfbc53 Merge pull request #1585 from raul/prevent-clickjacking 
Require `X-Frame-Options: SAMEORIGIN` for clickjack prevention
 2013-10-29 08:02:53 -07:00
Neil Lalonde 12ef8124cf Version bump to v0.9.7.2 2013-10-29 10:44:21 -04:00
Sam 27ae35d62f Merge pull request #1586 from awesomerobot/master 
making post-info text brighter, refining category nav dropdown
 2013-10-28 22:59:17 -07:00
Kris Aubuchon 4c8944626a making post-info text brighter, making category nav dropdown text smaller and bold 2013-10-29 00:37:18 -04:00
Raul Murciano 4f9aa6a92a Declare rack-protection dependency explicitely 2013-10-28 17:00:31 -07:00
Sam 5369780556 Merge pull request #1582 from awesomerobot/master 
continuing default theme simplification/fixes
 2013-10-28 16:51:09 -07:00
Raul Murciano bd5fe86c87 require `X-Frame-Options: SAMEORIGIN` for clickjack prevention 2013-10-28 15:14:08 -07:00
Kris Aubuchon 0d0a2cb947 category nav style 2013-10-28 17:37:31 -04:00
Kris Aubuchon 5d19e66470 merging with the new category nav feature 
Merge remote-tracking branch 'upstream/master'
 2013-10-28 17:08:00 -04:00
Neil Lalonde e52f6e0f6d FIX: weird scroll position on visiting a topic page for the first time (chrome OS X, maybe mobile safari too) 2013-10-28 16:17:06 -04:00
Neil Lalonde 8ea1a1069e Use the debounce parameter instead of hard-coding 100 2013-10-28 16:17:06 -04:00
Robin Ward 8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Wojciech Zawistowski 37e56249be fixes wrong placement of expect in View Topic integration test 2013-10-28 19:15:40 +01:00
Wojciech Zawistowski 76602f6353 fixes wrong placement of expect in header integration test 2013-10-28 19:01:36 +01:00
Kris Aubuchon c016a081f1 further simplification over all, changes include: flatter button style, styling admin table, topic-list style 2013-10-28 13:46:59 -04:00
Robin Ward 70ce07ae49 Oops JSHint again :( 
)
 2013-10-28 13:00:34 -04:00
Robin Ward 26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks 
are enabled.
 2013-10-28 12:44:10 -04:00
Kris Aubuchon cafc1a088d catching up with the master 
Merge remote-tracking branch 'upstream/master'
 2013-10-28 12:26:12 -04:00
Kris Aubuchon 1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward 098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward 1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Robin Ward 9ede8ac54a Merge pull request #1559 from railsaholic/topics_controller_refactoring 
Refactor topics controller and model
 2013-10-28 07:28:46 -07:00
Robin Ward 9dfdc31527 Merge pull request #1576 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-28 07:27:31 -07:00
Robin Ward 5134f54c40 Merge pull request #1579 from abbat/master 
Russian translation (actual version)
 2013-10-28 07:27:16 -07:00
Régis Hanol c45adfda9c Merge pull request #1580 from llindemann/master 
fix fr localization
 2013-10-28 06:26:40 -07:00