Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,399 Commits 181 Branches 498 Tags 917 MiB
Commit Graph

2399 Commits

Author SHA1 Message Date
Robin Ward 55526e24d6 FIX: The `title` attribute was missed when refactoring UserAction streams 2013-05-28 10:20:56 -04:00
Robin Ward f2fb1f75fc Merge pull request #909 from netzpirat/update-german-translations 
Update German translations
 2013-05-28 07:00:30 -07:00
Michael Kessler 95c4d4edbc Add missing API translations. 2013-05-28 13:15:05 +02:00
Michael Kessler 2ddb2f76c8 Update German translations. 2013-05-28 13:00:33 +02:00
Sam c32399a80b added test condition that fails with latest AM serializer 2013-05-28 10:42:04 +10:00
Sam 88972b99a5 refactor 2013-05-28 09:48:47 +10:00
Sam d2f2a8e218 refactoring 2013-05-28 09:13:53 +10:00
Sam bf4bdbefe0 fix redis leak in rate limiter 
change key name so there is no overlap with old non-list key
 2013-05-28 08:58:45 +10:00
Robin Ward b73bb49076 FIX: More search results was broken. 2013-05-27 17:49:49 -04:00
Robin Ward f69ef8c42e Merge pull request #906 from ZogStriP/keep-french-l10n-up-to-date-2013-05-27 
keep French localization up to date
 2013-05-27 13:37:27 -07:00
Robin Ward d1405a9ed9 Merge pull request #907 from ZogStriP/fix-you-cant-change-a-subject-whilst-flagging 
FIX: You can't change a subject whilst Flagging
 2013-05-27 13:36:59 -07:00
Neil Lalonde ed1b0ed0f1 Send user_count and a better url for your forum with the version check request 2013-05-27 16:30:11 -04:00
Régis Hanol f184090444 FIX: You can't change a subject whilst Flagging 
Meta: [You can't change a subject whilst Flagging](http://meta.discourse.org/t/you-can-t-change-a-subject-whilst-flagging/6887)

This revert a change made by @eviltrout in b794830a25 in the `flag_view.js`.
The `Em.run.schedule('afterRender', function() {...})` is apparently not enough. Had to schedule the event on the next run loop.

Hopefully, the PR emberjs/ember.js#1235 will soon be merged in and we'll have a proper radio button control in Ember.js.
 2013-05-27 22:29:24 +02:00
Régis Hanol 402af452c2 keep French localization up to date 
🇫🇷
 2013-05-27 21:29:26 +02:00
Robin Ward 20e88f18ee FIX: Removes some duplicates in search results when the search context is a user. 2013-05-27 15:18:55 -04:00
Robin Ward 62a20f5655 FIX: Couldn't access "Uncategorized" category from category list. 2013-05-27 14:15:52 -04:00
Neil Lalonde b1ef2ea1e1 Fix TopicPostersSummary when a suggested topic includes a user who has been deleted 2013-05-27 14:12:15 -04:00
Robin Ward 197909246c Weigh staff likes higher when calculating scores. New site setting: `staff_like_weight` 
can set the factor (default is 3)
 2013-05-27 12:46:08 -04:00
Neil Lalonde 8b0b77c161 Bounce the popup tips again when you click submit button again 2013-05-27 11:51:27 -04:00
Robin Ward 1879176e80 FIX: Invited by link was broken on user activity. 2013-05-27 11:05:41 -04:00
Robin Ward 7d763a6f0c Bad merge. Oddly not caught by autospec. 2013-05-27 10:56:55 -04:00
Robin Ward e1781240a6 Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse 
Conflicts:
	lib/text_sentinel.rb
 2013-05-27 10:42:20 -04:00
Robin Ward a15910ad1e Merge pull request #899 from chrishunt/chrishunt/extract-topic-posters-summary 
Extract topic posters summary
 2013-05-27 06:30:58 -07:00
Sam bf16b4f381 Merge pull request #903 from chrishunt/chrishunt/extract-post-move 
Extract post move
 2013-05-26 19:10:50 -07:00
Chris Hunt 6024529f81 Extract PostMover from Topic into its own class 2013-05-26 18:42:04 -07:00
Sam 661ddbb158 introduce strong_parameters 2013-05-27 11:06:09 +10:00
Sam ea294f71c2 Merge pull request #845 from Supermathie/rebakedocs 
Add hint on how to rebake posts
 2013-05-26 17:48:07 -07:00
Sam 6a4b3e6058 Merge pull request #895 from GlitchMr/readme-links 
Use relative URLs, not absolute.
 2013-05-26 17:46:14 -07:00
Sam d84ae80074 Simplify user action make it more idiomatic 2013-05-27 10:22:37 +10:00
Sam 6046d33645 Merge pull request #904 from janjiss/master 
Removed code duplication on UserAction model
 2013-05-26 16:34:36 -07:00
Jeff Atwood 9c9e5e9105 Merge pull request #905 from chrishunt/chrishunt/allow-chinese-titles 
Allow Chinese characters in Topic titles
 2013-05-26 14:33:41 -07:00
Chris Hunt 13c4266c74 Allow Chinese characters in Topic titles 2013-05-26 13:56:42 -07:00
Janis Miezitis f58bcf7fe3 Refactored duplication in user action 2013-05-26 16:07:20 +03:00
Chris Hunt 1ba18318ac Add test to verify posts are moved in transaction 2013-05-25 17:44:32 -07:00
Chris Hunt b8fbac582e Add Topic#url for determining url for a Topic 2013-05-25 17:44:32 -07:00
Chris Hunt f2b5e20840 Add Topic#max_post_number to find max post number 2013-05-25 17:44:32 -07:00
Chris Hunt c4cce68613 Add Post#is_first_post? 
We should be able to ask a post if it's the first in a topic
 2013-05-25 17:44:32 -07:00
Matt Van Horn d5958f8779 Sliding window rate limiting 
Switched the algorithm to use a circular buffer
based on a redis list
 2013-05-25 12:37:28 -07:00
Robin Ward 74b661317c FIX: User stream was loading the same page over and over once you scrolled past 60 
items.
 2013-05-25 14:08:09 -04:00
Robin Ward d3b3d115ce Revert "update active model serializers to latest". This introduced a regression to the SiteCustomizations part of the admin section. 
This reverts commit d436079801.
 2013-05-25 13:56:33 -04:00
Neil Lalonde c2d98d229a Version bump to v0.9.1 2013-05-25 11:21:58 -04:00
Jeff Atwood 340ca6c5c0 Merge pull request #900 from Supermathie/sysadmin-docs 
Updated documentation
 2013-05-24 21:44:14 -07:00
Michael Brown 17a09b5b70 Add hint on how to rebake posts 2013-05-25 00:16:43 -04:00
Michael Brown 6257c48613 Updated documentation 
* added RVM option for single-user install
* clarified Web Server options
* bluepill sample config: create socket directory if it doesn't exist
* add multisite.yml.production-sample
* rename production.sample.rb (OCD)
* make two database.yml samples (one for dev, one for prod)
* fixed travis build (database.yml.sample renamed)
* fix other references to database.yml.sample
* clean up 'rvm requirements' instructions as per @mpapis
 2013-05-25 00:07:45 -04:00
Chris Hunt 63c63c2939 Remove unused parameters from posters_summary 2013-05-24 15:33:50 -07:00
Chris Hunt c1841a6c89 Extract Topic#posters_summary 2013-05-24 15:33:45 -07:00
Robin Ward 2dedd2bd6e When a user context is present, priortize all their posts ahead of 
just the topic's OP before adding more.
 2013-05-24 17:45:40 -04:00
Neil Lalonde ada79260b3 Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long 2013-05-24 17:10:07 -04:00
Robin Ward e2774cc2df Merge pull request #896 from xtream/master 
Removed unnecesary method
 2013-05-24 14:09:44 -07:00
Neil Lalonde d26b87bd3c Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics. 2013-05-24 16:56:43 -04:00