nirnanaaa
9bfe70a61b
merged postgres improvements
2013-05-29 22:35:55 +02:00
nirnanaaa
364113a4d5
removed t and f 's from group model
...
removed t and f 's from user model as mentioned in #919
removed t's and f's from category model
2013-05-29 22:10:43 +02:00
nirnanaaa
aefa8e86c9
removed t and f 's from group model
...
removed t and f 's from user model as mentioned in #919
2013-05-29 22:01:55 +02:00
Robin Ward
487c25cbd7
Merge pull request #919 from nirnanaaa/master
...
Staff scope defined in User model but not used in staff_constraint
2013-05-29 12:18:19 -07:00
Robin Ward
8182a9d10c
Merge pull request #918 from chrishunt/chrishunt/quiet-tests-please
...
Clean up test output
2013-05-29 12:17:04 -07:00
Robin Ward
5ae7707000
Refactor: Convert repeated {{view Discourse.xyz}} to registered view helpers
2013-05-29 15:14:31 -04:00
Robin Ward
57d5355ce8
wat
2013-05-29 15:00:35 -04:00
Robin Ward
4d5c145198
Refactor: Adds Discourse.Utilities.registerViewHelper to register view helpers
2013-05-29 14:32:39 -04:00
Robin Ward
3d0587d8ce
Refactor: move category slug helper to Category model
2013-05-29 14:18:02 -04:00
Robin Ward
fe3ac50aae
Use {{aceEditor}} helper to display the ace editor
2013-05-29 14:09:21 -04:00
Robin Ward
0601bb6d74
Trivial JS clean up
2013-05-29 14:09:17 -04:00
Neil Lalonde
6abd9ddd2d
Add warning on admin dashboard if production env is configured to send email through gmail
2013-05-29 14:00:35 -04:00
nirnanaaa
00c1c4691d
there is a scope in User model but not used in staff_constraint
2013-05-29 19:54:23 +02:00
Robin Ward
acb2623b4b
JSHINT: extra comma
2013-05-29 13:30:03 -04:00
Robin Ward
9717a344c3
Refactor: Less reliance on views for logic for topic list
2013-05-29 13:28:07 -04:00
Chris Hunt
e94e9b7621
Set UTF-8 charset for plain text email part
2013-05-29 09:54:36 -07:00
Chris Hunt
46a5066aed
Set SeedFu to quiet mode. No talking please.
2013-05-29 09:36:51 -07:00
Chris Hunt
dbf4d9b0dc
Set Sidekiq log level to WARN
2013-05-29 09:36:15 -07:00
Robin Ward
4cf1d9c266
Display details about the search context in the placeholder
2013-05-29 12:19:31 -04:00
Neil Lalonde
b1bdebd611
url for uncategorized category topic list is always /category/uncategorized
2013-05-29 12:06:33 -04:00
Robin Ward
f151b30044
Show excerpts on Categories page
2013-05-29 11:46:01 -04:00
Robin Ward
2e26fca36b
FIX: Hitting ESC while autocomplete is open shouldn't close the composer.
2013-05-29 11:28:41 -04:00
Robin Ward
5cb1cc6fcb
FIX: Categories pill wasn't always being highlighted properly.
2013-05-29 11:02:37 -04:00
Robin Ward
df63045699
Merge pull request #917 from netzpirat/improve-german-translations
...
Improve german translations
2013-05-29 07:41:16 -07:00
Michael Kessler
10f8a9a97d
Improve German translations.
...
This tries to improve the German translations in its context, making
them fit better in the layout, unifying different terms, fixing typos,
try to improve the readability and add some missing translations.
2013-05-29 11:45:27 +02:00
Michael Kessler
d44fa5c1f7
Add email to German share link description help.
2013-05-29 09:59:46 +02:00
Jeff Atwood
2ffb538290
Merge pull request #916 from Supermathie/sysadmin-docs
...
documentation: merge & adapt suggestions from baus
2013-05-28 22:28:26 -07:00
Michael Brown
73d6014d10
documentation: merge & adapt suggestions from baus
2013-05-29 00:07:26 -04:00
Robin Ward
27c1f1044c
FIX: Regression, messages were hidden
2013-05-28 21:24:45 -04:00
Robin Ward
92dc59fba9
Properly assign draft keys to Categories List view.
2013-05-28 21:16:24 -04:00
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
