github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 07:34:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,791 Commits 190 Branches 500 Tags 938 MiB
e4909c017c
Commit Graph

3742 Commits

Author SHA1 Message Date
Sam
49efb055f2 Merge pull request #1954 from verg/unbind_user_name 
Don't display edits during user's name update
 2014-02-17 10:38:43 +11:00
Sam
23af46a66c Merge pull request #1960 from verg/subcategory-search-links 
Fix subcategories links from search
 2014-02-17 10:33:35 +11:00
verg
7e8c30c715 Scroll to top on Site-Setting category render 2014-02-16 16:35:07 -05:00
verg
f723f11443 Fix subcategories links from search 2014-02-16 12:49:20 -05:00
Robin Ward
79b406c0f3 FIX: If default page is categories, anonymous users were seeing latest 
categories when going into a category.
 2014-02-15 18:54:04 -05:00
Neil Lalonde
d298e2e065 Detect Googlebot from user agent and use a different layout that doesn't load javascript 2014-02-15 17:54:34 -05:00
verg
fd40d40eca Don't display edits during user's name update 2014-02-15 11:10:06 -05:00
Kris Aubuchon
47d8db4516 making the background on unread notifications stand out a bit more 2014-02-14 23:15:39 -05:00
Régis Hanol
683bf8c0a4 FEATURE: add all email logs tab 2014-02-15 01:17:13 +01:00
Britt Ballard
60e1a5aa69 Use ERB when importing conf files into app 2014-02-14 16:14:55 -08:00
Régis Hanol
3f3c9ca7cb FEATURE: add filters on email logs 2014-02-15 00:50:08 +01:00
Régis Hanol
21f757fd72 mention shortcut in the tooltip on the submit button 2014-02-15 00:49:36 +01:00
Neil Lalonde
9c4dc9a966 Block browser-update.js in robots.txt. Move noscript block above everything else in application layout. 2014-02-14 15:33:00 -05:00
verg
8447fd47e5 Don't render 'Reply' button when user can't post 2014-02-14 14:10:22 -05:00
Robin Ward
f7b3856101 FIX: Don't append posts directly to the stream unless all posts are loaded. 2014-02-14 14:03:09 -05:00
Neil Lalonde
e83ec810e1 FIX: heading shouldn't say Sent At on the page that shows email that were not sent. duh. 2014-02-14 13:09:22 -05:00
Neil Lalonde
35dae76bbd Log when and why an email was not sent in email_logs 2014-02-14 13:06:39 -05:00
Neil Lalonde
42fb9d4fb1 Avoid calling can_delete_account twice 2014-02-14 13:06:39 -05:00
Robin Ward
feb4fa3bb5 FIX: Draft topics should remember the category you chose 2014-02-14 12:33:46 -05:00
Robin Ward
97aa2c8dfe Revert "FIX: restore category when opening draft" 
This reverts commit dd7fa2d946.

Unfortunately this introduced a regression where editing a post, then
replying soon after would leave you in edit mode.
 2014-02-14 12:06:58 -05:00
verg
de9cac0406 Add Private Message count to User Dropdown 2014-02-14 08:45:09 -05:00
Kane York
2e864f5ad7 Remove audio and video tags as well 2014-02-13 21:47:13 -08:00
Sam
177371fb69 do a full GC prior to getting stats 2014-02-14 16:10:26 +11:00
Sam
b75620973f FEATURE: memory stats route for diagnostics in admin 2014-02-14 15:45:12 +11:00
Kane York
5b819f191a Removing more stuff from the sanitizer whitelist 2014-02-13 20:18:40 -08:00
Kris Aubuchon
cdb888aec3 removing any :focus and/or outline definition so :focus falls back on the browser 2014-02-13 20:56:03 -05:00
Régis Hanol
a8b3269fdb reload the page when read_only mode is disabled 2014-02-14 00:27:25 +01:00
Régis Hanol
41d16a3657 forgot the AdminBackupsLogsRoute 2014-02-13 13:31:14 -08:00
Régis Hanol
b89d328de2 display/preload the logs of the last/current operation 2014-02-13 13:31:14 -08:00
Régis Hanol
50273ba815 rename site setting to 2014-02-13 13:31:14 -08:00
Régis Hanol
6123223fd0 change button order, read-only mode comes first 2014-02-13 13:31:14 -08:00
Régis Hanol
5725f02d9e allow full access to /admin/backups while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
0e941a6253 add an alert when trying to login while in read-only mode 2014-02-13 13:31:14 -08:00
Régis Hanol
38e365ea45 do not show the read-only alert to the admin 2014-02-13 13:31:13 -08:00
Régis Hanol
e7472dc374 readonly mode 2014-02-13 13:31:13 -08:00
Régis Hanol
b05bb86323 add rollback button style 2014-02-13 13:31:13 -08:00
Régis Hanol
babcc3fc50 backup & restore client-side code 2014-02-13 13:31:13 -08:00
Régis Hanol
310a439f3d update client-side admin routes 2014-02-13 13:31:13 -08:00
Régis Hanol
3be1b5569a backups controller & specs 2014-02-13 13:31:13 -08:00
Régis Hanol
93dd619080 Backup serializer 2014-02-13 13:31:13 -08:00
Régis Hanol
c82f7bb6dc Backup model 2014-02-13 13:31:13 -08:00
Régis Hanol
8344f0d8fd remove old import/export code 2014-02-13 13:31:13 -08:00
Régis Hanol
ffac197386 humanSize handlebars helper 2014-02-13 13:31:13 -08:00
Régis Hanol
fe3a76817d fix login on sub-directory install 2014-02-13 13:31:13 -08:00
Régis Hanol
7086f01de4 ligther danger dark highlight 2014-02-13 13:31:13 -08:00
Régis Hanol
c5c6986f02 remove gradient & box-shadow on buttons 2014-02-13 13:31:13 -08:00
Régis Hanol
a86002f582 add case insensitive test on ajax request type 2014-02-13 13:31:13 -08:00
Régis Hanol
185f4bd8c8 fix code styling 2014-02-13 13:31:13 -08:00
Régis Hanol
a89e7ab662 binding to a POJO is useless 2014-02-13 13:31:13 -08:00
Régis Hanol
26409dbef8 remove unnecessary () 2014-02-13 13:31:13 -08:00
Régis Hanol
1636dce624 this should really be the AdminController 2014-02-13 13:31:13 -08:00
Robin Ward
d3b2f87f8e In email digests, try to get longer excerpts if we don't have enough 
characters from the first paragraph.
 2014-02-13 16:11:01 -05:00
Robin Ward
0b6bd5c187 Schedule a blur on links when the route changes. Also, convert DOM 
cleanup tasks to only schedule once per render.
 2014-02-13 15:35:53 -05:00
Sam
c0686a6dc6 BUGFIX: regression, not handling nil count for recent report 2014-02-14 07:21:19 +11:00
Neil Lalonde
067b08c422 FIX: stupid mistake that broke flagging of posts 2014-02-13 15:10:02 -05:00
Neil Lalonde
85eba22d65 Use ember computed property shortcuts 2014-02-13 14:48:46 -05:00
Robin Ward
a555dc9f5e FIX: Incorrect post number following a link. Updated ember-cloaking. 2014-02-13 14:08:12 -05:00
Neil Lalonde
8711762143 Users who have made no more than one post can delete their own accounts from their user preferences page. 2014-02-13 13:52:06 -05:00
Robin Ward
5932e32528 Merge pull request #1937 from verg/user_dropdown 
Add User Avatar Dropdown
 2014-02-13 10:55:58 -05:00
verg
95f4c0f583 Add User dropdown menu to Header 2014-02-13 09:45:51 -05:00
Sam
bf957513ec correctly handle empty case 2014-02-13 17:27:50 +11:00
Sam
e8aa85d783 FEATURE: unread pms go in front of notification report 
also refactor fat controller
 2014-02-13 17:27:50 +11:00
Sam
4ff6780758 Merge pull request #1935 from eriko/remove_cas 
Remove cas
 2014-02-13 17:26:20 +11:00
Kris Aubuchon
7b53efe356 adding style for full-name on topic post user meta data 2014-02-12 21:39:37 -05:00
Kris Aubuchon
70c911018b adding style for full-name in user meta on posts 2014-02-12 21:32:47 -05:00
Vikhyat Korrapati
74ab14de19 Add poll plugin. 2014-02-13 07:39:01 +05:30
Sam
5d7a33a799 BUGFIX: flag topic broke all liking on the sites 2014-02-13 12:56:31 +11:00
Robin Ward
f73a3f252a FIX: Don't allow parent categories to be deleted. Also, remove 
duplicated logic and rely on the server response for `can_delete`
status.
 2014-02-12 17:24:25 -05:00
Robin Ward
a963dd9081 Support embeddable_host values that contain a HTTP/HTTPs protocol 2014-02-12 15:56:06 -05:00
Robin Ward
a929eda8ba NEW: Add user name and title to group posts. 2014-02-12 14:23:10 -05:00
Robin Ward
669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd 
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
 2014-02-12 14:01:36 -05:00
Neil Lalonde
6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Robin Ward
11ee4e7328 FIX: Incorrect doc change. Thanks @riking 2014-02-12 12:29:09 -05:00
Robin Ward
62592215f4 FIX: Testing environment did NOT like Discourse.URL 2014-02-12 11:31:11 -05:00
Robin Ward
721472dab4 FIX: Clicking the logo was not scrolling to the top 2014-02-12 11:03:04 -05:00
Sam
9ec52d9425 BUGFIX: mailing list mode broke regular email 2014-02-12 16:51:26 +11:00
Sam
4803d387bc BUGFIX: another broken rss page when it includes system user 2014-02-12 14:29:58 +11:00
Sam
03619917f0 BUGFIX: rails is choking on userpage_url for System user, breaks rss 2014-02-12 14:08:09 +11:00
Jeff Atwood
9b57501bfc Merge pull request #1936 from awesomerobot/master 
various css fixes
 2014-02-11 18:36:59 -08:00
Erik Ordway
8fc5c66c55 this needs to go but did not show up in my tests but did on travis 2014-02-11 18:13:24 -08:00
Kris Aubuchon
dd4d1eddd4 loading bg fix, watching/heatmap color fix, welcome sticky bg fix, user popup drop-shadow fix 2014-02-11 21:03:25 -05:00
Erik Ordway
1167b5c4b5 I can see this on git hub but it is being missing by the test 2014-02-11 17:25:54 -08:00
Robin Ward
ef16c08688 Don't show group title under poster, only show actual title, but link it 
to the group.
 2014-02-11 17:34:44 -05:00
Robin Ward
3d62df51a6 FIX: Broken MDTest + Fix for removing leading spaces in a code block 2014-02-11 17:27:24 -05:00
Régis Hanol
7a85e06119 BUGIX: no draft key when creating a topic from the /top page 2014-02-11 13:51:21 -08:00
Kris Aubuchon
c24c60e33f fixing the weird user space column bug on smaller browser widths 2014-02-11 16:00:59 -05:00
Robin Ward
b035c050d2 Merge pull request #1920 from nickborromeo/list-controller 
Extract queries to keep logic in the Categories Model
 2014-02-11 15:48:20 -05:00
Robin Ward
1e374e1958 Merge pull request #1926 from awesomerobot/master 
now that wbr tags are inputted, breaking usernames a bit more natually
 2014-02-11 15:43:41 -05:00
Robin Ward
80bdc6e430 Merge pull request #1929 from verg/fix_category_in_drafts 
FIX: restore category when opening draft
 2014-02-11 15:42:48 -05:00
Robin Ward
d44d2b3f10 FIX: Was not resuming scroll position on back button 2014-02-11 15:17:36 -05:00
Robin Ward
14f075e812 Missing semicolon; 2014-02-11 14:57:14 -05:00
Régis Hanol
b512afe5c9 BUGFIX: make sure we bind the uploader only once 2014-02-11 10:38:41 -08:00
Sam
e2d2a955dc BUGFIX: remove hidden posts from a users stream 2014-02-11 17:16:58 +11:00
Sam
7ad00f426c FEATURE REMOVAL: persona login 
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
 2014-02-11 16:56:48 +11:00
Kris Aubuchon
3b71f8af3a fixing restricted badge padding in the dropdown menu 2014-02-11 00:53:14 -05:00
Kris Aubuchon
6d47fabec7 fixing restricted badge padding 2014-02-11 00:46:17 -05:00
Kris Aubuchon
24f1832cca Merge remote-tracking branch 'upstream/master' 2014-02-11 00:44:10 -05:00
Sam
57ee244394 Bump up consistency check to run twice a day instead of once 2014-02-11 16:11:40 +11:00
Sam
11e962c848 BUGFIX: improve quality of unread / new counters 2014-02-11 15:28:05 +11:00
Sam
750d3a6b18 BUGFIX: ensure topic_view exists before attempting to access it 2014-02-11 10:23:47 +11:00
Sam
820fe572ca BUGFIX: phantom new and unread for category definition topics 2014-02-11 10:22:15 +11:00
Robin Ward
14449f236a FIX: Back button in chrome on static pages 2014-02-10 17:07:39 -05:00
Robin Ward
b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it 
and apply a CSS class to their posts.
 2014-02-10 17:00:15 -05:00
verg
dd7fa2d946 FIX: restore category when opening draft 2014-02-10 15:30:08 -05:00
Robin Ward
f1a9e52d7e When creating/editing a category the parent shoudl be none. 2014-02-10 14:08:16 -05:00
Robin Ward
45afed8720 FIX: Chrome has a bug where if you request the same URL with a different 
MIME type, then leave and hit the back button, you'll get the last MIME
type requested instead of HTML. This fixes it.
 2014-02-10 12:43:17 -05:00
Robin Ward
b61b33c0fa Add groups list to the poster expansion when you click an avatar while 
in a topic.
 2014-02-10 12:30:36 -05:00
Robin Ward
25070dcde7 FIX: Show the renamed uncategorized name instead of "(no category)" 2014-02-10 11:15:42 -05:00
Kris Aubuchon
dec7a9b998 now that wbr tags are inputted, breaking usernames a bit more natually 2014-02-10 09:45:35 -05:00
Jeff Atwood
c900ee055b Merge pull request #1924 from awesomerobot/master 
simplfying color palette, collecting colors into unified variables
 2014-02-09 22:34:25 -08:00
Kris Aubuchon
2d872795d6 simplfying color palette, collecting colors into unified variables 2014-02-10 01:04:21 -05:00
Sam
4f6cef01e4 fix build 2014-02-10 16:07:09 +11:00
Sam
5d0cae2dd1 BUGFIX: seen logic was incomplete, you can have user_data and still unseen topic 2014-02-10 15:27:46 +11:00
Nick Borromeo
b51bebb200 Extract queries to keep logic in the Categories Model 
This creates two methods in the Category model. This moves the model
logic to the model and just calls the Category class methods in
ListController.

This also adds tests for the two methods created in the Category
model. The motivation for this refactor is the code climate score of the
this class and readability of the code.

 Please enter the commit message for your changes. Lines starting
 2014-02-08 14:10:48 -08:00
Sam
56e09802fe BUGFIX: Use email sender 2014-02-09 07:29:16 +11:00
Régis Hanol
0a7dc83681 BUFGIX: read more should take you to the first post 2014-02-07 15:07:13 -08:00
Robin Ward
350eb82223 Don't include category definitions on Categories page 2014-02-07 17:01:31 -05:00
Neil Lalonde
e0df404d7e Add site setting tos_accept_required. If enabled, users must check a box saying that they've read and accept the terms of service. 2014-02-07 16:04:13 -05:00
Robin Ward
d769938660 NEW: Don't show the filter on the homepage. Just show the Forum's name 2014-02-07 16:03:26 -05:00
Robin Ward
9db044d54b FIX: Component was not refreshing all the time 2014-02-07 14:16:34 -05:00
Robin Ward
58247a51e8 Small tweaks to Group page 2014-02-07 13:46:59 -05:00
Neil Lalonde
130f0e19ec FIX: more protection from nil in count_with_subcategories 2014-02-07 11:38:22 -05:00
Robin Ward
3b617b04b0 FEATURE: First stab at groups page with member list 2014-02-07 10:44:51 -05:00
Robin Ward
e511e8a80b Link to groups from user profile 2014-02-07 10:44:51 -05:00
Robin Ward
2d47fe4473 Can list group members 2014-02-07 10:44:51 -05:00
Robin Ward
3b1ef6ebc9 Work in progress: Groups Page 2014-02-07 10:44:51 -05:00
Robin Ward
325c2dfaea Rename load to loadUsers which is what the method was actually 
doing.
 2014-02-07 10:44:51 -05:00
Robin Ward
bd0c2a74fc Return a promise from Discourse.Group.findAll() 2014-02-07 10:44:51 -05:00
Robin Ward
003eb06807 Move Discourse.Group into public models 2014-02-07 10:44:51 -05:00
Robin Ward
de57f29467 More templates for the group page 2014-02-07 10:44:50 -05:00
Robin Ward
a873f7a95a Client and Server side routes for a Group 2014-02-07 10:44:50 -05:00
Régis Hanol
e47f462f54 Merge pull request #1916 from vikhyat/pm-dominating 
Don't notify about dominating private messages
 2014-02-07 00:28:27 -08:00
Kris Aubuchon
02e194219f fixing watermark/gutter link interference, and also adding a transition to the topic-progress bar, so smooth! 2014-02-06 23:43:13 -05:00
Sam
d9c05fcfc8 SECURITY: dissalow mods from seeing PMs 2014-02-07 14:24:19 +11:00
Sam
93434be16d SECURITY: reduce moderator rights 
You can now hide particular categories from certain moderators
 2014-02-07 14:11:52 +11:00
Sam
e133c82d4b SECURITY: check permissions for mailing list 
if you deployed this feature in the last 2 hours upgrade asap.
 2014-02-07 14:10:45 +11:00
Vikhyat Korrapati
2f38316bfc Don't notify about dominating private messages. 2014-02-07 05:49:45 +05:30
Sam
be560d4eb6 Update annotations 2014-02-07 11:07:52 +11:00
Sam
227873df78 FEATURE: proper mailing list mode 
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
 2014-02-07 11:07:52 +11:00
Neil Lalonde
5b559d9631 Pinned uncategorized topics span the title and category column in topic lists 2014-02-06 14:38:04 -05:00
Neil Lalonde
113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Régis Hanol
9b3740a7c6 Merge pull request #1909 from codedinc/shortenUrl-fix 
Fix shortenUrl helper to not crash when URL doesn't include any "/".
 2014-02-06 16:35:11 +01:00
macournoyer
8bf872e92e Fix shortenUrl helper to not crash when URL doesn't include any "/". 2014-02-06 10:12:38 -05:00
Régis Hanol
c4cfd5a7fe BUGFIX: unbind the file uploader when closing the composer 2014-02-06 12:54:06 +01:00
Régis Hanol
58202baa62 BUGFIX: show the draft on top page 2014-02-06 11:39:43 +01:00
Régis Hanol
a710773bb4 BUGFIX: do not override default browser keyboard shortcuts behavior 2014-02-06 11:07:33 +01:00
Régis Hanol
6d3c3a02cb Merge pull request #1900 from ballistiq/allow_user_activation_on_create 
Whitelist :active param so that we can automatically create users that a...
 2014-02-06 09:56:00 +01:00
Régis Hanol
f2a75aaf26 Merge pull request #1908 from riking/docker-link 
Extract version check in dashboard to own template
 2014-02-06 09:54:03 +01:00
Jeff Atwood
f2c017ac1a Merge pull request #1910 from awesomerobot/master 
previous restricted badge fix broke restricted badges in titles, this fixes it
 2014-02-05 22:26:59 -08:00
Kris Aubuchon
00e941ff07 previous restricted badge fix broke restricted badges in titles, this fixes it 2014-02-06 00:30:44 -05:00