github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-24 06:33:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,673 Commits 214 Branches 500 Tags 960 MiB
0d63197e7a
Commit Graph

5673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lionel
3a1fe9701a fix fr localization 2013-10-28 13:29:26 +01:00
Anton Batenev
de3afe514a Russian translation (actual version) 2013-10-28 14:09:34 +04:00
Manoj
9650dbb97c Refactor topics controller 
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments

fix typo
 2013-10-28 11:42:07 +05:30
Sam
c0d85fa6f9 remove change to readme 2013-10-28 16:36:28 +11:00
Sam
bdbc2f590f Merge pull request #1574 from pkallberg/master 
Cloud 66 EasyDeploy
 2013-10-27 22:35:24 -07:00
Sam
95e936c299 cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider 2013-10-28 16:29:07 +11:00
Sam
370e961a90 add failing test for AMS upgrade 2013-10-28 15:55:27 +11:00
Sam
da62a10b77 work around regression in ruby head 2013-10-28 15:13:10 +11:00