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

461 commits

Author SHA1 Message Date
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
Robin Ward
2ba28096e1 Merge pull request #262 from goshakkk/no-unused-var-warn 
Avoid unused variable (post) warning in Topic
 2013-02-25 14:20:50 -08:00
Robin Ward
e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
Neil Lalonde
0321643636 Dashboard JS checks version every 12 hours 2013-02-25 16:21:52 -05:00
Gosha Arinich
054a699886 avoid unused variable warning in Topic 2013-02-25 22:13:36 +03:00
Sam Saffron
77a2d8ccc4 fixed a pile of notification craziness 
addes some tests around post timings
 2013-02-25 18:42:42 +11:00
Sam Saffron
cb3d839104 fix hinting 2013-02-25 11:18:10 +11:00
Sam Saffron
b9f3666f5a fast click instead of hacky double event binding 2013-02-25 11:11:46 +11:00
Sam Saffron
b0b0e222f7 missed a spot where channel can be out of sync 2013-02-25 09:32:06 +11:00
Sam
14c2a4568d Merge pull request #247 from balpha/master 
Update PageDown to latest
 2013-02-24 13:54:16 -08:00
Sam Saffron
419ecf70b2 remove events from ember that seem to be firing too much PR in progress 2013-02-25 08:37:11 +11:00
Sam Saffron
997b436210 attempt at fixing google analytics 2013-02-25 08:36:46 +11:00
balpha
378b594b2d apparently discourse allows single-quoted attribute values in HTML; fix the lookahead in the PageDown auto-linker to account for that 2013-02-24 14:13:00 +01:00
balpha
1640616c06 PageDown update overwrote a discourse customization; put it back in 2013-02-24 13:52:46 +01:00
balpha
22caa7b6a8 merge upstream PageDown changes up to current revision c06c6e0d465e 2013-02-24 13:40:06 +01:00
Sam Saffron
47fedd8f4d correct breakage 
don't set permanent cookie, kill session if it conflicts
 2013-02-24 22:56:08 +11:00
Sam Saffron
b66db4153d refactor and organise current_user better 2013-02-24 21:42:04 +11:00
Sam
d42a87ec8a Merge pull request #235 from tms/autocomplete-right-away 
Tweak autocomplete/caret_position logic to not exclude the index 0 case
 2013-02-23 19:05:23 -08:00
Sam
7081b958b9 Merge pull request #239 from tms/avatar-should-be-glowier 
Make avatar glow more...glowier
 2013-02-23 19:03:55 -08:00
Sam
578a38dc27 Merge pull request #241 from tms/auth-token-revert 
Unsign auth token cookies per discussion on #215
 2013-02-23 19:03:25 -08:00
Sam Saffron
82e2fae1b8 isolate notifications in channel per user 2013-02-24 10:24:06 +11:00
tms
3e6641c07e Unsign auth token cookies per discussion on #215 2013-02-23 13:40:21 -05:00
tms
6cfcdfbfd7 Make avatar glow more...glowier 2013-02-23 10:37:06 -05:00
tms
3a0227f868 Tweak autocomplete/caret_position logic to not exclude the index 0 case 2013-02-22 23:47:23 -05:00
Jeff Atwood
cee3949850 add 3 and 4 minute opts to auto track pref 2013-02-22 13:15:41 -08:00
Jeff Atwood
9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Neil Lalonde
fc33c63585 EmailToken.active needs to check created_at too 2013-02-22 15:20:00 -05:00
Robin Ward
c3ba7b9741 Uncategorized doesn't have a topic url 2013-02-22 14:33:43 -05:00
Robin Ward
e2fed6fcef Merge pull request #229 from danneu/topic-patch 
make topics consume their own scope
 2013-02-22 10:59:07 -08:00
Robin Ward
1c5afc9686 Merge pull request #231 from shapkin/master 
Add english locale to page.
 2013-02-22 10:58:31 -08:00
Robin Ward
b2e9be68bd Suggested topics weren't using fancy titles 2013-02-22 13:48:07 -05:00
Robin Ward
532b1f5450 Can edit category descriptions, they show up in a title attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde
2d9942ceef Fix my jshint failures 2013-02-22 12:17:07 -05:00
Neil Lalonde
ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Robin Ward
45ab3ab892 JS refactoring that fixes presence errors in earlier reverted commit. 2013-02-22 11:00:47 -05:00
Alexander Shapkin
ee8825408b add english locale to page 2013-02-22 15:33:35 +04:00
Sam
4d99dc035e Merge pull request #228 from tms/i-knew-you-cared 
Collapse user activity items loaded from message bus
 2013-02-21 21:53:49 -08:00
Dan Neumann
65b59f8612 make Topic consume its own scope. 2013-02-21 21:22:02 -06:00
tms
b1c1053cf1 Collapse user activity items loaded from message bus 2013-02-21 22:14:58 -05:00
tms
8ec71657ea Help long titles wrap more cleanly 2013-02-21 21:33:59 -05:00
Sam Saffron
2b5be29d3c Revert "Remove old unused code." 
This reverts commit 6a617348e5.
 2013-02-22 10:57:11 +11:00
Robin Ward
588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00
Robin Ward
6a617348e5 Remove old unused code. 2013-02-21 16:17:56 -05:00
Robin Ward
c8a908e81a Remove some useless views 2013-02-21 15:55:58 -05:00
Neil Lalonde
2d1bbf22e9 Refactor functions out of the dashboard controller 2013-02-21 15:03:55 -05:00
Robin Ward
dd6d98f48f More documentation to Admin Controllers 2013-02-21 14:42:48 -05:00
Robin Ward
c1b5803486 Cleaned up admin JS, added YUIDoc headers to all admin classes. 2013-02-21 14:12:09 -05:00
Neil Lalonde
8620024798 Show which SHA is installed on the admin dashboard 2013-02-21 13:48:14 -05:00
Robin Ward
13f8f3c45e Cleaned up JS, added basic documentation support for Admin Controllers 2013-02-21 13:29:21 -05:00
Robin Ward
6096a447b7 Fix Regression: In reply to 2013-02-21 12:59:38 -05:00
Robin Ward
f6263749d4 Fix javascript regression with quoting 2013-02-21 12:54:40 -05:00
Robin Ward
c5393d93f3 Add icons and and archived style to categories list 2013-02-21 11:38:38 -05:00
Robin Ward
c3b03e3cb6 Show fancy title when you scroll down on topics 2013-02-21 11:21:10 -05:00
Robin Ward
42d996aae1 Show empty categories to those who can create them (admins/mods) 2013-02-21 10:43:10 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
84cb08e035 Merge pull request #215 from tms/auth-token-changes 
Sign the auth token cookie and make it httpOnly
 2013-02-21 07:14:15 -08:00
Régis Hanol
0884318207 update topic-progress z-index to show up in front 
of all other items (especially the read-icon)
 2013-02-21 14:59:35 +01:00
Sam Saffron
012941ea62 basic smoke test script 2013-02-21 16:01:40 +11:00
Sam Saffron
30f743e185 mobile fix 2013-02-21 16:01:40 +11:00
Robin Ward
26e1cfd12c rake jshint works 2013-02-20 19:09:27 -05:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See: 
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
 2013-02-20 19:01:13 -05:00
tms
5616fdc475 Sign the auth token cookie and make it httpOnly 2013-02-20 17:24:19 -05:00
Neil Lalonde
85f8f8f2d5 Better checking of blacklisted emails on create and when email is being updated 2013-02-20 16:25:08 -05:00
Neil Lalonde
6885e6cfa9 Fix login with google in IE9 2013-02-20 15:40:52 -05:00
Jeff Atwood
7ff7fe3d3c add css3 fade in/out transition to post menus 2013-02-20 12:36:07 -08:00
Neil Lalonde
046c330858 Changes to email_domains_blacklist shouldn't invalidate existing users 2013-02-20 12:16:16 -05:00
Régis Hanol
55c7ced2f3 corrected right-arrow html entity encoding 
when using a javascript-disabled browser
 2013-02-20 17:00:28 +01:00
Neil Lalonde
1dd882ea99 Fix admin dashboard version check losing its css styling 2013-02-20 10:37:51 -05:00
Alexander Shapkin
105ae2a174 fix spaces and use link_to instead of <a> tags 2013-02-20 12:08:22 +04:00
Sam
d81cd6eb80 Merge pull request #207 from danneu/validate-category-user-id 
validate category user_id presence to match DB constraint.
 2013-02-19 22:48:39 -08:00
Sam Saffron
a02414410f amazing the amount of damage a missing .js extension can cause 2013-02-20 17:17:05 +11:00
Sam Saffron
15c5f5b840 grrrrr asset pipeline hates me 2013-02-20 17:00:24 +11:00
Sam Saffron
ea7b97be34 missing localization on categories 2013-02-20 16:11:56 +11:00
Sam Saffron
70058c9ebe live reload bug 
minor sanity check for phone
 2013-02-20 16:11:56 +11:00
Sam Saffron
0c085059c9 added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies 
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
 2013-02-20 16:11:56 +11:00
Sam Saffron
a1099ed74e sanitize wip 2013-02-20 16:11:56 +11:00
Dan Neumann
37ca391f50 validate category user_id. 2013-02-19 21:24:38 -06:00
Jeff Atwood
2fdbf8cbc9 give us temporary breathing room on wide names 2013-02-19 16:03:03 -08:00
Neil Lalonde
e914222cb3 Add i18n for the version checking 2013-02-19 17:42:36 -05:00
Robin Ward
a1f8dcebd1 Custom messages for the footers of all list views 2013-02-19 17:39:34 -05:00
Neil Lalonde
3ca2d92b2f Fix the missing {{provider}} value message 2013-02-19 16:28:12 -05:00
Robin Ward
836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward
da59c15b72 Remove leftover sub-tag support. 2013-02-19 14:21:31 -05:00
Robin Ward
b7e027cfd1 Notifications on PMs respect access rights. 2013-02-19 12:59:46 -05:00
Robin Ward
928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward
ae9bee2a91 Merge pull request #172 from jeremybanks/master 
Do not strip leading and trailing whitespace from raw posts
 2013-02-19 08:15:39 -08:00
Robin Ward
8371ff058a Merge pull request #194 from tms/personal-space 
Added restricted route to kick out trespassers on user routes
 2013-02-19 08:08:18 -08:00
Sam Saffron
d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks
d42782b318 Using LengthValidator's localized messages for StrippedLengthValidator. 2013-02-18 21:57:46 -05:00
Jeremy Banks
eb2a5e4654 Merge branch 'origin/master' 
Conflicts:
	lib/text_sentinel.rb
 2013-02-18 21:41:20 -05:00
tms
d2a2ccdb09 Added restricted route to kick out trespassers on user routes 2013-02-18 21:05:12 -05:00
Sam Saffron
d520771c73 move stylesheet cache into the upload dir so its less crazy to sync across servers 2013-02-19 11:02:00 +11:00
Sam Saffron
3be7bde401 stop onebox rapid fire 2013-02-19 10:33:07 +11:00
Kevin Ansfield
1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron
b9698e8d2f fix loading message am message bus stuff 2013-02-18 19:37:12 +11:00
Sam Saffron
0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam
5265c0b790 Merge pull request #192 from tms/date-formatting 
Use consistent date formatting in date helpers
 2013-02-17 22:41:39 -08:00
Sam Saffron
d9a84ddd01 chuck git version at the bottom of the page 2013-02-18 17:39:54 +11:00
tms
65d71f87a6 Use consistent date formatting in date helpers 2013-02-18 00:28:19 -05:00
Jeremy Banks
6af69f7e77 Do not strip leading and trailing whitespace from raw posts. 2013-02-15 20:58:33 -05:00
Sam Saffron
985b5c59c3 missing h3 2013-02-16 12:27:30 +11:00
Sam Saffron
c81d07c44b clean up the topics footer so it does not flash and is localisable 2013-02-16 12:15:15 +11:00
Sam
8631a6850b Merge pull request #178 from danneu/update-stats-fix 
Category year/month/week stats shouldn't include deleted topics.
 2013-02-17 14:00:12 -08:00
Sam
e8b3821b41 Merge pull request #179 from tms/users-like-like-posts 
Users like like posts
 2013-02-17 13:57:52 -08:00
Sam
db66e9facc Merge pull request #181 from danneu/flags-i18n 
added "flagged_by" i18n
 2013-02-17 13:56:33 -08:00
Sam
1623197b05 Merge pull request #184 from tms/activity-stream-tweaks 
Improved action descriptions/links on user stream items
 2013-02-17 13:55:45 -08:00
Sam
c7fba796b6 Merge pull request #185 from tms/search-all-the-things 
Search all the things
 2013-02-17 13:53:58 -08:00
tms
20c723c4fb Fancy 404 should require access too 2013-02-17 15:26:47 -05:00
Jeff Atwood
fa9a2dda6d nav for /tos /privacy /faq pages, h2 anchors 2013-02-17 01:09:54 -08:00
tms
66d56a8b93 Correctly set the typeFilter when the user clicks "show more" 2013-02-17 02:21:49 -05:00
tms
fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00
Dan Neumann
72264e3034 added 'flagged_by' i18n. 2013-02-16 21:40:24 -06:00
Dan Neumann
fac75401ef category stats shouldn't include deleted topics. 2013-02-16 21:10:18 -06:00