Commit graph

5220 commits

Author SHA1 Message Date
Neil Lalonde
e679ba97a3 FIX: categories created by users who are deleted cannot be deleted 2013-11-01 16:56:15 -04:00
Scott Albertson
c0cffca1e6 Test title updating 2013-11-01 13:43:31 -07:00
Scott Albertson
3cc17ad4cd Add test coverage for #update 2013-11-01 13:43:31 -07:00
Scott Albertson
58f96bdfb5 Remove duplication in test setup 2013-11-01 13:43:31 -07:00
Scott Albertson
2e7696630b Make #update specs consistent
* Use expect syntax
* Avoid lets
* Stub Guardian method used in the controller
2013-11-01 13:43:31 -07:00
Robin Ward
7a567d730d Merge pull request #1601 from awesomerobot/master
main logo size consistency fix
2013-11-01 13:32:37 -07:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward
04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00
Kris Aubuchon
1f283b5ca9 main logo size consistency fix 2013-11-01 15:45:56 -04:00
Robin Ward
bbf0312e72 FIX: Non-Admins couldn't send private messages through the new user expansion 2013-11-01 15:18:26 -04:00
Neil Lalonde
0060050c08 Replace data-dismiss=modal with action close. It's better to use our own ember code instead of relying on bootbox magic. 2013-11-01 12:14:08 -04:00
Robin Ward
6b31e4fda5 Merge pull request #1598 from velesin/logo_component_cleanup
cleans up logo integration tests
2013-11-01 08:45:45 -07:00
Neil Lalonde
92a0729937 When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs. 2013-11-01 10:47:26 -04:00
Neil Lalonde
52b0c1c45f When logging the deletion of a user, don't store its id in the target_user_id column. It will never match a user record. 2013-11-01 10:47:26 -04:00
Gilles Manzato
3826e67007 Flatter design on User Page
- Cleanup of the design ( remove border-radius ... )
- Fixed some alignment and width in mobile and lower screen size
2013-11-01 15:38:07 +01:00
Régis Hanol
57d78aaba6 Merge pull request #1599 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-01 02:14:04 -07:00
ofGEEK
ddf47e54af Update client.zh_CN.yml 2013-11-01 14:48:34 +08:00
Sam
233cca79b5 dead git repo broke discourse 2013-11-01 15:21:40 +11:00
Robin Ward
b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Robin Ward
5a78c1cb34 Changed confusing 'all categories' text 2013-10-31 16:41:13 -04:00
Robin Ward
6ff2abd6aa Move category badge to left of topic name in non-fixed header 2013-10-31 16:31:01 -04:00
Robin Ward
7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward
744cd93f28 FIX: Non-English category name regression 2013-10-31 16:25:26 -04:00
Wojciech Zawistowski
2bd3cc4e16 cleans up logo integration tests 2013-10-31 17:27:28 +01:00
Neil Lalonde
e1d956f5ee Improve styling of staff action logs UI 2013-10-31 12:17:06 -04:00
Neil Lalonde
d3c7bbe268 Merge pull request #1597 from awesomerobot/master
topic vertical alignment fixes, admin logs table width fix
2013-10-31 06:58:10 -07:00
Kris Aubuchon
396b626bdc topic vertical alignment fixes, admin logs table width fix 2013-10-31 09:35:49 -04:00
Régis Hanol
727d628a0e Merge pull request #1595 from velesin/logo_component
extracts logo component from header
2013-10-30 14:52:04 -07:00
Sam
c97ab672c7 Merge pull request #1593 from awesomerobot/master
Some code cleanup, touch/non-touch gutter, little design/alignment tweaks
2013-10-30 14:45:29 -07:00
Wojciech Zawistowski
489dab333a extracts logo component from header 2013-10-30 21:56:48 +01:00
Neil Lalonde
ce5ebc3eb5 On sites with login_required enabled, after signup, don't show the /login page again 2013-10-30 16:37:36 -04:00
Robin Ward
704adc00ca FIX: Broken test. No idea why the name randomly changed! 2013-10-30 16:04:26 -04:00
Robin Ward
3d6d7c8abe SiteSetting to hide regular names from users 2013-10-30 15:45:34 -04:00
Neil Lalonde
c8d5db38d6 Emails to banned users will be sent for notifications of PMs from staff users 2013-10-30 15:31:16 -04:00
Kris Aubuchon
d01185215d some reorganization, touch optimization, poster expansion design 2013-10-30 12:40:16 -04:00
Robin Ward
2305cf94ea Don't wait for loading to finish before resetting category 2013-10-30 11:28:51 -04:00
Kris Aubuchon
9f42bde110 fixing topic title line height to accomodate overflow 2013-10-30 09:57:56 -04:00
Régis Hanol
689c4cd947 Merge pull request #1592 from awesomerobot/master
fixing errors in formatting from last commit
2013-10-30 06:33:23 -07:00
Kris Aubuchon
032997ccff fixing errors in formatting from last commit 2013-10-30 09:31:26 -04:00
Régis Hanol
9a2e3245b8 Merge pull request #1591 from awesomerobot/master
fixing pre/sub/sup/code/kbd formatting, post selection buttons
2013-10-30 06:20:59 -07:00
Kris Aubuchon
7900fa0184 fixing pre/sub/sup/code/kbd formatting 2013-10-30 09:11:05 -04:00
Sam
ab6efe8323 I tire of sample files, make number of workers configurable 2013-10-30 16:34:25 +11:00
Sam
ef2b8cbe5d configurable worker process count for unicorn 2013-10-30 16:33:08 +11:00
Sam
a84997ebc7 rails4 magic sauce 2013-10-30 16:18:18 +11:00
Kris Aubuchon
ef954f46ba fixing blockquote that I just broke 2013-10-29 22:33:09 -04:00
Kris Aubuchon
be27e1dfee fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent 2013-10-29 22:00:18 -04:00
Sam
4fa32c4dc0 Merge pull request #1590 from awesomerobot/master
fixing the category creation/edit modal alignment
2013-10-29 18:40:35 -07:00
Kris Aubuchon
0337c293c1 fixing the category creation/edit modal alignment 2013-10-29 21:01:41 -04:00
Sam
36352e437f Merge pull request #1589 from awesomerobot/master
Some underlying topic title clean-up, fixed private message user list alignment
2013-10-29 17:49:28 -07:00
Kris Aubuchon
60d9b4d808 fixing private message users, post title alignment 2013-10-29 20:47:37 -04:00