Commit Graph

9435 Commits

Author SHA1 Message Date
Benjamin Kampmann 5025e97712 move available groups loader into router 2014-07-15 15:48:02 +02:00
Benjamin Kampmann 2435961b58 use computed 2014-07-15 15:43:53 +02:00
Benjamin Kampmann 6710637904 renamed 2014-07-15 15:35:16 +02:00
Benjamin Kampmann ac3f1ba3d6 Improved Group Member Management on User Administration
Allows for a quick and easy group membership management on the
user-administration page. Uses the select2 UI component to
autosuggest other groups, remove existing ones and lock in automatic
groups.
2014-07-13 20:11:38 +02:00
Jeff Atwood 2a40c04480 don't need "new" here 2014-07-13 02:54:39 -07:00
Jeff Atwood 0c513241a3 no more black topic status glyphs on cat page 2014-07-13 02:45:50 -07:00
Jeff Atwood 7cfcad5636 add 'login' section to site_settings 2014-07-13 02:23:31 -07:00
Jeff Atwood 504e971bda fix PM participant alignment on mobile 2014-07-12 22:17:54 -07:00
Jeff Atwood 33cbb2a63c Update INSTALL.md
just use 1GB as minimum RAM
2014-07-12 12:18:30 -07:00
Jeff Atwood bd43a15062 Update INSTALL.md
link to our swap howto rather than generic
2014-07-12 12:17:38 -07:00
Jeff Atwood f378004a41 embedded quote colors were wrong, THANKS OBAMA 2014-07-12 01:31:26 -07:00
Jeff Atwood fe95597ce8 very minor mobile layout tweaks 2014-07-12 01:04:25 -07:00
Jeff Atwood b8d9781739 minor mobile topic list tweaks 2014-07-12 00:44:01 -07:00
Jeff Atwood 0068ac9124 fix mobile layout of /faq /tos /privacy 2014-07-12 00:04:22 -07:00
Jeff Atwood 4093120ddf distinct FAQ vs guidelines copy 2014-07-11 23:49:51 -07:00
Jeff Atwood 7b1eb06735 Merge pull request #2534 from awesomerobot/master
fixing appearance of horizontal scrollbar on topic list at about 996px wide
2014-07-11 21:38:46 -07:00
Kris Aubuchon 8da4046d79 minor alignment fixes on badge page w/description 2014-07-12 00:36:01 -04:00
Kris Aubuchon 9398504332 fixing appearance of horizontal scrollbar on topic list at about 996px wide 2014-07-12 00:12:50 -04:00
Sam 038b2ceca7 Merge branch 'master' of github.com:discourse/discourse 2014-07-12 11:11:20 +10:00
Sam fb335560f8 FIX: appears broken in multisite 2014-07-12 11:11:12 +10:00
Jeff Atwood d19a0bc06c add safety for max levenshtein spammer distance 2014-07-11 17:19:45 -07:00
Régis Hanol edba5c631f FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-12 01:59:43 +02:00
Sam 724fff22e7 SECURITY: Don't allow badges on read restricted categories 2014-07-12 09:37:22 +10:00
Régis Hanol b526cdc55c Revert "FEATURE: reject accounts created with an email address similar to a known spammer email"
This reverts commit 39be48a441.

Conflicts:
	spec/models/screened_email_spec.rb
2014-07-12 01:01:37 +02:00
Jeff Atwood 572b8e0664 further improvements to Admin Quick Start Guide 2014-07-11 15:32:32 -07:00
Jeff Atwood ff57e704bc Merge pull request #2533 from awesomerobot/master
fixing onebox image width bug
2014-07-11 15:09:53 -07:00
Kris Aubuchon 1ef4a12a9d fixing onebox image width bug 2014-07-11 18:04:32 -04:00
Jeff Atwood c5cb126714 Merge pull request #2531 from riking/post-route
Fix /p/post/user route not saving referrals
2014-07-11 14:50:59 -07:00
riking 783454ebe1 Fix /p/post/user route not saving referrals
Make user id optional for /p/id/uid
Add /posts/id/raw route for debugging failed post processing
2014-07-11 14:44:07 -07:00
Neil Lalonde d45c50f4bb Merge pull request #2529 from riking/email
Two light commits for email
2014-07-11 16:30:58 -04:00
Jeff Atwood 314f154def line up modal nav pills better 2014-07-11 13:28:51 -07:00
riking 07d8d5ed75 Change default email_in minimum trust to 2
Also, rename MinTrustToCreateTopicSetting to TrustLevelSetting, and apply it to more settings
2014-07-11 12:35:59 -07:00
riking 4750f4b5b8 Expect the right error in reciever_spec
Makes the tests less likely to silently break
2014-07-11 12:26:52 -07:00
Neil Lalonde d13dbaaa36 FEATURE: enter key in site setting input saves it 2014-07-11 14:44:30 -04:00
Neil Lalonde a9788bc4fe FIX: instructions in import script 2014-07-11 13:36:11 -04:00
Régis Hanol 9befc31afa BUGFIX: restore wasn't working now that we have some views 2014-07-11 18:29:24 +02:00
Régis Hanol 46218c7a3a BUGFIX: multiple sub/sup 2014-07-11 15:27:42 +02:00
Régis Hanol 39be48a441 FEATURE: reject accounts created with an email address similar to a known spammer email 2014-07-11 15:09:46 +02:00
Sam d9768a6195 FIX: pretending to support too many accelerated files
This broke sidekiq web

(sidekiq serves resources out of /vendor/ path)
2014-07-11 18:47:55 +10:00
Sam c113c36db7 correct badge query 2014-07-11 17:35:34 +10:00
Sam 833c50c460 FEATURE: Read Faq badge 2014-07-11 17:32:29 +10:00
Sam 167a2a68e6 To be fixed properly tomorrow. 2014-07-11 14:17:43 +10:00
Sam 89fc989adb FEATURE: First Quote badge 2014-07-11 14:17:43 +10:00
Neil Lalonde 02158e59b2 FEATURE: phpbb import script: update links to other topics so they refer to the new site; fix weird links that break after import 2014-07-10 19:21:56 -04:00
Jeff Atwood dfe3bbc168 add FAQ wiki instructions to Admin Quick Start 2014-07-10 16:07:24 -07:00
Jeff Atwood ed3bebfebe switch /faq to /guidelines in a bunch of places 2014-07-10 15:30:58 -07:00
Neil Lalonde 5fb38ba9c0 Version bump to v0.9.9.12 2014-07-10 17:33:30 -04:00
Jeff Atwood 93c4067ab3 initial "Welcome to the Lounge" copyedit 2014-07-10 14:08:09 -07:00
Neil Lalonde 946b15a646 Merge pull request #2527 from techAPJ/patch-3
Update translations
2014-07-10 16:37:51 -04:00
Jeff Atwood cf61ef7138 category-list-item only used in mobile layout 2014-07-10 13:28:53 -07:00