Neil Lalonde
791f5ac94e
Load site settings from config/site_settings.yml
2013-11-14 16:02:13 -05:00
Robin Ward
968c0672ef
Enable column sorting main topic list
2013-11-14 15:50:36 -05:00
Robin Ward
67041d1c6d
Support for tracking the count of unique participants in a topic
2013-11-14 14:32:41 -05:00
Scott Carleton
32e414690a
Handle ugly url targets
2013-11-14 13:14:02 -05:00
Robin Ward
41dfcd2774
FIX: Pagination while sorting on column headers
2013-11-14 12:35:18 -05:00
Régis Hanol
07cbf8f4e3
do not customize the admin section
2013-11-14 16:41:16 +01:00
Sam
23deecfe44
Merge pull request #1651 from awesomerobot/master
...
New onebox styles, and a few small fixes
2013-11-13 22:49:54 -08:00
Sam
e57ddcf276
remove discourse dependency from message bus
2013-11-14 16:37:50 +11:00
Kris Aubuchon
5bf2b40dbc
quick fix
2013-11-13 23:19:37 -05:00
Kris Aubuchon
829346468c
new onebox style (similar to blockquotes), spacing for auto-close message, making link badge easier to read
2013-11-13 23:10:47 -05:00
Robin Ward
d30721f06b
Remove "sorting" color
2013-11-13 16:39:49 -05:00
Robin Ward
9cbfd8362d
FIX: Warnings in Qunit suite
2013-11-13 14:26:29 -05:00
Robin Ward
bda5a72c6a
Server side support for custom ordering of topics
2013-11-13 14:17:06 -05:00
Robin Ward
7207cef7aa
TopicQuery cleanup in advance of custom sorting:
...
- Move SQL method constants into a module
- Removed unused count methods
- Moved methods that don't return a TopicList into Topic
- Replaced some confusing method signatures
2013-11-13 12:26:32 -05:00
Robin Ward
df568df9dc
Controls for sorting topic columns
2013-11-13 11:48:38 -05:00
Régis Hanol
7e7d951152
do not pull hotlinked images when max_image_size_kb == 0
2013-11-13 17:30:48 +01:00
Jeff Atwood
c23c8a7e3a
we forgot word-wrap: break word on post body
2013-11-13 01:28:36 -08:00
Sam
8339337cd1
strip out docker stuff, put into a plugin
2013-11-13 17:42:31 +11:00
Régis Hanol
e9f9d22482
add query parameter to temporarily disable customization
2013-11-12 18:14:22 +01:00
Robin Ward
a1a89d01c4
JSHint
2013-11-12 11:25:27 -05:00
Robin Ward
32a3da86da
Merge pull request #1640 from salbertson/sa-refactor-users-controller-invites
...
Refactor UsersController#invited
2013-11-12 08:18:52 -08:00
Robin Ward
d9008374aa
Merge pull request #1643 from zachwlewis/fix-admin-customize-header
...
Updated styles on admin customize page.
2013-11-12 08:17:10 -08:00
Robin Ward
2711a9eef0
Merge pull request #1644 from demil/patch-1
...
Update discourse.js
2013-11-12 08:16:42 -08:00
Régis Hanol
aeacfb2acc
widened the edit title/category
2013-11-12 14:36:00 +01:00
Sam
932c2675a7
work in progress, admin page for upgrades (provides source lives in git)
2013-11-12 16:42:35 +11:00
demil
adcfa4cf9f
Update discourse.js
...
Inserted if (url.indexOf(u) != -1) return url; in getURL function because of bug in subdirectory install on some urls doubles relative url prefix, for example /forum/forum/latest.json. With this fix it works fine.
2013-11-12 02:36:03 +01:00
Scott Albertson
77b59b54ce
Refactor UsersController#invited
...
* Add test coverage
* Simplify controller action
* Move finder code to Invite class
2013-11-11 13:23:49 -08:00
Zachary Lewis
53f2d4b66c
Updated styles on admin customize page.
2013-11-11 15:20:58 -06:00
Robin Ward
e5fd2946e0
Some topic list re-organization.
2013-11-11 15:07:08 -05:00
Neil Lalonde
2f8866add5
Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows.
2013-11-11 15:03:17 -05:00
Régis Hanol
d65cd0f97e
Merge pull request #1637 from railsaholic/refactor_users_upload_avatar_action
...
Refactor Users#upload_avatar method
2013-11-11 09:59:30 -08:00
railsaholic
58f78e9001
Refactor Users#upload_avatar method
...
Moved avatar file upload to ```AvatarUploadService``` class and
```AvatarUploadPolicy```
Address review comments + require missing file in spec
2013-11-11 23:21:14 +05:30
Neil Lalonde
1d8a3e6fc8
Add an order for user_stats table in exporter
2013-11-11 10:49:27 -05:00
Robin Ward
428fcb9841
Merge pull request #1638 from velesin/i18n_helper_self_refactoring
...
refactors context binding from _this to self
2013-11-11 07:36:27 -08:00
Sam
3473734af0
FIX: bust broken password
2013-11-11 22:28:26 +11:00
Sam
817423db84
very bad idea to remove glyphs from privat / deleted and read restricted topics
2013-11-11 17:11:16 +11:00
Sam
0ceeeedf80
correct logic for tracking incoming links
2013-11-11 10:53:01 +11:00
Sam
d1d661f6e1
add logic that auto closes any topics that missed the queued job (due to redis flush or whatever)
2013-11-11 10:52:44 +11:00
Wojciech Zawistowski
e27f944ed1
refactors context binding from _this to self
2013-11-10 21:33:16 +01:00
sirMackk
af67284995
User ctrl refactor - breaks up large methods, moves some logic into model
...
Includes missing methods from backup for travis to pass
fix missing code, failing specs
keep params handling in the controller.
2013-11-09 18:44:13 +05:30
Wojciech Zawistowski
67a1da7af4
refactors header notifications (renders them via separate controller / template)
2013-11-08 21:06:27 +01:00
Robin Ward
965a0a91a2
FIX: Unloading categories page failed in some circumstances; update to latest Ember.
2013-11-08 14:09:27 -05:00
Régis Hanol
be589da5dc
Merge pull request #1630 from awesomerobot/master
...
using max-width on the #main-logo versus setting a static width
2013-11-08 09:44:06 -08:00
Robin Ward
127c3d0e21
FIX: Performance regression on Markdown renderer.
2013-11-08 11:42:26 -05:00
Kris Aubuchon
78f9c83604
using max-width on the #main-logo versus setting a static width
2013-11-08 11:29:39 -05:00
Neil Lalonde
630ef0f322
Should be able to see edits to your own posts
2013-11-08 10:18:41 -05:00
Kris Aubuchon
40aa62f613
adding highlight & fade to linked topic
2013-11-07 23:12:18 -05:00
Robin Ward
c753a3c784
We shouldn't be matching on the created_at field. Causes tests to randomly fail.
2013-11-07 16:35:40 -05:00
Neil Lalonde
dbd2332b74
Public user profile page shows if the user is suspended and why.
2013-11-07 16:34:31 -05:00
Robin Ward
ac9a763ab3
FIX: Extra space before tags in blockquotes
2013-11-07 16:06:50 -05:00
Robin Ward
6e43372e7c
Merge pull request #1610 from salbertson/sa-refactor-users-update
...
Move logic for updating a user to a service class
2013-11-07 12:29:19 -08:00
Neil Lalonde
0c6f794eb0
Used the term suspended instead of banned.
2013-11-07 13:53:49 -05:00
Scott Albertson
72bfa4471f
Move logic for updating a user into a service class
2013-11-07 08:39:39 -08:00
Robin Ward
01b768392a
Remove default_scope
2013-11-06 16:56:49 -05:00
Robin Ward
902b6bc79f
FIX: Oneboxes were losing formatting in preview after being cached.
2013-11-06 15:58:41 -05:00
Robin Ward
914b723b97
Category dropdown should be in the position order
2013-11-06 15:50:47 -05:00
Robin Ward
3dd4741ce4
FIX: Larger click target for topic progress bar
2013-11-06 15:33:17 -05:00
Robin Ward
948a545cb1
Category descriptions should not appear in digests
2013-11-06 15:05:06 -05:00
Robin Ward
de30af9302
Support for inviting to a forum from a user's invite page.
2013-11-06 12:56:50 -05:00
Robin Ward
4a7ef8b460
Adjust margins of ul, ol: they were slightly to the left
2013-11-05 17:57:05 -05:00
Robin Ward
25ef66c60b
User invites page now has search, displays first invites_shown records
2013-11-05 17:53:26 -05:00
Neil Lalonde
8838b555cd
The entire notification when there are new topics is clickable
2013-11-05 16:56:32 -05:00
Neil Lalonde
2342da893d
Fix [object object] being rendered where it should be an ip address
2013-11-05 15:00:54 -05:00
Neil Lalonde
6597738322
Improve how banned fields are rendered on admin user page
2013-11-05 15:00:54 -05:00
Robin Ward
84b0792db8
Merge pull request #1616 from velesin/remove_notifications_view
...
removes unused view
2013-11-05 10:38:51 -08:00
Régis Hanol
37fd7ab574
pull hotlinked images
2013-11-05 19:07:29 +01:00
Wojciech Zawistowski
2f2b99f766
removes unused view
2013-11-05 18:10:04 +01:00
Neil Lalonde
8724b2e2b6
Add comments about the IPAddr hack
2013-11-05 11:24:13 -05:00
Sam
15996bc52f
even on mobile it can be important
2013-11-05 13:44:18 +11:00
Sam
2c1b58c8cc
mini profiler is there for a reason :)
2013-11-05 13:43:50 +11:00
Sam
415d4df648
work around bust encodings passed in to method
2013-11-05 13:40:39 +11:00
Sam
1e21fc8c9a
fix regression in Rails 4
2013-11-05 10:32:35 +11:00
Neil Lalonde
9c91ddd854
Should have put order on the screened urls results
2013-11-04 16:31:31 -05:00
Neil Lalonde
bd9b85f076
Screened Urls page shows results for each domain instead of each url
2013-11-04 16:24:48 -05:00
Robin Ward
0b79636b99
Typo!
2013-11-04 15:56:03 -05:00
Robin Ward
ec7298d548
FIX: Regression on topic list for best of links.
2013-11-04 15:48:51 -05:00
Robin Ward
b8e63719f8
FIX: Don't autolink within a markdown link.
2013-11-04 14:24:40 -05:00
Robin Ward
cc47ade2ed
missing semi colon
2013-11-04 13:59:31 -05:00
Robin Ward
69503345c4
FIX: Some more non-english category errors
2013-11-04 13:43:33 -05:00
Robin Ward
ee6b97754a
Merge pull request #1611 from awesomerobot/master
...
Category-dropdown items have consistent widths... other fixes
2013-11-04 10:17:21 -08:00
Robin Ward
a13d05660f
FIX: Show status icons on user topic pages
2013-11-04 13:13:22 -05:00
Kris Aubuchon
5c3f12f369
merging
...
Merge remote-tracking branch 'upstream/master'
2013-11-04 12:59:17 -05:00
Neil Lalonde
ede59a4386
FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.
2013-11-04 12:51:09 -05:00
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
