Commit Graph

3710 Commits

Author SHA1 Message Date
Sam
77494e201a Merge pull request #1258 from elo7/pt_BR
Added pt_BR user.change key value
2013-07-28 22:18:37 -07:00
Sam
aa6c92922d SECURITY: correct our CSRF implementation to be much more aggressive 2013-07-29 15:13:13 +10:00
Sam
4a20d09523 distributed memoizer added to ensure absolute duplicate posts don't get through
in case of an absolute dupe just return the memoized post

This works around issues with wordpress being crazy
2013-07-29 12:25:19 +10:00
Sam
1e107fd68a mock redis for mock redis goodness 2013-07-29 12:23:21 +10:00
Sam
896e493531 don't ever delete unprocessable emails 2013-07-28 09:54:15 +10:00
a0cbbab37a FIX: Loading was broken on activity streams 2013-07-27 13:55:34 -04:00
3a861c0823 FIX: Allow clicks on @names 2013-07-27 13:18:37 -04:00
Sam
0320a5ae64 correct email styles 2013-07-27 08:09:32 +10:00
01a6b45231 FIX: Can click on your own links again 2013-07-26 17:29:43 -04:00
385b2fbde2 Some tests for the user stream 2013-07-26 17:09:54 -04:00
5d66f6ed8e Minor fixes. Link directoy to user activity to avoid a redirect. 2013-07-26 15:56:29 -04:00
e77ee1eaa8 Moved highestSeenByTopic to the Discourse.Session 2013-07-26 15:18:46 -04:00
894dc2c6fd Moved Discourse.ajax into a mixin. 2013-07-26 15:12:40 -04:00
20f3707fbe Moved Resolver to new File 2013-07-26 15:04:29 -04:00
773823c41f Remove Discourse.transient. Use a singleton for session data, it's a lot cleaner. 2013-07-26 14:59:28 -04:00
fca83cb185 Upgrade Ember to Fix CVE-2013-4170 2013-07-26 13:10:52 -04:00
c28b377494 Don't redirect to arbitrary URLs via link tracker 2013-07-26 12:14:11 -04:00
29519ece23 Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox
Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
2013-07-26 11:30:40 -04:00
d71e7cdfde Merge pull request #1254 from crob611/master
Prevent 'Quote reply' from appearing when using find in Chrome
2013-07-26 08:09:08 -07:00
f5cfcf2ece Merge pull request #1256 from abbat/master
Russian translation (actual version)
2013-07-26 08:04:50 -07:00
c9c68c2cb2 Show Edit buttons to staff on categories page again 2013-07-26 10:39:26 -04:00
234474af1b Fix 'undefined' in Create Category modal title 2013-07-26 10:31:56 -04:00
c73f22b515 added pt_BR key 2013-07-26 11:17:20 -03:00
d579e4c5d5 Prevent category badges from wrapping on white space 2013-07-26 10:11:00 -04:00
ce8d69ccf1 Russian translation (actual version) 2013-07-26 14:35:59 +04:00
Sam
d51dcd1705 improve email styling, include extra respond link 2013-07-26 17:27:46 +10:00
Sam
85389e8b86 spec for trashable 2013-07-26 14:41:58 +10:00
Sam
809594c00a correct ScreenTrack so it properly flushes everything that happened on stop and resets on start 2013-07-26 14:41:46 +10:00
d25d1f777c Prevent 'Quote reply' from appearing when using find in Chrome 2013-07-25 22:57:03 -05:00
d7d3be1130 Add audio onebox
http://meta.discourse.org/t/audio-html5-tag/8168
2013-07-25 19:03:23 -07:00
cc79d22f82 Version bump to v0.9.5.1 v0.9.5.1 2013-07-25 17:16:13 -04:00
509850fb74 Merge branch 'master' of github.com:discourse/discourse 2013-07-25 16:07:11 -04:00
9edd163228 Oops, left in another console.log :) 2013-07-25 16:06:58 -04:00
2d3cf67350 Merge pull request #1252 from jetaggart/patch-1
Update DEVELOPER-ADVANCED.md
2013-07-25 13:05:39 -07:00
e94cab090a Merge pull request #1251 from johand/updating_es_locale
updating the spanish translation in client.es.yml
2013-07-25 13:05:08 -07:00
0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Sam
3f5ea1ef79 oops ... I keep forgetting to run qunit, really need to get it into autospec 2013-07-25 12:06:02 +10:00
Sam
589e9916f2 fix so some half working locales boot 2013-07-25 11:25:30 +10:00
Sam
e922f10f4e correct locale helper so it falls back to english message format if mf is missing 2013-07-25 11:16:07 +10:00
Sam
d0f50cb266 fixing up moment locales, they were not set up properly 2013-07-25 11:09:29 +10:00
1b02a7c580 missing semi colon 2013-07-24 17:32:07 -04:00
8408795093 Support for default User Index 2013-07-24 17:18:10 -04:00
Sam
9351a7bcb1 Merge pull request #1244 from stephankaag/rails4updates
Rails 4 updates
2013-07-24 14:16:32 -07:00
9132931aa9 Use {{outlets}} for user activity views so we can swap some out. 2013-07-24 15:54:02 -04:00
6f58c75243 Update DEVELOPER-ADVANCED.md
A bit of help for running a fresh install on Linux.
2013-07-24 20:33:23 +01:00
f99acebdaa Rails 4 updates 2013-07-24 21:09:18 +02:00
e0b9117f15 Fix for emails with empty body 2013-07-24 15:07:51 -04:00
2319a824f8 Special work to never include previous posts in parsed emails. Also a new attempt
to catch reply strings in different languages.
2013-07-24 14:22:32 -04:00
cca9473c55 updating the spanish translation in client.es.yml 2013-07-24 04:43:53 -04:30
Sam
0a7bbb08e1 fix broken build 2013-07-24 17:24:55 +10:00