Commit graph

15429 commits

Author SHA1 Message Date
Simon Cossar
35e6eb5cac Add wrap class 2015-07-20 00:42:52 -07:00
Régis Hanol
6add8fb56a Merge pull request #3617 from lukegb/patch-2
Expose poll_maximum_options to client
2015-07-20 09:21:31 +02:00
Sam
4c92f05d8d more tests 2015-07-20 17:06:00 +10:00
Sam
ecf50a741c strip classes from table instead of ignoring table 2015-07-20 17:05:24 +10:00
Sam
e93665b9f7 FEATURE: site setting to allow html tables (which may come from imports)
(allow_html_tables , disabled by default)
2015-07-20 16:56:46 +10:00
Sam
c552f846ae add index 2015-07-20 16:56:46 +10:00
Luke GB
9f31c3d235 Expose poll_maximum_options to client
At present this doesn't actually seem to be exposed to the client.

I discovered this by accident whilst trying to write my own plugin:

7b6d6b76eb/app/models/site_setting.rb (L17-L18)
2015-07-19 21:41:14 +01:00
Neil Lalonde
a23a04a1e5 Version bump to v1.4.0.beta6 2015-07-17 21:31:16 -04:00
Jeff Atwood
1c107d513d try much less aggressive pngquant setting 2015-07-17 17:24:39 -07:00
Jeff Atwood
703689fbcd Revert "revert back to using slow but lossless PNG optimization"
This reverts commit 92660a74bf.
2015-07-17 17:09:25 -07:00
Arpit Jalan
5fc7545c01 UX: include more details on Permalinks page 2015-07-17 21:39:23 +05:30
Neil Lalonde
5e38512b1b Version bump to v1.4.0.beta5 2015-07-17 11:23:12 -04:00
Jeff Atwood
1727f77c0b this was matching TVD_PH_SUBJ_ACCOUNTS_POST bad! 2015-07-17 02:41:04 -07:00
Régis Hanol
92660a74bf revert back to using slow but lossless PNG optimization 2015-07-17 11:04:14 +02:00
Guo Xiang Tan
56276138b5 Run main tests on Travis first. 2015-07-17 16:23:43 +08:00
Jeff Atwood
c09cdbc9d3 add animated edit gif to welcome message 2015-07-17 01:20:32 -07:00
Sam
24eb12778f work in progress lithium importer 2015-07-17 17:16:47 +10:00
Arpit Jalan
b0b08c932b add Vanilla (MySQL) importer 2015-07-17 08:24:53 +05:30
Sam
bbfd18aa59 wip lithuim importer 2015-07-17 12:43:45 +10:00
Sam
d7e7ae33ea FIX: IE9 and 10 were getting white screen, due to ES6 usage 2015-07-17 12:43:45 +10:00
Sam
c71098a8b3 Merge pull request #3612 from techAPJ/patch-1
FEATURE: manage Permalinks
2015-07-17 11:59:36 +10:00
Sam
14eab11cd2 Merge pull request #3613 from scossar/fix-typo-in-rtl.scss
FIX: typo in rtl.scss
2015-07-17 11:58:05 +10:00
Jeff Atwood
17e136bf76 Update INSTALL-cloud.md 2015-07-16 18:17:48 -07:00
Simon Cossar
97a9e997db Fix typo 2015-07-16 18:03:48 -07:00
Arpit Jalan
dc90c396f2 FEATURE: manage Permalinks 2015-07-17 01:26:02 +05:30
Régis Hanol
ee86ae0537 FIX: use CDN for all user avatars (take 3) 2015-07-16 19:40:09 +02:00
Neil Lalonde
e265d8af5d Merge pull request #3590 from gschlager/phpbb3-importer
Lots of improvements to the phpBB3 importer
2015-07-16 10:35:13 -04:00
Arpit Jalan
fc977771a3 Update Translations 2015-07-16 19:18:02 +05:30
Gerhard Schlager
1cb45861c5 FEATURE: Lots of improvements to the phpBB3 importer
- Extensive refactoring of the existing importer
- Configuration of import with settings.yml instead of editing code
- Supports importing from phpBB 3.0.x and 3.1.x
- Imports all attachments (not just the ones embedded with [attachment])
  from posts and private messages
- Imports all existing attachments without the need to configure allowed
  file extensions or file sizes
- Imports polls
- Imports bookmarks
- Imports sticky topics and (global) announcements as pinned topics
- Imports categories in the original order and sets the content of the
  category description topic
- Sets the creation date of category description topics to the creation
  date of the first topic in each category
- Imports additional user attributes: last seen date, registration
  IP address, website, date of birth, location
- Optionally set the user's name to its username
- Users that didn't activate their account in phpBB3 are imported as
  inactive users
- All imported, active users are automatically approved
- Users that were deactivated in phpBB3 get suspended for 200 years
  during the import
- Anonymous user can be imported as suspended users instead of the
  system user
- Forums of type "link" are not imported as categories anymore
- Internal links to posts get rewritten during the import (previously
  only links to topics got rewritten)
- Ordered lists with BBCode [list=a] (which are unsupported in
  Discourse) get imported as if they would be [list=1]
- Importing of avatars, attachments, private messages, polls and
  bookmarks can be disabled via configuration file
- Optional fixing of private messages for forums that have been upgraded
  from phpBB2 prevents the import of duplicate messages and tries to
  group related messages into topics
- Table prefix (default: phpbb) is configurable
- Most of phpBB's default smilies are mapped to Emojis and all other
  smilies get uploaded and embedded as images. Smiley mappings can be
  added or overridden in the settings.yml file.
2015-07-16 15:28:43 +02:00
Gerhard Schlager
2dd01c61b0 Improves the base importer
- Move some methods into their own classes in order to make it easier
  to reuse them outside of classes extending the base importer. For
  compatibility reasons the old methods are still in the base importer
  and delegate to the new objects. The following methods and hashes were
  extracted:
    - all the lookup maps for existing and imported data
    - all the methods used for uploads and attachments
- No need to store failed users and groups. This information wasn't
  used anyway.
- Print progress instead of category names when importing categories.
- Allow importers to override if bbcode_to_md should be used (until now
  it always used ARGV)
- Allow importers to add additional site settings that automatically get
  restored after the importer finishes.
- Show how many posts and messages are imported per minute. This should
  help detecting when the import is slowing down and needs to be
  restarted.
- Use max_image_width and max_image_height from settings instead of
  hard-coded values for uploaded images.
2015-07-16 15:28:42 +02:00
Sam
7f43653cad Merge pull request #3608 from Qasem-h/Rtl
Rtl Fix For Customize Toggles & Dashboard
2015-07-16 17:18:22 +10:00
Sam
35e1b52d54 remove 0 view filter 2015-07-16 16:57:55 +10:00
Sam
88578f74d0 another subst 2015-07-16 16:24:46 +10:00
Sam
e449bf531c more post cleanup rules 2015-07-16 16:23:14 +10:00
Sam
5db345705b allow views to be specified in import mode 2015-07-16 16:11:20 +10:00
Sam
bfd28ca9a9 ignore deleted ... too much trouble 2015-07-16 15:11:28 +10:00
Sam
16e69d16b8 add like import capabilities 2015-07-16 15:11:28 +10:00
Sam
3a60d96573 Merge pull request #3611 from riking/change-owner
FIX: Allow to change ownership on deleted users' posts
2015-07-16 08:41:28 +10:00
Kane York
61ea8c6f72 FIX: Allow to change ownership on deleted users' posts 2015-07-15 15:29:35 -07:00
Régis Hanol
c17f8d1769 keep pretty_text in sync with client code 2015-07-16 00:01:00 +02:00
Kane York
e3b778a23a fixup: support merging N languages (js) 2015-07-15 14:30:16 -07:00
Kane York
15905be788 Disable in development (js) 2015-07-15 14:25:24 -07:00
Kane York
cb395662d0 Add JsLocaleHelper tests for i18n fallback 2015-07-15 14:23:41 -07:00
Régis Hanol
80bf7bed21 this obviously doesn't work :( 2015-07-15 23:15:58 +02:00
Régis Hanol
ea16797761 FIX: user avatar in oneboxes/quotes when using CDN 2015-07-15 23:00:11 +02:00
Régis Hanol
25a1bf421e FIX: use CDN for user avatars (take 2) 2015-07-15 19:24:23 +02:00
Kane York
ff219bc65c todo: write test 2015-07-15 10:21:06 -07:00
Kane York
650eb86a74 Disable in development (server) 2015-07-15 10:17:36 -07:00
Kane York
ecfa17b5a7 FEATURE: Localization fallbacks (server-side)
The FallbackLocaleList object tells I18n::Backend::Fallbacks what order the
languages should be attempted in. Because of the translate_accelerator patch,
the SiteSetting.default_locale is *not* guaranteed to be fully loaded after the
server starts, so a call to ensure_loaded! is added after the locale is set for
the current user.

The declarations of config.i18n.fallbacks = true in the environment files were
actually garbage, because the I18n.default_locale was
SiteSetting.default_locale, so there was nothing to fall back to. *derp*
2015-07-15 10:17:36 -07:00
Kane York
728845d008 FEATURE: Localization fallbacks (client)
This patch sets I18n.defaultLocale in the Discourse.start() script block (it
was formerly always 'en') to SiteSetting.default_locale, and patches
translate() to perform fallback to defaultLocale followed by english.
Additionally, when enable_verbose_localization() is called, no fallbacks will
be performed.

It also memoizes the file loading operations in JsLocaleHelper and strips out
translations from the fallbacks that are also present in a prefered language,
to minimize file size.
2015-07-15 10:17:28 -07:00