codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 19:08:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5646 commits 7 branches 179 tags 87 MiB
Commit graph

3149 commits

Author SHA1 Message Date
Sam
2db3cfb16b annotate models 2013-12-05 17:40:35 +11:00
Régis Hanol
50bc23c2be Merge pull request #1718 from awesomerobot/master 
fixing the user column on the topic-list page
 2013-12-04 12:52:05 -08:00
Robin Ward
2a809d7855 Migrate over slackRatio to vendored helper 2013-12-04 13:26:00 -05:00
Robin Ward
3a2ae97668 Vendor the CloakedView stuff 2013-12-04 13:23:20 -05:00
Neil Lalonde
3a6ba907d9 FIX: enter key in login form works again 2013-12-04 11:45:07 -05:00
Robin Ward
0ece195723 Blacklist <center> 2013-12-04 11:43:20 -05:00
Kris Aubuchon
2d928a0537 local merge 
Merge remote-tracking branch 'upstream/master'
 2013-12-04 10:39:39 -05:00
Kris Aubuchon
15516f34c7 fixing the user column on the topic-list page 2013-12-04 10:38:01 -05:00
Neil Lalonde
abed146cc7 FIX: Category description topics shouldn't auto-close 2013-12-04 10:31:25 -05:00
Robin Ward
df7b24b14a Merge pull request #1716 from ok-harry/master 
set_locale of application_controller.rb must be called earlier
 2013-12-04 07:09:14 -08:00
Vikhyat Korrapati
243acb4f05 Auto close topic on form submit rather than button click. 2013-12-04 18:17:28 +05:30
Harry Seo
2d9876a6ac FIX: set_locale filter must be executed before check_xhr filter because check_xhr filter renders html in some cases 2013-12-04 20:49:54 +09:00
Neil Lalonde
b622edad7d FIX: edit category modal is too short 2013-12-03 17:24:25 -05:00
Neil Lalonde
3cfd2dd667 FIX: quote text twice overwrites the first quote 2013-12-03 16:39:35 -05:00
Robin Ward
cb9fb2acfa FIX: A post via the message bus wasn't updating highest_post_number properly. 2013-12-03 16:25:51 -05:00
Neil Lalonde
915861a646 FIX: suspended users still appear suspended after their suspension expires 2013-12-03 15:53:30 -05:00
Robin Ward
c4394688de FIX: CSRF token retrieval bug 2013-12-03 15:30:33 -05:00
Robin Ward
50fe117d7c FIX: Load order bug 2013-12-03 15:11:33 -05:00
Robin Ward
274743b877 Refactor: Move initialization code into separate initializers that use the API we 
developed for plugins.
 2013-12-03 14:22:32 -05:00
Robin Ward
de78ee302a - Extract Browser capabilities from Discourse namespace into a Singleton. 
- Change Scrolling slack based on Android / Touch / Desktop
 2013-12-03 13:03:19 -05:00
Robin Ward
8b4c030c16 Small email fixes 2013-12-03 10:11:04 -05:00
Sam
bf2663346a Merge pull request #1712 from awesomerobot/master 
making the category dropdown taller
 2013-12-02 21:34:54 -08:00
Sam
e16621077a semicolon for the greater good 2013-12-03 16:09:57 +11:00
Kris Aubuchon
d6ddc70fea making the category dropdown taller 2013-12-02 21:09:16 -05:00
Robin Ward
bdac13b636 FIX: If there are no featured topics in a category, don't fail. 2013-12-02 17:44:57 -05:00
Neil Lalonde
7bbb32bac2 Fix javascript_include_tag for browser-update so it includes MD5. Needed to add .js extension for some reason. 2013-12-02 15:57:23 -05:00
Robin Ward
0c259af374 FIX: Don't give weird progress numbers when there are deleted posts. 2013-12-02 15:09:25 -05:00
Robin Ward
b37fae50e3 OOPS: Commented out the wrong line 2013-12-02 14:28:01 -05:00
Robin Ward
48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
Neil Lalonde
79f1055164 Fix autoclose form in category modal 2013-12-02 11:03:35 -05:00
Régis Hanol
3842097698 add lightbox extra-zoom on click 2013-12-02 11:03:47 +01:00
Régis Hanol
bfd2fd8607 update magnific popup to latest (v. 0.9.9) 2013-12-02 10:38:15 +01:00
Sam
ea835b78dc Merge pull request #1710 from benjaminbrent/master 
Fix email_preview AJAX call to use Discourse.ajax
 2013-12-01 23:51:09 -08:00
MK
2d4e62dd64 Fixed broken links in Digest email 
Based on @eviltrout's fix from 7a60eacca9.
 2013-12-02 01:11:55 -05:00
Sam
7f4697a200 bug: if status changes always attempt to update the feature topics for the category right away 2013-12-02 16:32:24 +11:00
Sam
a2d5a7dbd8 auto close is messed up in category edit, remove for now 2013-12-02 16:13:32 +11:00
Sam
8d859a9f68 break cache of fonts 2013-12-02 08:19:34 +11:00
Benjamin Brent
761da7d380 Fix email_preview AJAX call to use Discourse.ajax 2013-12-01 13:30:41 +11:00
Sam
f5d905c215 Merge pull request #1707 from chancancode/as_json_fix 
The Rails JSON encoder API requires `as_json` to take an optional arg
 2013-11-30 03:40:21 -08:00
Godfrey Chan
6bbea9de0b The Rails JSON encoder API requires as_json to take an optional arg 2013-11-29 21:43:44 -08:00
Kris Aubuchon
a9060fac70 added KBD style back 2013-11-29 22:44:00 -05:00
Robin Ward
7a60eacca9 FIX: Broken unsubscribe link in HTML email 2013-11-29 17:13:16 -05:00
Robin Ward
769223014c FIX: Allow link redirects inside oneboxed posts 2013-11-29 14:29:49 -05:00
Régis Hanol
298b54c0e7 add download link in lightbox 2013-11-29 20:03:39 +01:00
Robin Ward
008151e90d FIX: Too much white space between posts on mobile 2013-11-29 13:06:52 -05:00
Robin Ward
781a8876d3 Show post count in digest emails. Sort by score 2013-11-29 13:00:25 -05:00
Robin Ward
3da2285ef1 FIX: Missing styles in HTML digest emails 2013-11-29 12:21:36 -05:00
Régis Hanol
9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00
Robin Ward
8c8645f158 FIX: Code and Emoticon formatting in HTML emails. 2013-11-28 17:21:14 -05:00
Neil Lalonde
4ec0543362 FIX: emails with embedded posts should always use absolute URLs 2013-11-28 15:57:21 -05:00
Neil Lalonde
a13c7c26f9 Put that autoclose regexp back. Firefox, take it easy. 2013-11-28 14:49:11 -05:00
Robin Ward
5fd87ae45f Merge pull request #1701 from velesin/sitemap_refactoring 
refactors site map
 2013-11-28 11:21:36 -08:00
Robin Ward
f1bce7cc42 Uncomment the loading logic :) 2013-11-28 14:18:32 -05:00
Robin Ward
924a88b5c0 Different Slack ratio on Touch devices, show loading indicator 2013-11-28 14:18:13 -05:00
Robin Ward
488e9ca9dd On mobile, keep topic map collapsed by default. Also, when collapsed don't show as many 
data turds.
 2013-11-28 11:45:16 -05:00
Neil Lalonde
1cc72d564f Add specs for topic create with auto_close_time. Just ignore auto_close_time from users who are not authorized to use it instead of raising an error. 2013-11-28 11:06:04 -05:00
Sam
79087f4e6f fix exception in logs 2013-11-28 12:39:59 +11:00
Régis Hanol
52160179f8 add a tombstone for extra safety 2013-11-27 22:05:11 +01:00
Wojciech Zawistowski
8eef779d38 refactors site map 2013-11-27 21:58:36 +01:00
Robin Ward
09155a9969 FIX: Upward scrolling jumps 2013-11-27 15:58:13 -05:00
Neil Lalonde
13b31e9833 FIX: broke all the things on Firefox 2013-11-27 14:52:29 -05:00
Neil Lalonde
746e115f99 Fix path of browser-update 2013-11-27 13:56:22 -05:00
Robin Ward
40f86829f7 Post Cloaking: 
* We now use a new custom view, {{cloaked-collection}} to display posts in a topic.

* Posts are removed and inserted (cloaked/uncloaked) into the DOM dynamically based on whether they
  are visible in the current browser viewport.

* There's been a lot of refactoring to ensure the relationship between the post views and the topic
  controller is sane.

* Lots of fixes involving jumping to a post, including a new LockOn component to that tries to stay
  focused on an element even if stuff is loading before it in the DOM that would normally push it
  down.
 2013-11-27 12:53:32 -05:00
Neil Lalonde
8a9bef944f Fix browser-update.js so it doesn't depend on jQuery 2013-11-27 12:26:27 -05:00
Neil Lalonde
3442d3adb2 Add left margin to ol and ul 2013-11-27 10:55:54 -05:00
Neil Lalonde
a9ab98ef9e Auto-close time can be entered in 3 ways, so a topic can close at any time 2013-11-27 09:52:35 -05:00
jjangg96
c2e7e72b74 faq.ko.html.erb Added 
Korean translate updated.
 2013-11-27 12:21:59 +09:00
Sam
d6a14889ac Merge branch 'master' of github.com:discourse/discourse 2013-11-26 10:21:57 +11:00
Sam
3fa48f8d76 Style fix: https://twitter.com/andrzejkrzywda/status/404943844896423937 2013-11-26 10:21:41 +11:00
Régis Hanol
b0d132ee2e make sure image urls have a scheme before pulling them in 2013-11-25 19:47:53 +01:00
Robin Ward
549060867d Updated documentation for inlineRegexp 2013-11-25 11:35:28 -05:00
Sam
6544f39bcc fix topic counts not updating automatically in various spots (top menu / categories page / drop down) 2013-11-25 17:37:51 +11:00
Sam
92528d7207 message bus update, extract message bus js out into gem 2013-11-25 17:37:01 +11:00
Robin Ward
f1a681aa46 Fix: Participant filter was broken. 2013-11-22 17:02:12 -05:00
Wojciech Zawistowski
afd198a387 removes unused property from HeaderController 2013-11-22 21:07:03 +01:00
Régis Hanol
82b78ec6ba schemaless avatar urls 2013-11-22 19:18:45 +01:00
Régis Hanol
3cf5a363f7 do not destroy uploads when destroying a user 2013-11-22 18:29:07 +01:00
Neil Lalonde
4e45c5ff3d Fix js for handling click of header buttons. They were adding /# to the url, which broke routing. 2013-11-22 11:50:57 -05:00
Neil Lalonde
35bb4fc17f When flag is from system, don't show a user avatar. Say System: instead 2013-11-22 11:14:09 -05:00
Robin Ward
ec5788f80b Merge pull request #1688 from velesin/sitemap_integration_tests 
header sitemap integration tests
 2013-11-22 08:06:49 -08:00
Régis Hanol
f65cde3cda do not bump posts when rebaking 2013-11-22 01:52:26 +01:00
Wojciech Zawistowski
1d3097245c header sitemap integration tests 2013-11-21 20:38:56 +01:00
Wojciech Zawistowski
b6de8324be FIX: removes invalid, unpaired closing tag 2013-11-21 17:33:03 +01:00
Robin Ward
50005e2ef9 FIX: Back button wasn't reusing scroll position on category filter 2013-11-21 11:31:10 -05:00
Neil Lalonde
69cc1dd689 FIX: don't suggest a username that's already taken, even if hub finds a match 2013-11-20 14:56:21 -05:00
Neil Lalonde
97cb9e1545 Signup with 3rd party auth can find the matching username from the Discourse Hub 2013-11-20 14:56:21 -05:00
Robin Ward
ea8e4bfbcf FIX: Double footer navigation 2013-11-20 14:16:33 -05:00
Robin Ward
d09735ff46 Merge pull request #1680 from velesin/user_activity_link_title_fix 
FIX: repairs title attr in the link
 2013-11-20 09:04:43 -08:00
Neil Lalonde
9de07fd83f Merge pull request #1678 from eriko/patch-3 
Load plugin settings.
 2013-11-20 07:54:20 -08:00
Régis Hanol
31fd5b85bc FIX markdown hotlinked images were not properly pulled 2013-11-20 13:10:08 +01:00
Robin Ward
fa0b5d3b0e FIX: Missing Private message topic map 2013-11-19 18:59:29 -05:00
Sam
d16298b1d7 Merge pull request #1679 from velesin/logo_improvement 
removes redundant enclosing tag
 2013-11-19 14:59:45 -08:00
Sam
325ad46c20 Merge pull request #1681 from germanviscuso/japanese_locales 
Provides Japanese locales
 2013-11-19 14:58:06 -08:00
Neil Lalonde
1616741836 Say something when no site settings match the filter 2013-11-19 16:46:20 -05:00
German Viscuso
3f049f4853 Provides Japanese locales 2013-11-19 22:20:19 +01:00
Wojciech Zawistowski
3a470939f0 FIX: repairs title attr in the link 2013-11-19 21:32:02 +01:00
Wojciech Zawistowski
e7c6abde3e removes redundant enclosing tag 2013-11-19 21:28:05 +01:00
Erik Ordway
bf390163aa Load plugin settings. 
Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin.  Updated version 04f3e09 that moves the loading to a function. I do not understand why it was necessary to define the function physically earlier in the file as I thought ruby did two pass but that may only apply to functions and not stray code in the class.
 2013-11-19 11:43:01 -08:00
Neil Lalonde
981d8f6aea Signup form: prefill username if Discourse Hub has a match for the email address. Also, fix some bad specs in username_checker_service_spec that were passing... 2013-11-19 14:15:28 -05:00
Robin Ward
309904ef8f Revert "Merge pull request #1673 from aperrault/patch-04" 
This reverts commit c9ea89bdd3, reversing
changes made to 9ed49888fc.
 2013-11-19 14:08:45 -05:00
Robin Ward
c9ea89bdd3 Merge pull request #1673 from aperrault/patch-04 
Fixing neglect to determine whether a user has the permission to create ...
 2013-11-19 10:50:38 -08:00
Robin Ward
9ed49888fc FIX: Invalid sub category links in suggested topics 2013-11-19 13:36:11 -05:00
Régis Hanol
a7bbc93b9a Merge pull request #1672 from shivpkumar/shiv/add-session-to-after-create-account 
Add 'session' to auth hash in OAuth complete method
 2013-11-19 10:16:31 -08:00
Shiv Kumar
2f0e20bc11 add session to auth hash in oauth complete method 2013-11-19 09:58:12 -08:00
Robin Ward
58b275665b Oops, missing translation 2013-11-19 12:57:54 -05:00
Robin Ward
f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Robin Ward
b98456a65f Hide some values from the topic map if they're 0 2013-11-19 12:24:41 -05:00
Robin Ward
20e4a2ef80 Renamed components so they don't all have the annoying discourse- prefix 2013-11-19 11:59:50 -05:00
Autumn Perrault
d9c026bec5 Fixing neglect to determine whether a user has the permission to create a topic on a category (besides being able to create a post) in ListController, TopicList, and TopicListSerializer causing the "Create Topic" button to appear even if a user cannot actually create a topic in that category but can reply to a topic therein. 2013-11-19 05:09:58 -07:00
Régis Hanol
c22f602235 Merge pull request #1669 from GManzato/fix_fr_translation 
Update french translation
 2013-11-19 00:53:41 -08:00
Gilles Manzato
231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Sam
3ce6a7be4a defer rendering of the site map 
add new and unread links in the site map categories section
 2013-11-19 10:41:57 +11:00
Robin Ward
89a96b9e94 FIX: Topic map expansion broken without links. 2013-11-18 17:06:52 -05:00
Robin Ward
9aa2bd068a FIX: Broken links on categories page 2013-11-18 16:59:19 -05:00
Régis Hanol
6e3de67977 fix edit reason when editing a reply 2013-11-18 19:51:30 +01:00
Robin Ward
a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Robin Ward
2f39a4ac6d Don't shorten links in Topic Map 2013-11-18 13:49:53 -05:00
Neil Lalonde
ae58a7db95 Add a warning on dashboard if enforce_global_nicknames is checked, but access key is blank. 2013-11-18 13:45:10 -05:00
Neil Lalonde
281f839e54 Site settings page tweak 2013-11-18 13:45:10 -05:00
Robin Ward
629fe8b426 If the topic can be summarized, expand the topic map by default 2013-11-18 13:43:35 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
34e451ef25 Removed extra comma 2013-11-18 12:16:14 -05:00
Robin Ward
f2659a5916 Moved more into components, including summary stuff. 2013-11-18 12:08:21 -05:00
Robin Ward
52048d2d2b Converted Private Message map to a component 2013-11-18 12:08:21 -05:00
Robin Ward
039acd6ead Convert some TopicMap stuff to Ember components 2013-11-18 12:08:21 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Régis Hanol
dabdcf59c4 allow for arbitrary HTML at the top/bottom of every pages 2013-11-18 17:13:24 +01:00
Robin Ward
639394e38a FIX: Pinned topics within a category weren't working without a refresh 2013-11-18 10:52:01 -05:00
Kris Aubuchon
2e9d0ecac4 adjusting badges a bit 2013-11-17 22:32:58 -05:00
Sam
6e1198334c automatic groups should be bootstrapped 2013-11-18 12:53:14 +11:00
Sam
805feca5f2 message at the bottom for uncategorized was all mangled, fallback to the old way it used to behave 2013-11-18 11:42:40 +11:00
Sam
1b19444b44 URGENT FIX: code would fail in Ruby 1.9.3 exception does not exist 2013-11-18 09:32:02 +11:00
Neil Lalonde
6eb5f1aec2 FIX: site settings page layout at smaller widths 2013-11-16 14:14:49 -05:00
Régis Hanol
482b752046 add edit reason when editing a post 2013-11-15 23:28:49 +01:00
Neil Lalonde
b921478cbb Use debounce to make filtering on the All Results tab faster 2013-11-15 16:46:19 -05:00
Neil Lalonde
d3c84b60c8 Add an All Results tab when filtering the site settings 2013-11-15 16:43:56 -05:00
Neil Lalonde
97bc187735 Use stacked nav on left to navigate site settings categories 2013-11-15 15:22:42 -05:00
Neil Lalonde
dfdc618e9a Use File.join instead of hard-coding slashes 2013-11-15 14:34:03 -05:00
Neil Lalonde
fc180ccd71 Site settings: move category into the opts hash so that it's compatibale with existing plugins 2013-11-15 14:32:33 -05:00
Neil Lalonde
e01ce546e8 When you click Quote Reply, and then cancel the reply, don't ask if you're sure. 2013-11-15 13:13:58 -05:00
railsaholic
34bba737ff Refactor SessionController#create, reduce complexity. 
Don't compromise readablity
 2013-11-15 22:09:03 +05:30
Régis Hanol
8a83f1a88f add disk space usage failsafe 2013-11-15 16:48:38 +01:00
Robin Ward
e03ae73c5d Merge pull request #1653 from ScotterC/uri-addressable 
URI adapter should use Addressable
 2013-11-15 07:24:57 -08:00
Régis Hanol
16267e4887 add download_remote_images_to_local site setting 2013-11-15 15:22:18 +01:00
Régis Hanol
6a3000ffef Merge pull request #1655 from awesomerobot/master 
embedded response width fix
 2013-11-15 00:52:51 -08:00
Kris Aubuchon
ad9cb01263 embedded response width fix 2013-11-14 21:44:45 -05:00
Neil Lalonde
726b985ece FIX: a js error when reloading /admin/site_settings/category/:id 2013-11-14 16:50:34 -05:00
Neil Lalonde
d9e4eec49f Style the site setting category links. Required and Basic Setup are bigger and all other links are to the right of them. 2013-11-14 16:02:14 -05:00
Neil Lalonde
ca0a8a5970 Move save and resetDefault actions to the adminSiteSettingsCategory controller 2013-11-14 16:02:14 -05:00
Neil Lalonde
df213d7b23 Filter on site settings across all categories 2013-11-14 16:02:14 -05:00