Commit Graph

2780 Commits

Author SHA1 Message Date
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
Robin Ward
2305cf94ea Don't wait for loading to finish before resetting category 2013-10-30 11:28:51 -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
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
Kris Aubuchon
3043efcb0a cleaning up the topic-title alignment a bit 2013-10-29 17:15:56 -04:00
Robin Ward
bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Robin Ward
6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Robin Ward
be0d5bd1f0 Let's try the category on the left side of the title 2013-10-29 13:12:12 -04:00
Robin Ward
5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Robin Ward
f7d6ab579c Merge pull request #1571 from novemberkilo/master
Refactor User#update_last_seen! and User#update_tracked_topics
2013-10-29 08:28:08 -07:00
Kris Aubuchon
4c8944626a making post-info text brighter, making category nav dropdown text smaller and bold 2013-10-29 00:37:18 -04:00
Kris Aubuchon
0d0a2cb947 category nav style 2013-10-28 17:37:31 -04:00
Kris Aubuchon
5d19e66470 merging with the new category nav feature
Merge remote-tracking branch 'upstream/master'
2013-10-28 17:08:00 -04:00
Neil Lalonde
e52f6e0f6d FIX: weird scroll position on visiting a topic page for the first time (chrome OS X, maybe mobile safari too) 2013-10-28 16:17:06 -04:00
Neil Lalonde
8ea1a1069e Use the debounce parameter instead of hard-coding 100 2013-10-28 16:17:06 -04:00
Robin Ward
8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Kris Aubuchon
c016a081f1 further simplification over all, changes include: flatter button style, styling admin table, topic-list style 2013-10-28 13:46:59 -04:00
Robin Ward
70ce07ae49 Oops JSHint again :(
)
2013-10-28 13:00:34 -04:00
Robin Ward
26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks
are enabled.
2013-10-28 12:44:10 -04:00
Kris Aubuchon
cafc1a088d catching up with the master
Merge remote-tracking branch 'upstream/master'
2013-10-28 12:26:12 -04:00
Kris Aubuchon
1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward
098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward
1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Manoj
9650dbb97c Refactor topics controller
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments

fix typo
2013-10-28 11:42:07 +05:30
Sam
95e936c299 cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider 2013-10-28 16:29:07 +11:00
Sam
88ccd287b4 allow uncategorized category in 2 more spots (hamburger and drop down) 2013-10-28 08:39:55 +11:00
Régis Hanol
c77a20eea5 do not deselect text when clicking on the reply button below the post 2013-10-27 19:44:46 +01:00
Neil Lalonde
ce2af5c6d1 Show Log In button at the bottom of the page body when login_required and not logged in 2013-10-25 16:08:59 -04:00
Robin Ward
f4d9bf9181 Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email
Utilize already existing method 'find_by_username_or_email'
2013-10-25 12:57:18 -07:00
Robin Ward
a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde
4e46d91b8d Refactor SpamRulesEnforcer so that each spam rule is in its own class 2013-10-25 13:25:02 -04:00
Neil Lalonde
90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
Sam
a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Sam
572f036e74 filter down the top level navs 2013-10-25 11:15:20 +11:00
Sam
4929c5db71 FIX: when allow_uncategorized_topics was false, PMs can not be created 2013-10-25 09:33:39 +11:00
Neil Lalonde
d149066ac6 Show a warning on admin dashboard if running on an older patch level of ruby 2.0 2013-10-24 18:22:47 -04:00
Neil Lalonde
017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward
61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward
ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Robin Ward
9adcd1579d Renamed components to lib in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Manoj
96ae3cdacc Utilize already existing method 'find_by_username_or_email'
check presence of email using include, dont use =~
2013-10-24 19:26:06 +05:30