Robin Ward
e0a66d0d19
Merge pull request #102 from charlesroper/patch-1
...
Update DEVELOPMENT.md
2013-02-11 14:47:47 -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
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 #128 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 #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
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 #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
Edward Ocampo-Gooding
b7a76cbd24
Consistency in SQL style
2013-02-11 01:03:21 -05: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 Saffron
374820ae8b
not required there, if anything should go in the initializer
2013-02-11 15:13:40 +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
004d4bf4e1
Merge branch 'master' of github.com:discourse/discourse
2013-02-11 11:03:08 +11: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
Robin Ward
0dcba67a7e
Merge pull request #98 from blom/define_method
...
Use define_method instead of eval-ing a string
2013-02-10 14:15:48 -08: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
