Commit Graph

22626 Commits

Author SHA1 Message Date
Robin Ward da79d6a8ed Merge pull request #122 from cjbell88/fix_minor_button_cut_off
Fix 1px button cut off on topic progress up / down buttons.
2013-02-11 14:48:15 -08:00
Robin Ward 592531be28 Merge pull request #109 from tms/topic-reply-button-state
Disable reply button on archived/closed topics
2013-02-11 14:42:19 -08:00
Robin Ward 7746a4576d Fixes: Bug concatenating string URL with integer id 2013-02-11 16:18:15 -05:00
Robin Ward 57049b55a2 Little things:
- Retries on deadlock when calculating average time
- Removes Warning: When specifying html format for errors
- Doesn't use manual SQL to update user's ip address
2013-02-11 15:47:28 -05:00
Robin Ward 6ce32b8bc4 Trivial: Was not finding files in public for errors due to missing extensions. 2013-02-11 14:39:26 -05:00
Robin Ward 7375566213 Merge pull request #119 from xdite/refactor_topic_view
Refactor topic view
2013-02-11 10:30:30 -08:00
Robin Ward 238aa0d007 Merge pull request #121 from xdite/refactor_application_layout
Refactor application layout
2013-02-11 10:28:09 -08:00
Robin Ward 10c12d05b3 iOS autocomplete bug fix - don't follow link to # 2013-02-11 12:48:34 -05:00
Robin Ward 09e53c72d4 Changed our minds: Let's track internal links, just never to users. Something like FAQ is useful. 2013-02-11 12:36:33 -05:00
Neil Lalonde c18b85873f Prevent login until email is confirmed 2013-02-11 11:18:37 -05:00
Robin Ward f21609fe2e Don't track links within discourse unless they're to other topics. 2013-02-11 11:11:48 -05:00
Chris Bell 240a290422 Fix 1px button cut off on topic progress up / down buttons. 2013-02-11 12:08:50 +00:00
xdite 4175341b26 move stylesheet 2013-02-11 19:41:23 +08:00
xdite c3fd34985d move discourse javascript setting 2013-02-11 19:37:23 +08:00
xdite c95629a781 move google analytics to partial 2013-02-11 19:34:14 +08:00
xdite 00883842f4 render_topic_next_page_link 2013-02-11 19:18:17 +08:00
xdite 0f54dbb36e use render_topic_title to replace plain link_to 2013-02-11 19:16:08 +08:00
xdite b609060455 use link_to to replace a href 2013-02-11 19:13:04 +08:00
Sam Saffron 3047d8afa3 Merge branch 'master' of github.com:discourse/discourse 2013-02-11 19:01:52 +11:00
Sam Saffron f68f59c24f setting to exclude rel nofollow from particular domains 2013-02-11 18:58:19 +11:00
Sam 6d49c35eb5 Merge pull request #115 from tms/stop-talking-to-yourself
Prevent UI from suggesting you can message yourself
2013-02-10 23:39:52 -08:00
tms ee3d01af1c Prevent UI from suggesting you can message yourself 2013-02-11 02:12:53 -05:00
Sam Saffron 80929ead4b security hole fixed 2013-02-11 17:28:21 +11:00
Sam Saffron 1c12c91d0c forgot to skip a filter 2013-02-11 17:14:36 +11:00
Sam Saffron 3f7a711dd6 I thought this would work but it fails horribly Revert "update markdown converter from showdown source, handles trailing parens etc."
This reverts commit e55b713c59.
2013-02-11 15:54:26 +11:00
tms 29d2f04d87 Disable reply button on archived/closed topics 2013-02-10 23:39:09 -05:00
Sam Saffron 4b92cfe80f Merge branch 'master' of github.com:discourse/discourse 2013-02-11 15:38:26 +11:00
Sam Saffron e55b713c59 update markdown converter from showdown source, handles trailing parens etc. 2013-02-11 15:37:42 +11:00
Sam 14fd671914 Merge pull request #110 from tms/share-box-zindex
Reduce z-index on reply tab so it's below the share box
2013-02-10 20:05:09 -08:00
tms a07adc01bc Reduce z-index on reply tab so it's below the share box 2013-02-10 22:36:24 -05:00
Sam Saffron a6fc46599f Merge branch 'master' of github.com:discourse/discourse 2013-02-11 11:43:20 +11:00
Sam Saffron 543845c673 rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default. 2013-02-11 11:43:07 +11:00
Sam 8eed88da27 Merge pull request #108 from tms/searchbox-key-interceptions
Prevent click from being trapped in the editor field
2013-02-10 16:36:43 -08:00
Sam Saffron c50a9e4d01 added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false 2013-02-11 11:02:57 +11:00
tms 0dc5b9be39 Prevent click from being trapped in the editor field 2013-02-10 18:36:11 -05:00
Sam Saffron 8250586306 add to_date so its more explicit 2013-02-11 09:11:02 +11:00
Sam 1264f628c8 Merge pull request #104 from kubabrecka/fix_non_us_locale
fix user listing and search on non-US locale
2013-02-10 14:08:13 -08:00
Sam Saffron c06f1438d3 ilike is slow in theory, unless some sophisticated index is in place 2013-02-10 23:47:04 +11:00
Sam Saffron af810f38dd UserSearch refactor
Added .sql_builder to all AR models
2013-02-10 23:37:24 +11:00
Sam Saffron 6fb78809c2 better support for multi host in site customization 2013-02-10 23:05:11 +11:00
Kuba Brecka d0c1d94918 fix user listing and search on non-US locale 2013-02-10 12:18:11 +01:00
Sam 4b0eec334f Merge pull request #101 from tms/profile-stream-cleanup
Tweaked profile stream activity entries
2013-02-09 21:46:39 -08:00
tms 86d8326e30 Allow forcing username as image title when generating avatar 2013-02-10 00:12:27 -05:00
tms 9e653ad370 Show "You" to same-user on activity stream items 2013-02-09 23:44:03 -05:00
Sam ca0c4926f6 Merge pull request #99 from tms/firefox-placeholders
Prevent Firefox from using the wrong placeholder colour
2013-02-09 19:53:35 -08:00
tms f6b4d0d57a Swap name / title in activity stream, link post number 2013-02-09 22:33:07 -05:00
tms a588939d81 Prevent Firefox from using a more-specific text color definition in place of the placeholder color 2013-02-09 20:04:01 -05:00
Jeff Atwood c2bac8358e update /faq more after sleeping on it 2013-02-09 12:57:34 -08:00
Jeff Atwood bfb28b3d54 add local greyscale dev logos 2013-02-09 12:32:53 -08:00
Robin Ward 272a1e567f Merge pull request #92 from gammons/master
Factored out @post.revise into a new PostRevisor class
2013-02-09 08:13:12 -08:00
Grant Ammons 701ecddac2 factor out @post.revise into its own class. clean up PostRevisor class to be more readable 2013-02-09 10:33:25 -05:00
Kuba Brecka 12fa6e9a4e correct noscript link to next page 2013-02-09 14:12:31 +01:00
Jeff Atwood f44dba5fc5 edit id anchors on /faq 2013-02-09 03:46:41 -08:00
Jeff Atwood 99f1d40748 Omit Needless Words, again 2013-02-09 03:38:40 -08:00
Jeff Atwood c868283813 li height, copy on /faq 2013-02-09 03:22:03 -08:00
Jeff Atwood 6af0d0789c correct TOS links, correct ul/li body-page style 2013-02-09 02:50:13 -08:00
Jeff Atwood 5d21745dcf minor /faq improvements, Omit Needless Words 2013-02-09 02:41:27 -08:00
Jeff Atwood 91b306d159 normalize on H2 in FAQs, copyedits 2013-02-09 01:32:08 -08:00
Jeff Atwood a03676ac62 simplify faq/tos/privacy HTML and CSS 2013-02-09 01:20:57 -08:00
Robin Ward 03a798b202 Can clear flags on deleted posts if you're a moderator 2013-02-08 19:07:29 -05:00
Robin Ward 33757c201a Twitter logins were broken. 2013-02-08 17:57:01 -05:00
Robin Ward 7c11c3fe0f Can edit deleted posts. 2013-02-08 17:49:15 -05:00
Robin Ward 25e9cfe3b8 Remove the distinction between "x replies below" and "x replies" 2013-02-08 17:10:18 -05:00
Robin Ward 12d3c3b66b Enforce entropy on flag text 2013-02-08 17:01:43 -05:00
Neil Lalonde 1635d8e553 Add email_blacklist_regexp to site settings. Not implemented yet. 2013-02-08 16:31:21 -05:00
Robin Ward db0c73e874 Replace all those `deleted_at`s with `acts_as_paranoid` 2013-02-08 16:16:09 -05:00
Robin Ward 50ef0c16bb Removed most manual SQL from PostAction 2013-02-08 16:16:03 -05:00
Neil Lalonde d73baa23dd Better username change validation messages 2013-02-08 16:08:45 -05:00
Neil Lalonde d1a04fa06a Enforce max username length on client 2013-02-08 16:08:45 -05:00
Jeff Atwood 24cf672c7d need word-wrap:break-word on preview 2013-02-08 12:07:32 -08:00
Neil Lalonde ce7088f081 check_username api now returns correct error message for invalid lengths etc 2013-02-08 14:12:48 -05:00
Cyril Mougel 84191802df Extract the validation of Username format in own class to avoid
complexity in user model object
2013-02-08 12:54:47 -05:00
tms b502a40b36 Button container should be no wider than suggested topics
The button container sticks out farther than necessary because of the
left margin, causing unnecessary horizontal scrolling at supported
resolutions
2013-02-07 21:18:22 -05:00
Neil Lalonde 79dfccf717 Username validation in signup and username change forms 2013-02-07 18:23:52 -05:00
Robin Ward 2c8c602086 Always show username on hover, unless there's something else more interesting to say. 2013-02-07 17:41:32 -05:00
Sam Saffron 14a807f433 Merge branch 'master' of github.com:discourse/discourse 2013-02-08 08:50:08 +11:00
Sam Saffron 470ecf97cc I have no objection to the removing of haml, but breaking our templates ... bad 2013-02-08 08:49:58 +11:00
Robin Ward 2d064571df Fixes some minor issues with users deleting their own posts. 2013-02-07 16:42:31 -05:00
Jeff Atwood b8ded55450 a few minor copyedits, 1px adjust 2013-02-07 13:41:33 -08:00
Robin Ward 63c0fdda44 Merge pull request #57 from blowmage/user_search_refactor
Refactor UserController#search_users
2013-02-07 12:38:39 -08:00
Robin Ward e98fb5592d Delete button on OP deletes topic 2013-02-07 15:31:53 -05:00
Robin Ward 084a873b91 Give regular users a delete button. If they click it, their post will be revised to
say it was deleted.
2013-02-07 15:14:23 -05:00
Jeff Atwood af11547108 shift post metadata closer to post 2013-02-07 11:56:22 -08:00
Jeff Atwood 18b0be7a3a need break-word on user page excerpts 2013-02-07 11:45:20 -08:00
Mike Moore d72c26ff92 Refactor UserSearch tests 2013-02-07 09:35:38 -07:00
Mike Moore e41b6537f9 Remove expectation of term case 2013-02-07 09:35:38 -07:00
Mike Moore 5b01ac9288 Return User objects instead of hashes 2013-02-07 09:35:38 -07:00
Mike Moore 1cd565ec0d Extract SQL generation method 2013-02-07 09:35:38 -07:00
Mike Moore 972b9d735c Extract search logic to UserSearch model 2013-02-07 09:35:38 -07:00
Jakub Arnold 61654ab8f0 Fix all the trailing whitespace 2013-02-07 16:45:24 +01:00
Robin Ward 1839614bcc Merge pull request #36 from fenprace/master
Remove some gems in the Gemfile
2013-02-07 07:09:28 -08:00
Sam Saffron 4fcd924797 I committed a regression around multi site today and site customization, added tests so it don't happen again 2013-02-08 00:55:04 +11:00
Sam Saffron 168bb01439 allow for empty headers properly 2013-02-07 18:25:18 +11:00
Sam Saffron 85973ce6b0 added delete all posts button
wired up the ability to enable all themes
2013-02-07 18:11:56 +11:00
Sam Saffron 8f4417f962 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 16:00:55 +11:00
Sam Saffron 7b123e12dd improving flag handling, links and delete button 2013-02-07 16:00:40 +11:00
Sam Saffron c7461622a9 admins can now clear flags inline 2013-02-07 15:15:48 +11:00
Robin Ward 7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
Robin Ward 40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
Sam Saffron 554ba7b676 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 12:32:39 +11:00
Sam Saffron 7cdf1266ad remove unused var 2013-02-07 12:32:29 +11:00
Neil Lalonde 471c61fd69 Add honeypot and challenge to signup form 2013-02-06 19:25:36 -05:00
Sam Saffron f79f0e740a Don't allow users to double flag stuff
Correct seed fu to match model
2013-02-07 10:45:58 +11:00
Robin Ward 94e58d733e Add moderator style while in topic 2013-02-06 17:36:07 -05:00
Robin Ward c4b1c10955 Merge pull request #25 from mlinksva/patch-1
Update app/views/static/faq.html.erb
2013-02-06 13:27:39 -08:00
Robin Ward c24e1122b6 Merge pull request #39 from bendoerr/patch-1
Split -vendor-placeholder selector by vendor.
2013-02-06 13:24:38 -08:00
Robin Ward c77dea41b8 Merge pull request #7 from mutewinter/fix_at_dot
Removed unnecessary @.'s
2013-02-06 13:22:13 -08:00
Robin Ward 8c54a97800 Merge pull request #33 from sebasoga/remove_empty_helpers
Remove empty helpers
2013-02-06 13:20:54 -08:00
Robin Ward 2d2b907d2c Temporary Nuclear option on topic titles - disallow non ascii characters so we
can stay on top of the trolls. This is meant to be replaced soon with a more
permissive and safe method of sanitizing.
2013-02-06 15:47:36 -05:00
Robin Ward 2ce69c73eb Use double quotes in image uploads instead of single quotes. Our sanitizer seems to
hate single quotes.
2013-02-06 14:27:11 -05:00
Ben Doerr 77908ed3d8 Split -vendor-placeholder selector by vendor.
Some browsers (specifically Firefox(18) that I know of) fail to select
correctly if the selectors are combined. This was fixed in bootstrap
(https://github.com/twitter/bootstrap/blob/master/less/forms.less#L210).
Not sure of the exact commit but there is a nice comment.
2013-02-06 12:39:15 -05:00
Robin Ward 6043a370ad Oops, that should be 1.minute 2013-02-06 12:07:22 -05:00
Robin Ward 8d568b05c4 Don't enable Cache-Control if the site has restricted access. 2013-02-06 11:55:54 -05:00
Prace Fen b60be8889f Remove some gems because they are never used in this project. 2013-02-06 22:48:55 +08:00
Sebastian Sogamoso 24584ae916 Remove empty helpers 2013-02-06 08:32:41 -05:00
Jeff Atwood 27e1a81b34 increase default max_likes_per_day to 30 2013-02-06 00:32:46 -08:00
Mike Linksvayer 28c25940d2 Update app/views/static/faq.html.erb
remove example.com from example.com/tos
2013-02-05 22:48:55 -08:00
Sam Saffron 2e3bcec5c7 also for about me 2013-02-06 17:24:49 +11:00
Sam Saffron d4bc423320 hook up sanitizer 2013-02-06 17:22:11 +11:00
Sam Saffron 31c5859bbe Merge branch 'master' of github.com:discourse/discourse 2013-02-06 16:28:38 +11:00
Sam Saffron 0f88947279 fix onebox for your own site 2013-02-06 16:22:11 +11:00
Andy 66022f9faa Updated email hash to Gravatar specifications
Gravatar email hashes have two requirements:
* Whitespace must be trimmed
* Email should be downcased
2013-02-05 21:16:15 -07:00
Sam Saffron 6f2f7b0589 flagging work, we should be clearing from the mod menu if a topic or post is deleted 2013-02-06 12:13:41 +11:00
Sam Saffron 3fd019c6bd fix firefox focus bug on flagging dialog 2013-02-06 11:47:08 +11:00
Jeremy Mack 87ff4373f5 Removed unnecessary @.'s
Since CoffeeScript automatically converts @ to this. when immediately followed by a character.
2013-02-05 15:59:17 -05:00
Robin Ward 21b5628528 Initial release of Discourse 2013-02-05 14:16:51 -05:00