Commit graph

1654 commits

Author SHA1 Message Date
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
Robin Ward
02bab415bd Convert Autocomplete to use promises 2013-04-08 14:59:00 -04:00
Robin Ward
6c983218b3 Clean up JS 2013-04-08 14:58:17 -04:00
Neil Lalonde
0f767ca227 Trim category description at 200 chars in category combobox 2013-04-08 12:18:19 -04:00
Robin Ward
4ad006ea97 FIX: non-logged in users couldn't see who liked something 2013-04-08 11:57:23 -04:00
Robin Ward
8942d9a094 Okay, THIS time the specs should pass. Geez. 2013-04-08 11:23:03 -04:00
Robin Ward
9c461aced4 Safer code - check that topic is present. 2013-04-08 11:01:55 -04:00
Robin Ward
1715aa66d9 Fixes issue with featuring topic users 2013-04-08 10:51:01 -04:00
Neil Lalonde
467d59ec5a Merge some work: topic counts in category select; fix All count on dashboard 2013-04-08 10:23:29 -04:00
Sam
91b6a7916c Merge pull request #659 from jyggen/master
Updated swedish translations.
2013-04-08 02:33:44 -07:00
Jonas Stendahl
21d3c96fca Updated swedish translations. 2013-04-08 11:03:55 +02:00
Jeff Atwood
cd5b778305 fix caret alignment on drop-down notification btn 2013-04-07 23:46:45 -07:00
Sam
73c508115a better consistency check 2013-04-08 13:02:20 +10:00
windyson2008
12a20f6547 Update server.zh_CN.yml
1.Add tag
2.Fix transtration
2013-04-08 11:22:51 +09:00
Sam
9ad320768e Merge pull request #667 from ZogStriP/dont-track-links-in-oneboxes
don't track links in oneboxes
2013-04-07 18:30:24 -07:00
Sam
11ff0ccd03 correct logic for tracking the highest seen post number so its always consistent 2013-04-08 11:12:52 +10:00
Sam
fd31f946ee correct count 0 on user filters 2013-04-08 10:42:18 +10:00
Régis Hanol
d080ae4d2d don't track links in oneboxes 2013-04-08 02:24:12 +02:00
Sam
3d3b589b4d for now, run seed fu automatically after migrate ... still think there should be a cleaner way 2013-04-08 09:56:42 +10:00
Sam
0c6cb2805a gem updates, stop sourcing some stuff from github
uglifier v2
2013-04-08 09:42:39 +10:00
Sam
3e9b782f3e save it ... 2013-04-08 08:21:54 +10:00
Sam
3ba0bf6d5d Merge pull request #651 from ZogStriP/change-title-background-when-composer-requirements-are-not-met
Change Title background to red when requirements are not met
2013-04-07 15:11:10 -07:00
Sam
9a1619727d Merge pull request #670 from ZogStriP/add-some-tests-for-uploads
added some tests for uploads
2013-04-07 15:05:35 -07:00
Robin Ward
dcebd2eaa3 Merge pull request #671 from ZogStriP/extract-hard-coded-strings
extract hard-coded strings
2013-04-07 10:23:52 -07:00
Régis Hanol
41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00