Commit graph

13388 commits

Author SHA1 Message Date
Robin Ward
0b0cee4e07 Merge pull request #2969 from cpradio/pr-add-category-to-group-posts
FEATURE: Add category to Group Post Listing
2014-11-17 16:02:15 -05:00
cpradio
cca78f1031 Remove n+1 query on Categories 2014-11-17 15:43:22 -05:00
Robin Ward
72cd2f284b FIX: Try a different way of removing use strict from Ember 1.7.1 2014-11-17 15:31:30 -05:00
Robin Ward
7b7567f8e6 FIX: Remove use strict from ember build to get around iOS bugs 2014-11-17 14:42:21 -05:00
Régis Hanol
d702c31520 Merge pull request #2976 from davidgnavas/patch-1
little typo
2014-11-17 19:29:04 +01:00
David García-Navas López de Cuéllar
fd0ba997d0 little typo 2014-11-17 19:01:08 +01:00
Robin Ward
5e62461f5a Merge pull request #2975 from techAPJ/patch-3
Update Translations
2014-11-17 12:34:40 -05:00
Robin Ward
cc097a3baa SECURITY: Update Rails to 4.1.8 2014-11-17 12:21:00 -05:00
Régis Hanol
15a5d06495 use proper case & remove unused view 2014-11-17 18:17:24 +01:00
Arpit Jalan
dbd5823881 Update Translations 2014-11-17 21:35:06 +05:30
Régis Hanol
216a5a87cb FIX: do not display EPOCH 2014-11-17 16:32:14 +01:00
Régis Hanol
7bb9a839e5 fix the build (again) 2014-11-17 16:06:43 +01:00
Régis Hanol
dd9c475ea0 FIX: changing category within edit grace period as TL3 pops up an error 2014-11-17 15:57:45 +01:00
Régis Hanol
a06bf0b7be fix the build 2014-11-17 15:47:07 +01:00
Régis Hanol
5edcb77f26 Merge pull request #2972 from intelliot/patch-1
fix minor typo
2014-11-17 15:06:07 +01:00
Régis Hanol
dbb4491bc3 Merge pull request #2973 from lidel/openstreetmap-support
UX: whitelist OpenStreetMap iframes
2014-11-17 15:04:58 +01:00
Régis Hanol
c5f9dd4ef3 FEATURE: only limit new registrations from that IP if all the users from that IP are TL1 or TL0 2014-11-17 15:02:10 +01:00
Régis Hanol
fae19aa56c FEATURE: improve admin IP lookup dialog (add username/trust level/read time/topics entered) 2014-11-17 14:51:28 +01:00
Marcin Rataj
9dccd975d9 UX: whitelist OpenStreetMap iframes 2014-11-17 14:30:25 +01:00
Régis Hanol
7641d88224 FEATURE: new 'maximum new user accounts per registration IP' site setting 2014-11-17 12:04:29 +01:00
Jeff Atwood
78f6cea16c bump up header icon size a bit 2014-11-17 02:21:30 -08:00
Jeff Atwood
e3ff168e42 specify max-width 100% on digest email logos 2014-11-17 02:10:33 -08:00
Jeff Atwood
750189818e Omit Needless Words 2014-11-16 23:49:16 -08:00
Elliot Lee
3e4beeee32 fix minor typo 2014-11-16 23:17:15 -08:00
Sam
8881e56df5 PERF: don't ever use inject on AR relations
inject will deteriorate to a method missing that
invokes arel and a world of uneeded work
2014-11-17 18:03:11 +11:00
Sam
85e5e912b2 be explicit about log level 2014-11-17 18:03:11 +11:00
Sam
6f7a89dcaa PERF: use preloader trick to load topic categories 2014-11-17 18:03:11 +11:00
Jeff Atwood
c059352484 Merge pull request #2971 from cpradio/pr-fix-allowed-category-ids-for-group-posts
FIX: Change is_staff to is_admin for group posts to match other places
2014-11-16 18:51:31 -08:00
cpradio
bf7be0c130 FIX: Change is_staff to is_admin to match other places where guardian.allowed_category_ids is used
https://meta.discourse.org/t/security-permissions-and-messages-displayed-on-group-url/22169/17
2014-11-16 20:31:16 -05:00
Sam
35d6f29ad3 update rails master 2014-11-17 11:18:48 +11:00
Jeff Atwood
034942ac5f let's go with original iPhone dimensions 2014-11-14 17:33:42 -08:00
Jeff Atwood
5b737830af improved email scale img 2014-11-14 17:28:41 -08:00
cpradio
ce78cb1ee4 FEATURE: Add category to Group Post Listing 2014-11-14 19:30:05 -05:00
Jeff Atwood
befe0dce89 Merge pull request #2968 from cpradio/pr-keyboard-create-topic-clean-composer
FIX: Do not recall prior DRAFT in a given category when using the Create...
2014-11-14 16:30:02 -08:00
Jeff Atwood
855305b0f6 only auto scale email img if both dims large 2014-11-14 16:23:52 -08:00
cpradio
c2bbbb38f0 FIX: Do not recall prior DRAFT in a given category when using the Create Topic keyboard shortcut 2014-11-14 18:12:42 -05:00
Jeff Atwood
11ae3caeff I hated that period 2014-11-14 14:16:41 -08:00
Neil Lalonde
22fa46b1f2 just say Delete 2014-11-14 16:29:53 -05:00
Neil Lalonde
ebcf21585c FEATURE: add a button for staff to delete a user on their profile page 2014-11-14 15:25:33 -05:00
Robin Ward
ac245ede43 UX: Fixes for group view 2014-11-14 14:28:46 -05:00
Robin Ward
9cd3708b63 Instead of using a "discoveryLoading" action, return true so it can
bubble up itself.
2014-11-14 13:33:55 -05:00
Robin Ward
1d1978086c FIX: Improve use of loading spinners on discovery routes 2014-11-14 12:28:20 -05:00
Robin Ward
3829add90b Merge pull request #2963 from cpradio/pr-pin-unpin-topic-kb-shortcut
FEATURE: Added Pin/Unpin Keyboard Shortcut
2014-11-14 11:14:35 -05:00
Neil Lalonde
90a28f0e35 Merge pull request #2966 from rumpelsepp/mybb_import
Improve Mybb import script
2014-11-14 11:12:34 -05:00
Robin Ward
cb25d0c0fb Tweak HTML to include active class on the li on the site settings
route
2014-11-14 11:10:55 -05:00
Neil Lalonde
c74225b5a6 Merge pull request #2964 from lirent/master
New "sq" language files for Discourse
2014-11-14 11:07:24 -05:00
Robin Ward
54c4d200a6 Upgrade to latest onebox. 2014-11-14 11:01:19 -05:00
Stefan Tatschner
3fdda8c2b7 Retrieve first_post_id manually
I had imported a phpbb forum to mybb previously. The importer script
messed up the firstpost ids. In this case most topics cannot be imported
to discourse as the script is not able to determine the topic post.

In case you are infected of this problem just uncomment this mysql
query. It will retrieve the first_post_id manually but it will slow down
the import.
2014-11-14 14:52:16 +01:00
Stefan Tatschner
2ffd3d29d7 Order posts by dateline
The post_ids in my mybb installation did not be in the right order. Post
with ID 2 was posted after post 5. I think it has something to do with a
previous import from phpbb to mybb.
2014-11-14 14:30:16 +01:00
Stefan Tatschner
54d450156f Remove mybb video tags
mybb embedds videos like this:

[video=provider]http://link-to-video.com[/video]

Let's remove these video tags as discourse does this automatically.
2014-11-14 14:26:13 +01:00