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
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
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 c3a426930b9f9072bd9d
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
Wojciech Kocjan
3cf240ada8
Detect and remove prefix being added twice when going to pages already in history.
2013-04-09 12:12:27 +02:00
Kuba Brecka
9e796e8acf
cs translation update
2013-04-09 11:10:28 +02:00
Mark Rushakoff
56acb5fcce
Don't call to_sym on param
2013-04-08 22:55:39 -07:00
Sam
47fb99198a
path to asset is insanely slow cause it is pluralizing the word "javascript" over and over and over and over again.
2013-04-09 11:54:00 +10:00
Neil Lalonde
64eeb7f21e
jshint made me break my code. Change logic to fix usedBackgroundColors and make jshint happy
2013-04-08 19:18:24 -04:00
Neil Lalonde
93f36cdf93
Show which category colors have already been used when creating/editing a category
2013-04-08 18:33:51 -04:00
Sam
bbdf47d26d
Merge pull request #678 from ZogStriP/improve-quote-reply-selection
...
improve quote reply selection
2013-04-08 15:19:13 -07:00
Sam
1b73ab614e
Merge pull request #674 from kubabrecka/cs_update30
...
cs translation update
2013-04-08 15:17:01 -07:00
Sam
2f14ef4a68
Merge pull request #675 from kubabrecka/en_tos_typofix
...
English TOS typos
2013-04-08 15:16:02 -07:00
Régis Hanol
2424a656e8
improve quote reply selection
2013-04-08 23:44:12 +02:00
Kuba Brecka
8d927418e8
move i18n of UserActions to JS-side and make sentences translatable
2013-04-08 22:54:08 +02:00
Robin Ward
75aeb9550f
Convert a bunch of callbacks to promises
2013-04-08 16:51:03 -04:00
Kuba Brecka
57b9fe4602
update localized TOS
2013-04-08 22:35:48 +02:00
Kuba Brecka
b42570b61d
English TOS typos
2013-04-08 22:31:44 +02:00
Kuba Brecka
9ee01948c3
cs translation update
2013-04-08 22:28:10 +02:00
