github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 07:13:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1,053 Commits 214 Branches 500 Tags 960 MiB
94c0e73ca6
Commit Graph

574 Commits

Author SHA1 Message Date
Sam
d6ca23a75b remove N+1 queries 2013-03-08 05:34:19 -08:00
Robin Ward
d848a9fedc Add opengraph and twitter card support to topics 2013-03-07 17:46:43 -05:00
Neil Lalonde
2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Neil Lalonde
1133d90dcc Disable submit button on signup form when you've submitted the form 2013-03-07 14:56:55 -05:00
Kuba Brecka
2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward
052887c296 Category Topics are no longer invisible, they are pinned. 2013-03-07 12:46:23 -05:00
Robin Ward
c7359145aa Merge pull request #384 from kubabrecka/fix_html_escapes 
fix wrongly escaped HTML in <noscript> tags
 2013-03-07 09:24:16 -08:00
Robin Ward
f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Regis Hanol
5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Régis Hanol
002776808f highlight the first of the newly loaded topics when scrolling 2013-03-07 03:38:38 +01:00
Kuba Brecka
69d9856d43 fix wrongly escaped HTML in <noscript> tags 2013-03-06 22:25:44 +01:00
Jeff Atwood
985cbb92f1 Merge pull request #382 from nsahler/patch-1 
Reply-new fades in
 2013-03-06 11:44:53 -08:00
Nick Sahler
7490012b20 Resubmitting 2013-03-06 14:41:24 -05:00
Neil Lalonde
fab04dbb58 Add github commits widget 2013-03-06 14:39:01 -05:00
Nick Sahler
5f9093f21d "reply-new" transitions instead of instantly popping in 2013-03-06 14:26:38 -05:00
Alexander
02f29cd43f Prevent quote content collisions with multiples in one post 
[Fixes #142]
 2013-03-06 09:53:34 -08:00
Robin Ward
c123e40638 Merge pull request #373 from alxndr/master 
Raise 404 from Admin::UsersController#show if no user found
 2013-03-06 09:17:47 -08:00
Robin Ward
610be79061 Merge pull request #375 from ZogStriP/autofocus-login 
autofocus the login input in the login modal
 2013-03-06 09:17:10 -08:00
Robin Ward
3b645383fb Merge pull request #372 from kubabrecka/markdown_fix1 
Markdown editor translations into client.en.yml + tiny translation fixes
 2013-03-06 09:15:52 -08:00
Robin Ward
6a63178411 Merge pull request #377 from kubabrecka/typos5 
various typos in comments
 2013-03-06 09:14:16 -08:00
Robin Ward
1e43eac600 Simple CSS changes to help with lower width screens such as Surface tablet 2013-03-06 12:08:06 -05:00
Neil Lalonde
f129693942 Use a github commits widget hosted on discourse.org 2013-03-06 12:04:45 -05:00
Robin Ward
30aae8e793 Topic was not sanitizing <b> and <img> tags from titles 2013-03-06 11:36:42 -05:00
Neil Lalonde
e8eb60fe78 Use the cog in header dropdown menu admin link, not the wrench 2013-03-06 11:07:44 -05:00
Neil Lalonde
83f89b5c55 Fix check if you're up to date in javascript 2013-03-06 10:34:29 -05:00
Sam Saffron
8f56a09e82 PBKDF2 gem is trouble, removing and hand coding for now 2013-03-06 23:12:16 +11:00
Kuba Brecka
dc62136642 various typos in comments 2013-03-06 08:52:24 +01:00
Neil Lalonde
f8e04a5c48 Version check gets how many versions behind you are, and shows judgemental faces on the dashboard 2013-03-05 18:15:33 -05:00
Régis Hanol
21407d1df4 autofocus the login input in the login modal 2013-03-05 23:42:12 +01:00
Robin Ward
3c1388bbd7 Don't include closed or archived topics in the "new topics" section of the daily digest 2013-03-05 17:22:02 -05:00
Alexander
c4f1cb0d7b Raise 404 from Admin::UsersController#show if no user found 
[Fixes #353]
 2013-03-05 14:02:23 -08:00
Robin Ward
030857ac8c Give a pretty "from" address to the digest emails 2013-03-05 16:53:49 -05:00
Kuba Brecka
da7a41f5b9 Markdown editor translations into client.en.yml + tiny translation fixes 2013-03-05 21:58:37 +01:00
Robin Ward
86af49e663 More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $. 2013-03-05 15:39:21 -05:00
Robin Ward
cf09e200a5 Moved Markdown out of Discourse.Utilities -> Discourse.Markdown 2013-03-05 14:56:43 -05:00
Robin Ward
1416bc7475 Some javascript refactoring: Move markdown functions into their own classs, remove extraneous window. calls. 2013-03-05 14:53:55 -05:00
Neil Lalonde
e2ead81818 Use wrenches instead of cogs for admin buttons that let you change something/someone's settings 2013-03-05 14:52:33 -05:00
Robin Ward
09880ce9f9 Merge pull request #369 from kubabrecka/cz_privacy 
CZ privacy policy translation
 2013-03-05 11:11:25 -08:00
Robin Ward
e4277757c4 Fix onebox loading on every keystroke after a request fails. 2013-03-05 14:06:39 -05:00
Kuba Brecka
8da2c93b18 CZ privacy policy translation 2013-03-05 19:31:39 +01:00
Gosha Arinich
a1825fece9 refactor Category 
* move callback bodies to separate methods (easier to test)
 2013-03-05 21:09:13 +03:00
Neil Lalonde
d30fbcd491 Remove welcome to the dashboard 2013-03-05 13:02:16 -05:00
Robin Ward
6edabdfec1 Merge pull request #362 from ZogStriP/repeated-clicks 
Repeated click on header icons should close popped out dropdowns
 2013-03-05 07:29:56 -08:00
Robin Ward
0c5ca30188 Merge pull request #361 from ZogStriP/enforce-coding-convention 
enforce coding convention
 2013-03-05 07:25:19 -08:00
Robin Ward
3cf3fee781 Merge pull request #319 from alxndr/rss-caching 
Basic caching for topic/category RSS feeds
 2013-03-05 07:20:15 -08:00
Robin Ward
0c41e80f41 Merge pull request #367 from kubabrecka/extract_strings5 
extract some strings from views/modal
 2013-03-05 06:43:01 -08:00
Robin Ward
97a2d6d0fe Merge pull request #366 from ZogStriP/moar-globalization 
globalizing the image selector modal
 2013-03-05 06:41:49 -08:00
Robin Ward
cd4d908023 Merge pull request #363 from ZogStriP/autofocus 
autofocus the input in the "insert image" dialog when clicking on...
 2013-03-05 06:39:16 -08:00
Robin Ward
de1dd9c651 Merge pull request #368 from kubabrecka/cs_faq 
CZ translation of FAQ
 2013-03-05 06:37:30 -08:00
Kuba Brecka
9573847caf CZ translation of FAQ 2013-03-05 11:22:08 +01:00
Kuba Brecka
5afd6cc8a1 extract some strings from views/modal 2013-03-05 08:30:47 +01:00
Régis Hanol
5b456a6a3f globalizing the image selector modal 2013-03-05 03:38:12 +01:00
Régis Hanol
61dcd61a5e autofocus the input in the "insert image" dialog when clicking on the "on the web" tab 2013-03-05 03:09:13 +01:00
Régis Hanol
c72f65879f Repeated click on header icons should close popped out dropdowns 2013-03-05 02:44:34 +01:00
Régis Hanol
239cbd2d58 enforce coding convention 
replaced every `and` by `&&` and every `or` by `||`
 2013-03-05 01:42:44 +01:00
Robin Ward
f544e1d4f7 Crap, we can't use Ember.Handlebars because some places don't use Ember (such as autocomplete.js) 2013-03-04 17:39:21 -05:00
Robin Ward
9c0b4572a3 Updated helpers, upgraded Ember to latest master. 2013-03-04 15:25:30 -05:00
Robin Ward
4385a174a2 Merge branch 'keep-title-and-category-in-sync' of git://github.com/ZogStriP/discourse 2013-03-04 15:25:24 -05:00
Robin Ward
9a66c416af Merge pull request #343 from kubabrecka/localize_static_pages 
implement translations into static pages (FAQ, TOS) + an example of CZ translation
 2013-03-04 11:51:28 -08:00
Robin Ward
09e9e34b8b Merge pull request #340 from tms/post-scroll-peekaboo 
Position the selected post more reliably below the header
 2013-03-04 11:40:00 -08:00
Alexander
d6e665f888 Caching for topic/category RSS feeds 
Using anonymous_etag() now
 2013-03-04 11:21:01 -08:00
Robin Ward
51f6ae69c9 Check when logging in whether a auth provider is enabled, including specs 2013-03-04 13:44:41 -05:00
Robin Ward
ccbd3b2841 Let's default Persona to off right now, change button text 2013-03-04 12:01:20 -05:00
Robin Ward
f7c9efb101 Merge branch 'persona-integration' of git://github.com/callahad/discourse 2013-03-04 11:51:26 -05:00
Robin Ward
3287dcf754 Merge pull request #345 from tms/fatten-up-static-pages 
Don't double-up on #main-outlet when static content is preloaded
 2013-03-04 06:45:55 -08:00
Neil Lalonde
40f5b9170d Merge pull request #347 from ZogStriP/put-a-gear-button-on-it 
added the gear icon to the "Admin" button on the user page
 2013-03-04 06:27:37 -08:00
Kuba Brecka
9bf5e31f94 some more extracted strings for translation 2013-03-03 23:00:16 +01:00
Régis Hanol
ccb715fba3 update both the title & the category when editing the first post 
using the "edit this post" action beneath the post.
 2013-03-03 19:21:29 +01:00
Régis Hanol
d7edca203c added the gear icon to the "Admin" button on the user page 2013-03-03 18:04:02 +01:00
tms
f46c819956 Don't double-up on #main-outlet when static content is rendered through Ember 2013-03-03 10:47:40 -05:00
Kuba Brecka
778cad5d2f implement translations into static pages (FAQ, TOS) + an example of CZ translation 2013-03-03 16:27:32 +01:00
tms
fba50c3f7a Position the selected post more reliably below the header 2013-03-03 00:43:08 -05:00
Robin Ward
dfafadfe41 Merge pull request #327 from tms/name-changing 
Change the name displayed in the header on profile update
 2013-03-02 08:10:26 -08:00
Robin Ward
6c97e5ad09 Merge pull request #333 from goshakkk/refactor-incoming-link 
Move IncomingLink callbacks into their own methods
 2013-03-02 08:09:13 -08:00
Robin Ward
e145a81809 Merge pull request #334 from kubabrecka/minor_tos_fixes 
minox TOS HTML fixes
 2013-03-02 07:58:51 -08:00
Kuba Brecka
821ad9f51d server side of Czech language localization + update of client side + update of pseudo-localization 2013-03-02 14:22:53 +01:00
Kuba Brecka
77eafc62cb minox TOS HTML fixes 2013-03-02 10:56:11 +01:00
Gosha Arinich
5066682e7a move IncomingLink callbacks into their own methods 2013-03-02 12:33:29 +03:00
tms
66a7b3162f Change the name displayed in the header on profile update 2013-03-01 22:46:33 -05:00
Robin Ward
3901ddd153 Fix jshint issue with [^] in regexp. 2013-03-01 15:16:21 -05:00
Robin Ward
d410f043a9 Merge pull request #290 from alxndr/category-rss 
RSS for topics in a category
 2013-03-01 12:01:26 -08:00
Dan Callahan
7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Dan Callahan
23d812a4ab Use AJAX for submitting Persona credentials. 
Fixes issue with needing to unblock popups.
 2013-03-01 14:00:56 -06:00
Dan Callahan
ef8cf2f734 Add basic Persona functionality 
1. No session integration yet, so automatic login/logout events are suppressed.

2. Popup blockers must be disabled: submits form to target="_blank"
 2013-03-01 14:00:56 -06:00
Dan Callahan
81c545539e Add (ui-only) Persona button to login modal 2013-03-01 14:00:53 -06:00
Robin Ward
72cbb948b8 Fixes broken "From" header in Private Message emails. 2013-03-01 14:56:52 -05:00
Robin Ward
7c68224763 Merge pull request #309 from goshakkk/enums 
Introduce Enum
 2013-03-01 11:34:48 -08:00
Robin Ward
d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access 
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
 2013-03-01 14:27:41 -05:00
Gosha Arinich
0c99dea153 introduce Enum 2013-03-01 21:16:36 +03:00
Alexander
fd240c1967 RSS for topics in a category 
Creates a new route for category RSS
 2013-03-01 09:52:59 -08:00
Robin Ward
25494529d2 Merge pull request #314 from kubabrecka/extract_strings2 
extracting some more hardcoded strings
 2013-03-01 08:36:46 -08:00
Kuba Brecka
9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Robin Ward
b66b17bf19 Merge pull request #300 from goshakkk/cleanup 
Minor cleanup, using AR querying DSL over raw SQL in some places
 2013-03-01 07:52:34 -08:00
Robin Ward
27ba923fd4 Merge pull request #307 from kubabrecka/html_syntax_fixes 
some minor HTML syntax fixes
 2013-03-01 07:39:03 -08:00
Robin Ward
2106d72d4c Merge pull request #304 from ZogStriP/minimum-character-count 
Quoting another reply won't satisfy the minimum character count (fixes #180)
 2013-03-01 07:30:26 -08:00
Robin Ward
c3b0cf0744 Merge pull request #303 from kirushik/gravatar_https 
Secure gravatar
 2013-03-01 07:12:56 -08:00
Kuba Brecka
8a03afb35f some minor HTML syntax fixes 2013-03-01 08:44:58 +01:00
Régis Hanol
4fa4c15559 Quoting another reply won't satisfy the minimum character count (fixes #180) 2013-02-28 23:58:40 +01:00
Neil Lalonde
c9140a2441 Add a nag to update often 2013-02-28 16:19:22 -05:00
Kirill Pimenov
a168dc915e Secure gravatar 2013-03-01 00:58:36 +04:00
Neil Lalonde
f0c2d012b7 Add a github widget to the admin dashboard showing the 10 most recent commits 2013-02-28 15:35:47 -05:00
Robin Ward
628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Robin Ward
e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Neil Lalonde
a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Gosha Arinich
6e5399d544 minor cleanup, using AR querying DSL over raw SQL in some places 2013-02-28 21:54:12 +03:00
Neil Lalonde
fce4c66d93 Improve js username validation so it's done only when necessary 2013-02-28 12:24:57 -05:00
Robin Ward
6c25eca2d6 Merge pull request #296 from goshakkk/refactor-user 
Refactor User and TrustLevel a bit
 2013-02-28 08:17:21 -08:00
Gosha Arinich
d2f3c829db refactor User and TrustLevel a bit 
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
  `TrustLevel#level_key`
 2013-02-28 19:15:54 +03:00
Robin Ward
9c0cbe8311 Merge pull request #298 from nverba/login-buttons 
added option to enable/disable login buttons individually
 2013-02-28 08:13:04 -08:00
Robin Ward
5d0d958a45 Merge pull request #289 from ZogStriP/bbcode-component 
added more tests & documentation to the BBCode component
 2013-02-28 08:03:44 -08:00
Bryson Holland
50cd44df2d Saved ~46KB through image optimization. 2013-02-28 10:58:12 -05:00
Robin Ward
3b47562738 We don't need content here because it uses an ObjectController as a proxy. 2013-02-28 10:01:38 -05:00
nverba
b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward
dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Régis Hanol
f93a26e03d added more tests & documentation to the BBCode component 2013-02-28 03:29:52 +01:00
Jeff Atwood
416f981f92 change 404 page to use /new link under "New topics" 2013-02-27 16:48:53 -08:00
Robin Ward
a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward
c62729b5b6 Merge pull request #285 from alxndr/rss-for-topics 
Specify type in topic RSS autodiscovery tag
 2013-02-27 15:33:11 -08:00
Robin Ward
421f048458 Add a better from address to the email 2013-02-27 18:30:14 -05:00
Alexander
9b541b1c0a Specify type in topic RSS autodiscovery tag 2013-02-27 14:55:04 -08:00
Robin Ward
7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward
cf867a35ff Merge pull request #271 from goshakkk/topic-refactor 
Refactor Topic
 2013-02-27 10:32:44 -08:00
Robin Ward
007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse 
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
 2013-02-27 12:09:22 -05:00
Robin Ward
2184763d4a Merge pull request #222 from alxndr/rss-for-topics 
RSS view of topics
 2013-02-27 08:30:08 -08:00
Robin Ward
7d6e1f3e1c Show likes even while logged out. 2013-02-27 11:22:03 -05:00
Jeff Atwood
d8687f1bfa broaden the /faq "search" advice to browse 2013-02-27 02:14:28 -08:00
Jeff Atwood
b757f06fde /faq tweaks 2013-02-27 02:07:31 -08:00
Kuba Brecka
acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Alexander
8855a0bfbe RSS of a topic via new route 
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
 2013-02-26 14:54:17 -08:00
Robin Ward
e363950bf5 Merge pull request #272 from kubabrecka/extract_some_strings 
extract some more strings into locales/*.yml
 2013-02-26 14:38:40 -08:00
Robin Ward
0df2034dc8 Fixes #264 - replaceState was wonky 2013-02-26 17:27:01 -05:00
Neil Lalonde
4e15227fd0 Admin dashboard: use ember's class name binding 2013-02-26 17:05:17 -05:00
Kuba Brecka
e9fb46c251 extract some more strings into locales/*.yml 2013-02-26 22:13:07 +01:00
Neil Lalonde
cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05:00
Robin Ward
0f48414a72 The avatar helper should be smart enough to find a nested avatar_template. Fixes #243 2013-02-26 15:31:49 -05:00
Robin Ward
1492464158 fixes: http://meta.discourse.org/t/discourse-logo-link-back-to-top-of-thread-list-on-home-page/3592 2013-02-26 15:20:13 -05:00
Robin Ward
1caf1e6b45 Clean up discourse.js 2013-02-26 15:20:06 -05:00
Neil Lalonde
b9ccf4d09c Show discourse version in an html comment 2013-02-26 13:47:07 -05:00
Robin Ward
ddf1f27633 Fixes #157 - Add mention of seed_fu to docs. 2013-02-26 12:45:56 -05:00
Robin Ward
6c30e0b09c Add 'descrption' to categories, even when in a Combobox 2013-02-26 12:17:23 -05:00
Gosha Arinich
12d664a610 refactor Topic 
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
 2013-02-26 19:27:59 +03:00
Robin Ward
0e087e040f Fixes title regression 2013-02-26 11:13:13 -05:00
Robin Ward
88267429c5 Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by 
it.
 2013-02-26 10:47:23 -05:00
Robin Ward
1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse 
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
 2013-02-26 10:42:49 -05:00
nverba
b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich
cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
tms
7088dfce9f Prevent event bubbling on search toggles to keep dropdown open 2013-02-25 22:14:58 -05:00
Robin Ward
e28594b94e Ack! Messed up the jshint again. I gotta get better about this. 2013-02-25 18:43:45 -05:00
Robin Ward
397c6ca761 Better error messages when topics can't load 2013-02-25 18:38:38 -05:00
Robin Ward
3e201fc9f3 Oops I missed a couple of jshint errors :) 2013-02-25 17:53:29 -05:00