codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-11 16:21:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3694 commits 7 branches 179 tags 87 MiB
Commit graph

3694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Ward
fca83cb185 Upgrade Ember to Fix CVE-2013-4170 2013-07-26 13:10:52 -04:00
Robin Ward
c28b377494 Don't redirect to arbitrary URLs via link tracker 2013-07-26 12:14:11 -04:00
Robin Ward
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
Robin Ward
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
Robin Ward
f5cfcf2ece Merge pull request #1256 from abbat/master 
Russian translation (actual version)
 2013-07-26 08:04:50 -07:00
Neil Lalonde
c9c68c2cb2 Show Edit buttons to staff on categories page again 2013-07-26 10:39:26 -04:00
Neil Lalonde
234474af1b Fix 'undefined' in Create Category modal title 2013-07-26 10:31:56 -04:00
Neil Lalonde
d579e4c5d5 Prevent category badges from wrapping on white space 2013-07-26 10:11:00 -04:00
Anton Batenev
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
Corey Robertson
d25d1f777c Prevent 'Quote reply' from appearing when using find in Chrome 2013-07-25 22:57:03 -05:00
James Anderson
d7d3be1130 Add audio onebox 
http://meta.discourse.org/t/audio-html5-tag/8168
 2013-07-25 19:03:23 -07:00
Neil Lalonde
cc79d22f82 Version bump to v0.9.5.1 2013-07-25 17:16:13 -04:00
Robin Ward
509850fb74 Merge branch 'master' of github.com:discourse/discourse 2013-07-25 16:07:11 -04:00
Robin Ward
9edd163228 Oops, left in another console.log :) 2013-07-25 16:06:58 -04:00
Robin Ward
2d3cf67350 Merge pull request #1252 from jetaggart/patch-1 
Update DEVELOPER-ADVANCED.md
 2013-07-25 13:05:39 -07:00
Robin Ward
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
Robin Ward
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
Robin Ward
1b02a7c580 missing semi colon 2013-07-24 17:32:07 -04:00
Robin Ward
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
Robin Ward
9132931aa9 Use {{outlets}} for user activity views so we can swap some out. 2013-07-24 15:54:02 -04:00
Jeff Taggart
6f58c75243 Update DEVELOPER-ADVANCED.md 
A bit of help for running a fresh install on Linux.
 2013-07-24 20:33:23 +01:00
Stephan Kaag
f99acebdaa Rails 4 updates 2013-07-24 21:09:18 +02:00
Neil Lalonde
e0b9117f15 Fix for emails with empty body 2013-07-24 15:07:51 -04:00
Robin Ward
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
Johan
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
Sam
366cb13140 restyle all user notification emails to use a custom html template 2013-07-24 17:24:55 +10:00
Sam
cb5ce3aab9 Merge pull request #1247 from sir-pinecone/strip-spaces-from-login 
Strip leading/trailing spaces from login
 2013-07-24 00:16:55 -07:00
Sam
880dd53f48 Merge pull request #1249 from sir-pinecone/strip-spaces-from-group 
Strip spaces from group names upon creation
 2013-07-24 00:15:53 -07:00
Sam
a09c9f08a8 Merge pull request #1250 from sir-pinecone/display-group-save-errors 
display group validation errors in alert modal
 2013-07-23 22:39:23 -07:00
Michael Campagnaro
867ce0310c display group validation errors in alert modal 2013-07-24 00:42:44 -04:00
Michael Campagnaro
b223cdb493 Strip spaces from group names upon creation 2013-07-24 00:00:17 -04:00
Michael Campagnaro
25f8692a79 Strip leading/trailing spaces from login 2013-07-23 23:03:38 -04:00
Sam
38b8e9b1b4 get rake autospec working in rails 4 2013-07-24 11:49:26 +10:00
Sam
f2a3719140 Merge pull request #1245 from ZogStriP/server-side-file-size-check 
add server-side filesize check on uploads
 2013-07-23 17:28:12 -07:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Robin Ward
75491d2cf6 remove console.log 2013-07-23 18:03:35 -04:00
Robin Ward
284b32967b Merge pull request #1243 from trident523/patch-1 
Need to define which ruby to use before installing gems in Docs
 2013-07-23 14:22:15 -07:00
Robin Ward
82465caf97 Clean up user activity code in preparation for topic rendering 2013-07-23 17:01:43 -04:00
Robin Ward
c9c6a8fd9d User stream now uses eyeline for loading more content. 2013-07-23 16:06:26 -04:00
Neil Lalonde
44bebf255d Fix layout of category badges on categories page and in combobox 2013-07-23 15:05:37 -04:00
Robin Ward
96af490d7c FIX: Deleting posts in bulk was broken. 2013-07-23 14:59:05 -04:00