Kris Aubuchon
1c2b5015a3
fixing user title line-height, adding @mention style back in, consistent category width/alignment
2013-11-04 12:45:18 -05:00
Robin Ward
7360112759
Merge pull request #1600 from GManzato/user_page_flat
...
Flatter design on User Page
2013-11-04 07:25:57 -08:00
Robin Ward
ae81d78ab9
Merge pull request #1605 from vikhyat/fix-activerecord-associations-collectionproxy-serialization
...
Fix serialization of ActiveRecord::Associations::CollectionProxy in Rails 4
2013-11-04 07:16:52 -08:00
Régis Hanol
b063c4326f
Merge pull request #1609 from awesomerobot/master
...
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
Kris Aubuchon
70fd4f7f6b
merging local with master
...
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
Kris Aubuchon
4ce711a3b7
some general simplification to modal, menus, etc
2013-11-04 09:16:47 -05:00
Régis Hanol
4f8d0a1a96
revert changes to magnific-popup.scss
2013-11-04 14:44:52 +01:00
Régis Hanol
12ac2f2e99
FIX issues with quote button
...
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
2013-11-04 12:51:39 +01:00
Régis Hanol
934ede7d91
shorter message for untranslated strings
2013-11-04 11:52:12 +01:00
Vikhyat Korrapati
855ee3b43d
Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4.
2013-11-03 10:41:38 +05:30
Régis Hanol
b56b11d96a
add qunit to autospec
2013-11-01 23:57:50 +01: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
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
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
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
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
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
Sam
b7d3b52e4f
basic implementation of per-category new/latest etc filters
2013-10-24 21:05:06 +11:00
Sam
636976e5d4
fix alignment of n person liked this.
2013-10-24 15:30:41 +11:00
Sam
738a25b732
fix failure in rails 4 mode
2013-10-24 13:40:18 +11:00
Sam
24d732b12a
regressions post merge
2013-10-24 12:25:20 +11:00
Sam
adeb987c70
oops messed up merge
2013-10-24 12:09:49 +11:00
Sam
666264879c
change it so all topics MUST include a category, we store a special uncategorized category to compensate
...
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
Navin Keswani
6ce80fd148
Refactor User#update_last_seen! and User#update_tracked_topics
2013-10-23 23:27:30 +02:00
Neil Lalonde
8aab2253d0
Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets
2013-10-23 17:11:35 -04:00
Robin Ward
cc9b11ecc5
Simple category breadcrumb component
2013-10-23 17:00:02 -04:00
Robin Ward
541620c115
Routes and support for sub-categories
2013-10-23 15:22:49 -04:00
Robin Ward
49a11e51df
Ember support for parent categories
2013-10-23 15:22:49 -04:00
Robin Ward
c814fc16a3
Database structure to support sub categories
2013-10-23 15:22:49 -04:00
Neil Lalonde
bf06014a16
Order by creation time by default in screened ip addresses table
2013-10-23 13:01:50 -04:00
Neil Lalonde
237312dbde
Styling on screened ip addresses page
2013-10-23 13:01:50 -04:00
Neil Lalonde
3db7529ad4
More icons on screened ip addresses page
2013-10-23 13:01:50 -04:00