Commit Graph

13487 Commits

Author SHA1 Message Date
Régis Hanol 3a40875e0b Merge pull request #3247 from jmay/group-manager-invites
group manager can issue invitations from restricted topics
2015-03-16 09:53:04 +01:00
Régis Hanol c5de75d25d Merge pull request #3122 from fantasticfears/share-link
FEATURE: unbind font awesome icon in share button
2015-03-16 09:51:20 +01:00
Régis Hanol f84503315e Merge pull request #3275 from dandv/patch-3
Add support for MyBB table prefix
2015-03-16 09:46:36 +01:00
Régis Hanol 35c94e8416 Merge pull request #3273 from Elberet/smf-importer
Fix gem load order for SFM2 importer
2015-03-16 09:46:18 +01:00
Régis Hanol 7e72472458 Merge pull request #3274 from dandv/patch-2
Fix broken mysql2 load order in mybb import script
2015-03-16 09:45:52 +01:00
Erick Guan ae62c1361e extends share links
- change `iconClass` to `faIcon`
- add `htmlIcon` to allow custom HTML
- add reddit, linkedin, tumblr
2015-03-16 16:44:50 +08:00
Régis Hanol 886e325c98 Merge pull request #3272 from riking/featured-css
FEATURE: Style 'Feature Topic' dialog
2015-03-16 09:44:46 +01:00
Sam 59a2f622c6 FIX: pause processing background messages while saving a post 2015-03-16 18:27:18 +11:00
Sam 8b4469a3f0 improve tests, ensure stream grows if all posts are loaded on commit 2015-03-16 17:40:49 +11:00
Sam 1d021d7019 commit post not working properly when stage post was not called
caused issues editing posts that were committed by the composer
2015-03-16 17:14:01 +11:00
riking 98c31f399a FEATURE: Style 'Feature Topic' dialog 2015-03-15 20:42:14 -07:00
Jeff Atwood 705e7105c8 safer default all time post edit limit
we have wiki for this now anyway
2015-03-15 03:03:24 -07:00
Jeff Atwood 876d8a5174 de-emphasize categories on mobile a bit 2015-03-15 02:23:18 -07:00
Dan Dascalescu 9cd59d382d Add support for MyBB table prefix 2015-03-14 22:31:08 -07:00
Dan Dascalescu b8d855227d Fix broken mysql2 load order in mybb import script 2015-03-14 21:29:17 -07:00
Jens Maier 1cc7db2370 Fix gem load order for SFM2 importer 2015-03-15 01:57:46 +01:00
Régis Hanol 399418e1ff FIX: modal backup wasn't working 2015-03-14 12:46:46 +01:00
Régis Hanol 4787e73954 FIX: toggle topic status was inverted 2015-03-14 02:45:33 +01:00
Régis Hanol 424a3b042a FEATURE: unified UI for pinning/banner topics
REFACTOR: ES6ified all the modals
2015-03-14 01:18:05 +01:00
Régis Hanol 7c1540e5ab Merge pull request #3271 from gschlager/importers
Adds a few enhancements to the base importer
2015-03-13 22:20:32 +01:00
Gerhard Schlager 53591ade00 Adds a few enhancements to the base importer
- Allows importing globally pinned topics
- Doesn't restore the original value of a SiteSetting anymore if an importer changed its value
- Allows all file extensions during the import
- Adds the ability to import bookmarks
2015-03-13 21:24:11 +01:00
Robin Ward 77f9d1e223 Use pretender's passthrough for dynamically loaded scripts 2015-03-13 12:14:22 -04:00
Sam f359cdeddc remove hacky protocol code, not needed 2015-03-13 20:50:38 +11:00
Sam 4301ce6613 another try at a fix 2015-03-13 20:05:24 +11:00
Sam a09d471514 Correct CDN url creation for "//" rooted CDNs 2015-03-13 19:31:33 +11:00
Sam 08abb85682 oops 2015-03-13 18:50:34 +11:00
Sam f6d56fef9e correct behavior 2015-03-13 18:33:47 +11:00
Sam 01fcc7503a big hacks to get tests to pass 2015-03-13 17:45:55 +11:00
Sam 20ab1f97e4 REGRESSION: not caching async scripts, remove cache buster 2015-03-13 16:55:27 +11:00
Sam 6262ff457d hmmm 2015-03-13 16:34:57 +11:00
Sam 1da2b466ba jshint ignore 2015-03-13 16:28:31 +11:00
Sam a82530012a FEATURE: Allow selection of highlight js languages
PERF: stop loading highlight js on load

To get latest highlight js run bin/rake highlightjs:update
2015-03-13 16:18:59 +11:00
Neil Lalonde 1e339ad527 FIX: handle missing post body in json in Ning importer 2015-03-12 18:46:22 -04:00
Neil Lalonde 865d6a2d0d Merge pull request #3270 from gschlager/importers
FIX: Importers should create duplicate categories if the parent category is different
2015-03-12 18:41:10 -04:00
Neil Lalonde 8c8563066a Version bump to v1.3.0.beta3 2015-03-12 17:19:28 -04:00
Gerhard Schlager b5426763e4 FIX: Importers should allow categories with existing name if the parent category is different
This changes the content of `@categories_lookup` from `Category` objects
to IDs since the category names aren't needed anymore. The lookup
method has been renamed too.
2015-03-12 21:15:02 +01:00
Robin Ward 893c1aa067 FIX: Quoting an avatar when `default_avatars` was set was broken. 2015-03-12 15:51:28 -04:00
Robin Ward 091af27a31 FIX: Reply as new topic should select the correct category 2015-03-12 14:41:58 -04:00
Robin Ward 3ecb58980f FIX: Allow `loadScript` to use script tags if the JS library require it. 2015-03-12 13:09:17 -04:00
Robin Ward 69851bc6cf Deprecates global use of `Discourse.MessageBus`
We can use DI for this, which makes it easier for plugins to subscribe
to the message bus.
2015-03-12 12:27:30 -04:00
Régis Hanol 9395bbbbea add test for fix in 9061c26e52 2015-03-12 16:20:14 +01:00
Régis Hanol 9061c26e52 FIX: code block hoisting bug 2015-03-12 11:17:00 +01:00
Sam 12d59d13a7 stop randomly failing here 2015-03-12 13:44:13 +11:00
Sam c14d17b5f3 FIX: do not include jquery.widget twice 2015-03-12 13:35:51 +11:00
Sam c51dc9af54 update ace editor to latest, fix regression where syntax highlighting was missing 2015-03-12 12:20:50 +11:00
Sam b1c18367e4 REGRESSION: not navigating to topic when replying (and not on topic) 2015-03-12 11:26:25 +11:00
Sam fb41816003 smarter clear cache to help tests 2015-03-12 10:47:32 +11:00
Sam c4c5c10ea0 FEATURE: stop pinning child categories on to parent 2015-03-12 10:42:26 +11:00
Jeff Atwood f3b5a4c888 better validation / desc for embeddable_host 2015-03-11 15:31:27 -07:00
Neil Lalonde 2585962552 fix spec that can fail when comparing timestamps. I only care that it isn't null. 2015-03-11 16:51:29 -04:00