Commit graph

19793 commits

Author SHA1 Message Date
Sam
4377bd1036 Merge pull request #688 from wojciechka/rakefile_db_dump_fix
Prevent crashes during migration in certain PostgreSQL configurations
2013-04-10 21:13:57 -07:00
Sam
5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles
auto replace rules in titles
2013-04-10 21:12:20 -07:00
Jeff Atwood
5fc38d0613 use proper blog post title for consistency 2013-04-10 15:05:22 -07:00
Jeff Atwood
f139a3b1bc add link to blog post 2013-04-10 14:59:35 -07:00
Jeff Atwood
703ead66b4 move vagrant warning down 2013-04-10 14:58:12 -07:00
Jeff Atwood
41dde3fb63 add link to blog post 2013-04-10 14:55:14 -07:00
Neil Lalonde
19a1855ea0 Give vm more memory with DISCOURSE_VM_MEM env variable 2013-04-10 16:57:34 -04:00
Neil Lalonde
c0f3c47196 Use message bus to broadcast addition and removal of categories 2013-04-10 15:53:36 -04:00
Kuba Brecka
11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde
229395729d Make title field bigger when editing a topic title 2013-04-10 14:19:34 -04:00
Neil Lalonde
669dad6cbb Merge pull request #696 from kubabrecka/update_stemmers
update the list of i18n postgre stemmers
2013-04-10 11:07:05 -07:00
Neil Lalonde
312c42ae98 Merge pull request #690 from kubabrecka/update_cs32
cs translation update
2013-04-10 11:02:26 -07:00
Neil Lalonde
28ed4defe3 Merge pull request #692 from ZogStriP/fix-text-not-updated-when-changing-notifications
FIX: Text not updated when changing notifications after reading a topic
2013-04-10 10:54:44 -07:00
Kuba Brecka
17becd0e5f update the list of i18n postgre stemmers 2013-04-10 19:45:29 +02:00
Neil Lalonde
b2f017e87b Merge pull request #691 from ZogStriP/fix-setting-min-topic-title-length-is-ignored
FIX: setting min_topic_title_length is ignored
2013-04-10 10:04:42 -07:00
Neil Lalonde
fec86c624b Merge pull request #693 from ZogStriP/keep-french-l10n-up-to-date-2013-04-10
keep French l10n up to date
2013-04-10 09:47:02 -07:00
Neil Lalonde
03047b0ab0 Category is fetched from server when loading edit category modal, because topic_count needs to be up-to-date for the delete button to show/hide in a sane way 2013-04-10 12:08:24 -04:00
Neil Lalonde
5d46478e38 Add UI to delete an empty category 2013-04-10 12:08:23 -04:00
Régis Hanol
a7bdbd863e keep French l10n up to date 2013-04-10 15:48:59 +02:00
Régis Hanol
ebbd5af8bc FIX: Text not updated when changing notifications after reading a topic 2013-04-10 15:41:06 +02:00
Kuba Brecka
1ca1b03109 cs translation update 2013-04-10 15:02:32 +02:00
Régis Hanol
d120a5d139 FIX: setting min_topic_title_length is ignored 2013-04-10 14:54:10 +02:00
Wojciech Kocjan
933732676b Allow running discourse with prefix with passenger without requiring a symlink 2013-04-10 14:23:49 +02:00
Wojciech Kocjan
52a8f00d82 Prevent crashes during migration in certain PostgreSQL configurations 2013-04-10 13:26:55 +02:00
Régis Hanol
c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam
33e3ad1603 clean up onebox application so it uses a single code path
use fragments for oneboxes
strip parent <p> if <div> is in it
clean some tests
2013-04-10 17:52:38 +10:00
Sam
ab9c55689e don't error out if no range is selected 2013-04-10 17:49:25 +10:00
Sam
c29390386f less crazy customize screen, more consistent with other screen 2013-04-10 15:55:33 +10:00
Sam
e605e52181 localization 2013-04-10 15:55:33 +10:00
Jeff Atwood
249fa42fd2 better description for title_fancy_entities 2013-04-09 21:15:48 -07:00
Sam
4c801092b2 Merge pull request #685 from mshappe/fix-pretty-text-take-3
Create and use new rspec matcher 'match_html'
2013-04-09 21:13:39 -07:00
Michael Scott Shappe
2fb673dd72 Create and use new rspec matcher 'match_html'
This introduces match_html, which converts actual and expected HTML strings into "canonical" HTML using Nokogiri with NOBLANKS and COMPACT, and then does a simple equality comparison.

This eliminates whitespace differences introduced by library changes (e.g. the libxml2 2.9.0 change).

pretty_text_spec.rb has been changed to use match_html where appropriate. and all tests pass under libxml2 2.7.6, 2.8.0 or 2.9.0
2013-04-09 22:30:10 -05:00
Sam
9b487953c4 collapse some db tests
ensure deleted topics do not show up in user stream
2013-04-10 12:50:00 +10:00
Sam
e8a6626e6a whitespace 2013-04-10 11:55:10 +10:00
Robin Ward
6198c1a35b Missed a jshint thing in the spec 2013-04-09 18:04:25 -04:00
Robin Ward
00f9e628e0 Don't apply markdown to content of [quote] -- it messes up spacing. 2013-04-09 17:32:50 -04:00
Neil Lalonde
6746415ef3 Fix colour picker size on iPad 2013-04-09 13:12:29 -04:00
Neil Lalonde
78d9b44106 Show custom colours in colour picker too 2013-04-09 12:52:22 -04:00
Robin Ward
1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2"
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
2013-04-09 12:33:32 -04:00
Robin Ward
5ba9e484f8 Merge pull request #650 from wojciechka/double_prefix_fix
Detect and remove prefix being added twice when going to pages already in history
2013-04-09 09:30:01 -07:00
Robin Ward
c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2
move i18n of UserActions to JS-side and make sentences translatable
2013-04-09 09:25:28 -07:00
Robin Ward
9f9072bd9d Merge pull request #673 from windyson2008/patch-2
Update server.zh_CN.yml
2013-04-09 09:22:59 -07:00
Robin Ward
ab8196faea Merge pull request #679 from mark-rushakoff/remove_param_to_sym
Don't call to_sym on param
2013-04-09 09:21:52 -07:00
Neil Lalonde
d0887b61c1 Use checkmark instead of X on category colour picker 2013-04-09 12:02:02 -04:00
Robin Ward
161b8f43b6 Fix content editor in smaller widths 2013-04-09 11:28:28 -04:00
Robin Ward
e783891f31 Fix emoticons: Was not upgraded to use promises 2013-04-09 10:59:27 -04:00
Robin Ward
fa27476267 Merge pull request #676 from kubabrecka/update_localized_tos
update localized TOS
2013-04-09 06:30:28 -07:00
Robin Ward
bc75663e7b Merge pull request #680 from kubabrecka/cs_update31
cs translation update
2013-04-09 06:29:19 -07:00
Robin Ward
82d360308c Merge pull request #682 from ZogStriP/keep-french-l10n-up-to-date-2013-04-09
keep French l10n up to date
2013-04-09 06:28:17 -07:00
Régis Hanol
a2967dbf6b keep French l10n up to date 2013-04-09 14:51:40 +02:00