Commit graph

11274 commits

Author SHA1 Message Date
Arpit Jalan
648e7b90f4 Update Translations 2014-10-09 01:37:59 +05:30
Robin Ward
0c739bb5b6 Merge pull request #2860 from techAPJ/patch-2
include category in List-Id instead of topic
2014-10-08 15:28:41 -04:00
Robin Ward
f9a8f6d6ce FEATURE: Support for a required setting on user fields. 2014-10-08 15:10:19 -04:00
Arpit Jalan
c53f635b2c include category in List-Id instead of topic 2014-10-09 00:34:27 +05:30
Régis Hanol
9f2be41710 this method isn't private
cc @akshaymohite
2014-10-08 20:11:28 +02:00
Robin Ward
d627b40234 Merge branch 'awesomerobot-master' 2014-10-08 13:48:35 -04:00
Robin Ward
b2d478a6fc Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master
Conflicts:
	app/assets/javascripts/discourse/templates/header.hbs
2014-10-08 13:48:26 -04:00
Robin Ward
a059da5d39 Merge pull request #2859 from techAPJ/patch-1
FIX: handle multiple paragraphs in email reply when parsing html
2014-10-08 13:44:24 -04:00
Robin Ward
32441ebcac FIX: Don't escape HTML content on category descriptions 2014-10-08 13:04:22 -04:00
Robin Ward
a98b8251a6 FIX: Private messages were getting the has-category style 2014-10-08 12:59:00 -04:00
Robin Ward
1f26a79899 FIX: Category latest pages were not preloading properly, causing weird
refreshes when clicking the home logo.
2014-10-08 12:45:18 -04:00
Kris Aubuchon
75cf1a1953 adding animation to extra-info title, and mild restructure 2014-10-08 12:20:44 -04:00
Neil Lalonde
8a88e71b3c FEATURE: permalinks lookup table can redirect to any arbitrary url 2014-10-08 11:51:24 -04:00
Régis Hanol
dcd4956ea4 remove console.log 2014-10-08 17:37:44 +02:00
Robin Ward
89fdc87402 Add back CSS classes to sortable headings. 2014-10-08 10:50:49 -04:00
Arpit Jalan
b457005b07 FIX: handle multiple paragraphs in email reply when parsing html 2014-10-08 19:45:46 +05:30
Sam
ba51e60644 Merge pull request #2857 from iamntz/patch-1
Added transliteration for extra diacritics
2014-10-08 22:40:11 +11:00
Ionut Staicu
ca5095d3e1 Added transliteration for extra diacritics 2014-10-08 09:17:04 +03:00
Sam
b9a9fb54da FIX: streaming incorrect events into all tab 2014-10-08 13:35:07 +11:00
Sam
67429b29a5 FIX: after visiting "top" unread/new tip rendered in large font 2014-10-08 13:11:26 +11:00
Sam
7ef2f48660 FIX: not showing any search results when scoped on user 2014-10-08 13:03:18 +11:00
Sam
b47c1defe0 FIX: add missing transliteration rules 2014-10-08 12:27:51 +11:00
Sam
168c690427 FIX: handle paste events for auto completed fields 2014-10-08 11:59:46 +11:00
Sam
0e7be81e60 FIX: badge granted titles were not being revoked when badge was revoked 2014-10-08 10:26:18 +11:00
Neil Lalonde
2737575b9c remove debug puts 2014-10-07 17:23:50 -04:00
Robin Ward
9bb0760a88 FIX: Autoplaying videos, updates onebox gem. 2014-10-07 17:05:15 -04:00
Neil Lalonde
cea2fe5ee9 FEATURE: import attachments in phpbb3 importer 2014-10-07 16:47:41 -04:00
Robin Ward
2fbfc9dffa FIX: Editing a topic's title should be rate limited too. 2014-10-07 16:46:01 -04:00
Robin Ward
11b52d1334 More deprecations to allow us to work on future versions of Ember 2014-10-07 16:04:19 -04:00
Neil Lalonde
0ab9a0867a Merge branch 'master' of github.com:discourse/discourse 2014-10-07 15:53:11 -04:00
Neil Lalonde
a30e70e8f1 FEATURE: trust level 3: likes received must be on min_likes_received/3 different days, and be from min_likes_received/4 different users 2014-10-07 15:52:54 -04:00
Robin Ward
e20c82436d FIX: Clicking "Latest" while ordering by a column should reset the
order.
2014-10-07 15:19:17 -04:00
Robin Ward
bb192dd0a3 UX: Remove sortable column from "Topic" and "Users" column. 2014-10-07 14:45:36 -04:00
Jeff Atwood
056438a7f4 security updates, firewall note 2014-10-07 11:44:51 -07:00
Robin Ward
1c57a60822 Also import Q+A comments 2014-10-07 14:32:50 -04:00
Robin Ward
1252e7324f Added easy impersonate route while in development mode 2014-10-07 12:25:50 -04:00
Jeff Atwood
305830eb44 Merge pull request #2856 from awesomerobot/master
changes: topic title editor layout, badge alignment in scrolled header
2014-10-07 08:51:24 -07:00
Kris Aubuchon
f4f6236902 changes: topic title editor layout, badge alignment in scrolled header 2014-10-07 11:41:04 -04:00
Régis Hanol
c46b9c0ac3 FIX: allow admins to search users by email 2014-10-07 12:05:38 +02:00
Jeff Atwood
e8563c7d57 tweaks to make flagging page better on mobile 2014-10-07 01:29:44 -07:00
Jeff Atwood
1146ad3a63 use proper trash watermark 2014-10-07 00:24:24 -07:00
Jeff Atwood
03d440095f clean up /about page styles on mobile 2014-10-07 00:18:54 -07:00
Jeff Atwood
a0d78290f2 incorrect fix for avatar height in topic map 2014-10-07 00:03:39 -07:00
Sam
a7618ec4f6 FIX: select + replies could not be selected 2014-10-07 16:53:19 +11:00
Sam
620c3b3dcd UX: improve select2 category picker styling 2014-10-07 16:28:11 +11:00
Sam
0378dca66f FIX: dismissed banner topic returned after saving user profile 2014-10-07 16:11:19 +11:00
Sam
836bc0f935 FIX: incorrect edit notification in user stream
FIX: missing edit notifications when post edited by multiple users
2014-10-07 15:57:48 +11:00
Sam
dde8ae7e96 FIX: analytics universal not sending correct location 2014-10-07 12:23:04 +11:00
Sam
4e2f1811ca a bit hackish, override fa-certificate for default icon (it is set by pg in the column default) 2014-10-07 12:01:06 +11:00
Sam
dba1616762 FIX: blank page on user page in rare cases 2014-10-07 11:43:17 +11:00