Commit graph

18008 commits

Author SHA1 Message Date
Sam
4668cf1d54 Merge pull request from edward/patch-1
Consistency in SQL style
2013-02-12 00:11:59 -08:00
Sam Saffron
925925817f remove old buggy code see: http://meta.discourse.org/t/quoted-you-emails/2226/3
notify by display name is silly, display name is not unique in the system
2013-02-12 18:49:57 +11:00
Sam Saffron
99526c33da emoji should not be coupled into the core
avatars were being counted and should not have been for basic users
2013-02-12 18:43:48 +11:00
Sam Saffron
bdba0a78c4 scaffolding for message bus diags 2013-02-12 18:01:38 +11:00
Sam Saffron
818b84f02c we are using structure.sql having this around only causes confusion 2013-02-12 15:17:33 +11:00
Sam Saffron
c1f093d48b Merge branch 'master' of github.com:discourse/discourse 2013-02-12 15:06:48 +11:00
Sam Saffron
878fcd2c61 sketchy logo, so our techincolor logo is not sprawled across the web leading to confusion 2013-02-12 15:06:34 +11:00
Sam
6e74b4fb0c Merge pull request from danneu/slug-refactoring
Lean on Inflector for slug transliteration.
2013-02-11 19:31:16 -08:00
Sam Saffron
ad88487a32 Merge branch 'master' of github.com:discourse/discourse 2013-02-12 13:45:24 +11:00
Sam Saffron
2b276bc2c8 gist oneboxer issues 2013-02-12 13:45:08 +11:00
Sam Saffron
2609350457 sample bluepill config 2013-02-12 13:44:44 +11:00
Dan Neumann
50cf8cd4d5 Set up slug.rb for obvious method extractions. 2013-02-11 20:36:54 -06:00
Dan Neumann
9daf53df73 lean on Inflector transliteration 2013-02-11 20:34:38 -06:00
Jeff Atwood
ecbaa45736 remove extraneous text on PM summary 2013-02-11 16:14:44 -08:00
Jamie Hoyle
07f30d445a Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss 2013-02-11 22:59:13 +00:00
Grant Ammons
f3dc93a0db WIP, a very nice refactoring of TopicsController#show 2013-02-11 17:54:56 -05:00
Robin Ward
e033213f84 Merge pull request from danneu/plugin-registry-patch
Extracted default value initializers.
2013-02-11 14:50:09 -08:00
Robin Ward
da79d6a8ed Merge pull request 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
e0a66d0d19 Merge pull request from charlesroper/patch-1
Update DEVELOPMENT.md
2013-02-11 14:47:47 -08:00
Robin Ward
592531be28 Merge pull request from tms/topic-reply-button-state
Disable reply button on archived/closed topics
2013-02-11 14:42:19 -08:00
Robin Ward
41e621bf3b Merge branch 'topic-reply-button-state' of https://github.com/tms/discourse 2013-02-11 17:39:23 -05:00
Robin Ward
7746a4576d Fixes: Bug concatenating string URL with integer id 2013-02-11 16:18:15 -05:00
Robin Ward
74220b4194 Don't update the current ip to an empty string 2013-02-11 16:01:53 -05:00
Robin Ward
60ccb5ecf5 Merge pull request from alxndr/master
Typo fix
2013-02-11 12:57:04 -08:00
Alexander
ab9cb9cf5b Typo fix 2013-02-11 12:49:23 -08: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
0f5ac91bbc Update Gems to address CVE-2013-0276, CVE-2013-0277 and CVE-2013-0269 2013-02-11 14:03:54 -05:00
Robin Ward
7375566213 Merge pull request from xdite/refactor_topic_view
Refactor topic view
2013-02-11 10:30:30 -08:00
Robin Ward
238aa0d007 Merge pull request 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
4e87289249 Add sidekiq instructions in DEVELOPMENT.md 2013-02-11 11:42:25 -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
Robin Ward
37fa61ab51 Merge branch 'master' of github.com:discourse/discourse 2013-02-11 10:37:44 -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
Régis Hanol
70a78e3de7 Added code climate status image 2013-02-11 11:48:04 +01:00
Sam Saffron
3047d8afa3 Merge branch 'master' of github.com:discourse/discourse 2013-02-11 19:01:52 +11:00
Sam Saffron
fd5f949116 formatting 2013-02-11 19:01:33 +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 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