IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,373 Commits 1,018 Branches 579 Tags
f011fbdca9a4882a2871e9a52ccc875d42c87c9f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam be06156629 SECURITY: when enabled_local_logins is false users could log in via API 
thanks @Nicholas Blanco
 2014-03-26 15:39:44 +11:00
Sam 1a60969347 Update onebox gem 2014-03-26 15:07:42 +11:00
Sam 30d48a4ea4 Merge pull request #2183 from riking/class 
Fix 0be7483f19
 2014-03-26 15:01:33 +11:00
Sam 5897d3419c BUGFIX: identity_url was not fished out correctly 
If I user logged in with Google and then changed email,
they would no longer be able to log in with google
 2014-03-26 14:52:50 +11:00
Sam 49dbb992ad BUGFIX: someone missed a replacement 2014-03-26 13:22:04 +11:00
Sam 0be7483f19 Merge pull request #2175 from riking/class 
CSS rule for GitHub commit avatars
 2014-03-26 11:45:56 +11:00
Sam 35ee341122 SECURITY: GitHub returns unvalidated emails 2014-03-26 10:55:36 +11:00
Sam 9cf23223eb BUGFIX: proxy_set_header is weird 
in particular no inheritance IF proxy_set_header is specified in child
 2014-03-25 17:06:15 +11:00
Sam 2f4ec5a17c BUGFIX: no idea how this worked in test 2014-03-25 15:15:46 +11:00
Sam 3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Sam 14f7551f2b Fix visual bug 2014-03-25 09:45:21 +11:00
Sam 4191972afe Merge pull request #2173 from vikhyat/badge-system 
Forgot to specify "dependent: destroy" for UserBadges
 2014-03-25 08:25:31 +11:00
Sam 039e65c3eb improve copy 2014-03-24 18:11:12 +11:00
Sam 7e7c4efcc0 FEATURE: on initial boot hint users on how to get admin 2014-03-24 18:03:39 +11:00
Sam c27c87911e FEATURE: refactor notice code, add optional global notice. 
Set the global_notice site setting to notify users of a critical event.
 2014-03-24 16:51:48 +11:00
Sam b5208081b3 Merge pull request #2166 from vikhyat/poll-plugin 
Live update poll votes
 2014-03-24 16:02:46 +11:00
Sam a3344a6be3 oops 2014-03-24 13:32:32 +11:00
Sam 1cd32ced33 FEATURE: update likes and flags live. 2014-03-24 13:22:03 +11:00
Sam 090f5c99c2 FEATURE: Live update edits 2014-03-24 12:19:08 +11:00
Sam 7e88006b20 update onebox gem 2014-03-24 11:05:54 +11:00
Sam 89b62e133d BUGFIX: overflow hidden messes stuff up for chrome on mac 2014-03-24 10:13:46 +11:00
Sam a974dddec2 Merge pull request #2076 from riking/clean-site-settings 
Clean up site_settings.yml
 2014-03-24 09:56:45 +11:00
Sam 8fd57da7c0 Lowercase md file 2014-03-24 09:54:21 +11:00
Sam 28ffb3025c Merge pull request #2150 from vikhyat/badge-system 
Interface for granting/revoking badges from admin user page
 2014-03-21 17:56:08 +11:00
Sam 12513f430c thread_safe 0.3.0 DoA 2014-03-21 16:46:21 +11:00
Sam 2dc5e3c81e Merge pull request #2118 from vikhyat/firefox-middle-click 
Fix Firefox middle-click popup blocker issue
 2014-03-21 16:27:02 +11:00
Sam 0462969ba8 Merge pull request #2138 from chancancode/upgrade_4_0_4 
Upgraded rails to 4.0.4
 2014-03-21 16:20:59 +11:00
Sam 31ce05b5ae Merge pull request #2157 from Aselox/master 
Updated Italian Translation + added Italian poll locales
 2014-03-21 16:19:13 +11:00
Sam 5c148faeb9 annotations were out of date 2014-03-20 15:35:51 +11:00
Sam c240fb0d83 BUGFIX: facebook does not always provide username 
We key on facebook_user_id its the only thing that matters
 2014-03-20 15:35:30 +11:00
Sam 619fa50d4b BUGFIX: twitter auth asking for a password 2014-03-20 14:49:25 +11:00
Sam eab30d1c28 Merge pull request #2146 from vikhyat/badge-system 
Badge creation UI improvements
 2014-03-19 17:11:00 +11:00
Sam b7f2a3e512 VIM helper 2014-03-19 12:08:00 +11:00
Sam 9fc31932cf BUGFIX: don't alery myself when I link to myself 2014-03-19 12:07:48 +11:00
Sam b77fe49150 Stop leaking site_email in rss 2014-03-19 09:46:48 +11:00
Sam 7460e5ed24 BUGFIX: dupe topic names could booby trap seeding 2014-03-19 09:30:17 +11:00
Sam 5c26b3dad1 FIX: broken specs after new link alerting code 2014-03-18 15:22:53 +11:00
Sam 9fd7b0b814 use 1.9 syntax 2014-03-18 15:22:53 +11:00
Sam 76c7d42027 require rbtrace in development cause it is handy 2014-03-18 15:22:53 +11:00
Sam 00a46253ae BUGFIX: Don't resolve oneboxes when cooking 
Defer to post save job
 2014-03-18 15:22:53 +11:00
Sam 24667cedee FEATURE: notify users when linked 
Extract out PostAlerter from observer
Track outgoing post links correctly
Notify users they are linked when linked
 2014-03-18 15:22:53 +11:00
Sam 798b8444cf BUGFIX: work correctly if process forks 2014-03-17 15:22:11 +11:00
Sam 90139efc6f Fix spec, remove pointless have_many etc preamble 2014-03-17 12:47:47 +11:00
Sam 02963b03dc BUGFIX: last_seen_at can be nil 2014-03-17 12:42:51 +11:00
Sam 2c8ae22b87 FEATURE: add a simple queue Scheduler::Defer.later {} 
For quick jobs that do not need to be sent to sidekiq,
runs inline in a single thread but does not block
 2014-03-17 12:16:19 +11:00
Sam fe63db7953 Merge pull request #2115 from vikhyat/badge-system 
Initial badge system implementation
 2014-03-17 10:06:37 +11:00
Sam f4c2fef407 Merge pull request #2121 from LessonPlanet/disable-name-edit-for-sso 
Adding name to the list of uneditable items in preferences UI
 2014-03-17 10:05:11 +11:00
Sam 82e34eabb7 Merge pull request #2128 from vikhyat/crawler-detection 
Improved crawler detection
 2014-03-17 10:02:33 +11:00
Sam 0f359d3f62 Merge pull request #2122 from riking/extensible-share 
Make Discourse.ShareLink fully extensible
 2014-03-17 10:00:37 +11:00
Sam ccb4248f20 Merge pull request #2131 from vikhyat/poll-plugin 
Poll plugin updates
 2014-03-17 10:00:03 +11:00
Sam 91aa21671a Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso 
Adding name to the list of uneditable items in preferences UI
 2014-03-13 13:53:59 +11:00
Sam f19596af0d update sass 2014-03-13 13:12:12 +11:00
Sam 25bbeaf09c mini profiler update 2014-03-13 13:11:13 +11:00
Sam cff7d12419 update sass, cause compilation of css is getting really slow 2014-03-12 01:05:53 +11:00
Sam eb2f04d458 PERF: Don't blur all elements on a page 2014-03-11 09:03:24 +11:00
Sam e49ad34bfc Revert "Hack for supporting pasting images into the composer in Firefox." 
Reverted cause it broke https://meta.discourse.org/t/when-creating-a-reply-pasting-only-works-once/13587

This reverts commit c8c150dfbe.
 2014-03-10 13:43:28 +11:00
Sam e68e106be7 UI: we only intended to add the word "new" for new topics 2014-03-10 13:40:49 +11:00
Sam 1b66ed903f Merge pull request #2091 from Xenograph/fix-sso-override 
Added spec for SSO override username/email changes
 2014-03-10 13:11:25 +11:00
Sam bf23c7a0c4 Merge pull request #2066 from riking/red-popup 
Style 'urgent' composer popups differently
 2014-03-10 10:46:15 +11:00
Sam b0bbb1ce82 Merge pull request #2028 from ligthyear/fix-contrib-guide 
Make contribution process less restrictive on commit history
 2014-03-10 10:33:49 +11:00
Sam cbf269fdbf Merge pull request #2080 from Xenograph/fix-sso-override 
Username/email change should not be allowed with SSO and username/email override enabled
 2014-03-10 10:32:08 +11:00
Sam 57626a3930 Merge pull request #2064 from staryume/patch-5 
Update client.zh_TW.yml
 2014-03-10 10:30:48 +11:00
Sam 766c8f8f64 Merge pull request #2075 from riking/second-person 
Standardize on second person on preferences page
 2014-03-10 10:29:23 +11:00
Sam 0de759e734 UI: remove usercard hacks, specify width explictly 2014-03-10 10:27:58 +11:00
Sam 36ae165392 Merge pull request #2082 from Mikulas/czech-localization-march14 
update czech localization
 2014-03-10 10:14:12 +11:00
Sam 3f0964bf60 BUGFIX: spec would blow up when DST kicked in 2014-03-10 10:12:09 +11:00
Sam 68630af718 Merge pull request #2083 from vikhyat/firefox-paste-image 
Hack for supporting pasting images into the composer in Firefox
 2014-03-10 10:06:31 +11:00
Sam 5e83778fc1 PERF: remove ember renderspeed until we make it optional (disabled by default in prd) 2014-03-10 09:50:23 +11:00
Sam d60c7966eb PERF: remove jQuery.UI monkey patch 2014-03-10 09:50:23 +11:00
Sam c9bd12c429 Merge pull request #2090 from bcjordan/poll-readme 
Add README for poll plugin (#2089)
 2014-03-10 09:27:43 +11:00
Sam c1d998cd4b Merge pull request #2086 from vikhyat/new-unread-i18n 
i18n of new/unread text next to topics
 2014-03-10 09:27:04 +11:00
Sam b7ece53966 BUGFIX: rescue should splat 2014-03-09 23:06:54 +11:00
Sam e9fe8f6063 Revert "BUGFIX: if uploads is in a symlinked directory stuff breaks" 
This reverts commit 894bb0716c.

The issue here was that docker was not mounting stuff properly post
reboot, then we had a broken symlink that "exists"
 2014-03-07 19:22:40 +11:00
Sam 894bb0716c BUGFIX: if uploads is in a symlinked directory stuff breaks 2014-03-07 19:17:11 +11:00
Sam 73ef91cf27 junk code removed 2014-03-07 19:00:36 +11:00
Sam b19400726f BUGFIX/FEATURE: store topic changes in post revisions 
History + edit notifications for title and category changes
 2014-03-07 19:00:36 +11:00
Sam edf86a207b fix build 2014-03-05 14:26:42 +11:00
Sam adb6541635 FEATURE: mailing list mode always available 2014-03-05 14:21:53 +11:00
Sam 69b498da24 Merge pull request #2034 from birarda/custom_username_length 
allow for custom username length via site setting
 2014-03-05 12:06:23 +11:00
Sam ea553202f0 Merge pull request #2033 from birarda/master 
add option to override user attributes from SSO payload
 2014-03-05 11:33:32 +11:00
Sam b4688fc4c5 Merge pull request #2046 from staryume/patch-4 
Update client.zh_TW.yml for better Tradtional Chinese translations
 2014-03-05 11:30:56 +11:00
Sam eb3a535c38 Merge pull request #2038 from fantasticfears/poster_expansion 
poster_expansion will only slide down now.
 2014-03-05 11:27:03 +11:00
Sam 4289c909b8 Merge pull request #2047 from jpsullivan/patch-2 
Typo fix
 2014-03-05 11:23:16 +11:00
Sam 24356cd807 Merge pull request #2050 from verg/unify_scroll_to_first_post 
Scroll to Top of Topic instead of Reloading
 2014-03-05 11:22:54 +11:00
Sam 3be310a0cb Merge pull request #2049 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-05 11:22:16 +11:00
Sam 73e6ee151a Merge pull request #2053 from vikhyat/travis-plugins 
Add plugin specs to travis
 2014-03-05 11:21:00 +11:00
Sam b0fc834e09 Merge pull request #2054 from ligthyear/fix-broken-cats 
BugFix: email-in on categories wasn't null-ed properly
 2014-03-05 11:16:20 +11:00
Sam d969958b18 PERF: workaround aweful sass compiling perf with HUGE css files 2014-03-04 17:16:53 +11:00
Sam f602c568e2 PERF: speed up css precompilation by caching 2014-03-04 16:55:23 +11:00
Sam 5c3f2feed4 BUGFIX: recovery code in case an unknown job is scheduled 2014-03-04 07:37:12 +11:00
Sam ceb80611d6 PERF: defer last_ip_address and last_seen updates 2014-03-03 15:16:38 +11:00
Sam 172e517b31 Merge pull request #2012 from ligthyear/incoming-emails 
Advanced New-Topic via Email Feature
 2014-03-03 10:58:10 +11:00
Sam fb10cfdc1e Merge pull request #2025 from KiiPlatform/updated_japanese_locals 
Updated Japanese locales
 2014-03-03 10:49:04 +11:00
Sam 7004b3f3b9 Merge pull request #2037 from infogulch/abandon-button-text 
Explicit button text in abandon dialog in all lang
 2014-03-03 10:37:32 +11:00
Sam eaa7e505d3 Merge pull request #2044 from staryume/patch-2 
Update client.zh_TW.yml
 2014-03-03 09:53:44 +11:00
Sam 560b5356d5 Revert "Use symbols instead of strings in order clause" 
Breaks 1.9.3 compat

This reverts commit 09a2d9e12c.
 2014-02-28 15:08:50 +11:00
Sam 6e0e628ff5 BUGFIX: don't force load drafts when composing. 
It will still be there after post is made.
 2014-02-28 10:30:05 +11:00
Sam ab17e1476b Revert "Add explicit confirm button text on post abandon" 
BROKEN

This reverts commit 6bab39b9cd.
 2014-02-28 10:19:00 +11:00
Sam 1992271bf9 FEATURE: white_listed_spam_host_domains for domains that are not blocked for spam 
BUGFIX: bypass host spam detection for current host
 2014-02-27 15:43:57 +11:00
Sam d064ea6284 Merge pull request #2019 from awesomerobot/master 
small logos should always be proportionate
 2014-02-27 14:06:36 +11:00