Commit graph

6897 commits

Author SHA1 Message Date
Robin Ward
3b1ef6ebc9 Work in progress: Groups Page 2014-02-07 10:44:51 -05:00
Robin Ward
325c2dfaea Rename load to loadUsers which is what the method was actually
doing.
2014-02-07 10:44:51 -05:00
Robin Ward
bd0c2a74fc Return a promise from Discourse.Group.findAll() 2014-02-07 10:44:51 -05:00
Robin Ward
003eb06807 Move Discourse.Group into public models 2014-02-07 10:44:51 -05:00
Robin Ward
de57f29467 More templates for the group page 2014-02-07 10:44:50 -05:00
Robin Ward
a873f7a95a Client and Server side routes for a Group 2014-02-07 10:44:50 -05:00
Régis Hanol
cef2d8dc82 BUGFIX: make sure moderators can't view topics they aren't allowed to 2014-02-07 07:08:56 -08:00
Sam
cfa5882035 Be slightly less aggressive at clearing assets 2014-02-07 21:43:05 +11:00
Régis Hanol
e47f462f54 Merge pull request #1916 from vikhyat/pm-dominating
Don't notify about dominating private messages
2014-02-07 00:28:27 -08:00
Sam
9f6fe7280d Merge pull request #1917 from awesomerobot/master
fixing watermark/gutter link interference
2014-02-07 15:45:50 +11:00
Kris Aubuchon
02e194219f fixing watermark/gutter link interference, and also adding a transition to the topic-progress bar, so smooth! 2014-02-06 23:43:13 -05:00
Sam
585fae0541 another try fixing this test 2014-02-07 14:38:00 +11:00
Sam
d9c05fcfc8 SECURITY: dissalow mods from seeing PMs 2014-02-07 14:24:19 +11:00
Sam
93434be16d SECURITY: reduce moderator rights
You can now hide particular categories from certain moderators
2014-02-07 14:11:52 +11:00
Sam
e133c82d4b SECURITY: check permissions for mailing list
if you deployed this feature in the last 2 hours upgrade asap.
2014-02-07 14:10:45 +11:00
Sam
8e9cfdfcda BUGFIX: plugins not updating after assets:precompile
Now that we have a fancy cache we can nuke all old assets
This is way better cause it ensures all .erbs get re-evaluated
And ensures plugins are updated
2014-02-07 11:37:07 +11:00
Jeff Atwood
7feb480e20 Merge pull request #1915 from riking/patch-2
Update new_user top page redirect reason
2014-02-06 16:28:38 -08:00
Sam
12cea8cb92 BUGFIX: scheduler crash in blocking_tick 2014-02-07 11:21:28 +11:00
Vikhyat Korrapati
2f38316bfc Don't notify about dominating private messages. 2014-02-07 05:49:45 +05:30
Sam
be560d4eb6 Update annotations 2014-02-07 11:07:52 +11:00
Sam
227873df78 FEATURE: proper mailing list mode
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
2014-02-07 11:07:52 +11:00
Kane York
d81519c0f8 Update new_user top page redirect reason
The goal of this text is to sublty hint that reading is the way to graduate out of it.
2014-02-06 16:04:16 -08:00
Neil Lalonde
3a1c5ed39d Version bump to v0.9.8.4 2014-02-06 18:59:45 -05:00
Régis Hanol
3be822f97e Merge pull request #1914 from velesin/topic_creator_refactoring
Refactors TopicCreator
2014-02-06 15:04:54 -08:00
Jeff Atwood
929191ecd9 new intro message and better 404 copy 2014-02-06 14:51:24 -08:00
Sam
0efcb9cee9 BUGFIX: race condition in blocking_tick
causes erratic spec failure
2014-02-07 08:40:43 +11:00
Sam
f27ffe3223 BUGFIX: scheduler was showing up empty in multisite 2014-02-07 08:37:02 +11:00
David Celis
e751b8d58f Default values for posts/topics fields on Category
When creating categories (or, at least, subcategories), certain integer
values are set to a default of NULL: topics_week, topics_month,
topics_year, posts_week, posts_month, and posts_year. This causes
consistent exceptions when trying to visit `/categories`, with the
offending line being in
`CategoryDetailedSerializer#count_with_subcategories`. This attempts to
coerce nil into Fixnum.

A fix could be to convert to 0 in the code, but these attributes should
really never be NULL. If there are no posts or topics, they should be 0
to maintain data integrity.

Signed-off-by: David Celis <me@davidcel.is>
2014-02-06 12:04:03 -08:00
Wojciech Zawistowski
bc1824a6ed Refactors TopicCreator 2014-02-06 20:52:50 +01:00
Neil Lalonde
5b559d9631 Pinned uncategorized topics span the title and category column in topic lists 2014-02-06 14:38:04 -05:00
David Celis
49bc7692bf Include binstubs generated by Rails 4
Commit b516ecc added `bin/` to the .gitignore file. Now that Discourse
runs using Rails 4 by default, however, we should include the binstubs
generated by `rake rails:update:bin` in version control as this is the
recommendation of the Rails core team. Additionally, for those wishing
to deploy Discourse to Heroku, these binstubs are actually mandatory
according to [this article](https://devcenter.heroku.com/articles/rails4).

Other binstubs can continue to be ignored.

Signed-off-by: David Celis <me@davidcel.is>
2014-02-06 11:15:00 -08:00
Neil Lalonde
113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Neil Lalonde
a72e7324ba Append browser-update div last in the dom to prevent googlebots from seeing it first 2014-02-06 10:48:15 -05:00
Régis Hanol
9b3740a7c6 Merge pull request #1909 from codedinc/shortenUrl-fix
Fix shortenUrl helper to not crash when URL doesn't include any "/".
2014-02-06 16:35:11 +01:00
macournoyer
8bf872e92e Fix shortenUrl helper to not crash when URL doesn't include any "/". 2014-02-06 10:12:38 -05:00
Régis Hanol
bd418cd5ef Merge pull request #1897 from matsen/master
Removing outdated references to .sample `config/` files in HEROKU.md
2014-02-06 15:29:16 +01:00
Régis Hanol
a5e1c694a6 Merge pull request #1905 from velesin/post_destroyer_refactoring
Refactors PostDestroyer
2014-02-06 15:00:58 +01:00
Wojciech Zawistowski
4485ae7b05 Refactors PostDestroyer 2014-02-06 07:54:34 -05:00
Régis Hanol
c4cfd5a7fe BUGFIX: unbind the file uploader when closing the composer 2014-02-06 12:54:06 +01:00
Régis Hanol
58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Régis Hanol
a710773bb4 BUGFIX: do not override default browser keyboard shortcuts behavior 2014-02-06 11:07:33 +01:00
Régis Hanol
6d3c3a02cb Merge pull request #1900 from ballistiq/allow_user_activation_on_create
Whitelist :active param so that we can automatically create users that a...
2014-02-06 09:56:00 +01:00
Régis Hanol
f2a75aaf26 Merge pull request #1908 from riking/docker-link
Extract version check in dashboard to own template
2014-02-06 09:54:03 +01:00
Sam
4e3980896e Merge pull request #1906 from fabricioflores/patch-1
Update client.es.yml
2014-02-06 18:32:40 +11:00
Jeff Atwood
f2c017ac1a Merge pull request #1910 from awesomerobot/master
previous restricted badge fix broke restricted badges in titles, this fixes it
2014-02-05 22:26:59 -08:00
Sam
d9df40dfcd minor refactor 2014-02-06 17:07:15 +11:00
Sam
a69f59ef51 FEATURE: much faster asset precompilation with a redis backed cache 2014-02-06 16:55:53 +11:00
Kris Aubuchon
00e941ff07 previous restricted badge fix broke restricted badges in titles, this fixes it 2014-02-06 00:30:44 -05:00
Sam
d132fd0609 add full-name class for styling 2014-02-06 15:53:49 +11:00
riking
7c12aeb848 Extract version check in dashboard to own template 2014-02-05 17:22:10 -08:00