Commit Graph

19901 Commits

Author SHA1 Message Date
Robin Ward 7ca57db97a Merge branch 'onebox-safety' of git://github.com/tms/discourse 2013-02-19 13:10:52 -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
tms 1a0b23fd2b Allow oneboxers to specify their simple_onebox text is unsafe 2013-02-19 12:06:35 -05:00
tms 6d06420583 Be more selective about when we allow oembed discovery 2013-02-19 11:46:36 -05:00
Robin Ward 73cac65d3a Merge pull request #195 from merugear/master
Updated Dutch Locale
2013-02-19 08:21:05 -08: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
merugear 6ad9fc7049 Changed quotes
I used " -quotes in the text, which didn't escape properly. Ran it through a YAML linter and it seems to validate.
Sorry for the inconvenience!
2013-02-19 12:49:18 +01:00
merugear dd302a6366 Updated, removing tabs and whitespaces. Changed 'en' to 'nl'
Sam: could you try this one instead? Forgot to change 'en' to 'nl' Cheers.
2013-02-19 12:36:06 +01:00
Sam Saffron d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks 91f9844211 Include /^http… prefix in onebox whitelist URLs regexes to prevent XSS. 2013-02-19 01:49:58 -05: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 14c0b96d55 going to start using image_optim in prd for image sizing 2013-02-19 11:42:05 +11: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
mquandalle ef76a8db66 Split fr.yml into client.fr.yml + server.fr.yml 2013-02-19 00:08:13 +01:00
Sam 82132ab48b Merge pull request #167 from kevinansfield/missing-i18n-image-uploading
Replace plain text in composer template
2013-02-18 14:25:33 -08:00
Sam 30a8a13484 Merge pull request #196 from ZogStriP/patch-5
changed links to localhost to clickable ones
2013-02-18 14:24:27 -08:00
mquandalle 4cab57a2eb Create fr.yml
Add french translation.
2013-02-18 13:30:27 -08:00
Régis Hanol 859a6e18b5 changed links to localhost to clickable ones 2013-02-18 19:44:11 +01:00
merugear c338760f6e Split from nl.yml, updated and ran spellcheck 2013-02-18 10:27:10 -08:00
merugear d5d48d3ee0 Split from nl.yml, updated and ran spellcheck
As suggested by Jeff, I updated the files to match the updated format of client/server seperated code.
2013-02-18 10:19:49 -08:00
Kevin Ansfield 1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron dee014210e trigger a build, travis segfaulted 2013-02-18 19:59:15 +11: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
Sam Saffron 87b929eac6 added secret token warning in prd
added task to stamp builds
2013-02-18 17:34:43 +11:00
tms 65d71f87a6 Use consistent date formatting in date helpers 2013-02-18 00:28:19 -05:00
Sam Saffron cb0e53e701 more work in progress, message bus diags 2013-02-18 15:27:44 +11:00
Sam Saffron 1228e351a8 a much more basic but robust restart watcher,
removed the pid stuff cause it needs to be a lot more careful not to think
pids from other machines restarted. robust working code is better than
complex graceful broken code.
2013-02-16 13:54:23 +11: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 c95e1b644c fix tests 2013-02-16 12:26:10 +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 Saffron ff0d58e4ee message bus work in progress 2013-02-16 12:14:52 +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 53539aa799 Merge pull request #182 from danneu/guide-typo
fixed guide download link
2013-02-17 13:56:15 -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
Sam bc1f8244e4 Merge pull request #186 from tms/oneboxes-shouldnt-explode
Oneboxes shouldn't explode when the remote causes an HTTPError
2013-02-17 13:52:40 -08:00
Sam df63a3c516 Merge pull request #187 from tms/blog-onebox-tweaks
Have oneboxer default to page title when og:title is missing
2013-02-17 13:51:43 -08:00
Sam 6cd115b7b9 Merge pull request #189 from tms/get-off-my-lawn
Fancy 404 should require access too
2013-02-17 13:49:06 -08:00
Shawn Holmes 3c97cda8e4 Update docs/VAGRANT.md
- added a subsection for Windows users on what they need to do in lieu of 'vagrant ssh' not working on the Win platform.
2013-02-17 14:11:57 -07:00