Commit graph

2586 commits

Author SHA1 Message Date
Sam
33d3f1fdd1 oops gemfile lock was missing from pr 2013-05-29 10:52:37 +10:00
Sam
46389754d6 Merge pull request #892 from eriko/cas_support
Cas support
2013-05-28 16:13:29 -07:00
Jeff Atwood
5107f485aa add email to share link description help 2013-05-28 15:05:02 -07:00
Jeff Atwood
bb063f2573 Merge pull request #914 from Supermathie/sysadmin-docs
documentation: add instructions on updating
2013-05-28 14:55:16 -07:00
Michael Brown
7fee7361c7 documentation: add instructions on updating 2013-05-28 17:46:55 -04:00
Robin Ward
d75b160385 Enable subscribing to notifications on start, instead of currentUser
change which was hokey.
2013-05-28 17:12:37 -04:00
Robin Ward
b3678125dc FIX: Don't cast ids to ints, as user results have string ids. 2013-05-28 16:59:22 -04:00
Robin Ward
e7c739f337 Merge pull request #911 from netzpirat/update-german-translations
Update german translations
2013-05-28 13:27:57 -07:00
Robin Ward
6c25ad59ff Merge pull request #912 from chrishunt/chrishunt/fix-nginx-config
Fix unix socket paths in nginx sample config
2013-05-28 13:27:24 -07:00
Robin Ward
fc7fefb581 Merge pull request #913 from chrishunt/chrishunt/style-api-button
Add styling to 'Generate API Key' button
2013-05-28 13:26:30 -07:00
Robin Ward
c73455bfa2 FIX: Missing () made notifications invisible 2013-05-28 16:17:32 -04:00
Robin Ward
ee319ea7f7 FIX: Issues that didn't show up originally 2013-05-28 15:57:11 -04:00
Neil Lalonde
264dd65410 Fix replying in a topic that is uncategorized after allow_uncategorized_topics is set to false 2013-05-28 15:53:01 -04:00
Michael Kessler
5f591ae0ab Remove last occurrence of liken, which isn't a German word at all. 2013-05-28 21:52:37 +02:00
Michael Kessler
fcc1716e07 More German translations for the admin dashboard. 2013-05-28 21:41:00 +02:00
Robin Ward
560fb15d8a Include pinned topics in category list.
- removes an (n+1) query for user data
- supports the preload store for the data to avoid a second request
- fix a bug where uncategorizes was reporting (0, 0, 0) for topics by week, month, year
2013-05-28 15:36:16 -04:00
Chris Hunt
e75f881d58 Add styling to 'Generate API Key' button 2013-05-28 12:10:18 -07:00
Neil Lalonde
29bf540a34 Add the sidekiq-failures gem so that we can diagnose failed jobs 2013-05-28 14:56:46 -04:00
Michael Kessler
5fd5cb5fe4 Fix typo in the German missing logo warning. 2013-05-28 20:42:59 +02:00
Chris Hunt
ec223e5312 Fix unix socket paths in nginx upstream module
Unix socket paths only require a single forward slash according to the
HttpUpstreamModule documentation: http://wiki.nginx.org/HttpUpstreamModule
2013-05-28 11:37:03 -07:00
Michael Kessler
a2f21f4d33 Add missing German server translation for autoclosed_disabled. 2013-05-28 20:17:56 +02:00
Neil Lalonde
dda831fd41 Fix a regression that broke pre-fill of username when sending private message 2013-05-28 14:17:35 -04:00
Michael Kessler
9812acc5d2 Rename move_selected to split_topic in German client translations. 2013-05-28 20:17:21 +02:00
Robin Ward
320b35bf90 Merge pull request #910 from novemberkilo/master
WIP - Reduce complexity of Post#raw_links
2013-05-28 10:07:41 -07:00
Robin Ward
8d47f92c27 Merge pull request #908 from chrishunt/chrishunt/extract-topic-status-update
Extract topic status update
2013-05-28 10:00:49 -07:00
Neil Lalonde
f190a96b30 Allow stuff in gutter to be selected 2013-05-28 12:57:33 -04:00
Neil Lalonde
a4b90ac54f Prevent avatars from wrapping on topic list 2013-05-28 12:57:32 -04:00
Robin Ward
feb966a1cf Fixed jasmine specs that relied on old Discourse user api. 2013-05-28 12:09:03 -04:00
Chris Hunt
21a54567ff Extract TopicStatusUpdate from Topic 2013-05-28 09:01:04 -07:00
Robin Ward
dd54736d06 Refactor: Removed the last of the references to Discourse.currentUser. 2013-05-28 11:52:31 -04:00
Robin Ward
57f97880e6 Refactor: Instead of getting currentUser from the Discourse namespace, use
`Discourse.User.current()`
2013-05-28 11:25:56 -04:00
Erik Ordway
9a409d9440 fix comment and remove url setting as it is not used. 2013-05-28 08:06:18 -07:00
Navin
1d5952a92f Extract analysis type methods to a module and refactor Post#raw_links 2013-05-28 16:41:18 +02:00
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
Chris Hunt
be234a2bc7 Add test to verify autoclose moderator post 2013-05-27 18:02:15 -07:00
Chris Hunt
54a798eb12 Add Topic#age_in_days for determining age of topic 2013-05-27 18:02:15 -07: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