github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 04:53:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1,777 Commits 214 Branches 500 Tags 960 MiB
f6db90dae7
Commit Graph

965 Commits

Author SHA1 Message Date
Robin Ward
a14f62766e Replace MultisiteI18n hack with SiteContent and admin editing. 2013-04-05 16:48:15 -04:00
Jeff Atwood
52f79e8096 1st child in post body blockquotes, no top margin 2013-04-05 13:43:40 -07:00
Robin Ward
c6bd6371f2 Exclude recently made invisible topics from the categories list. Also remove a couple n+1 queries. 2013-04-05 16:09:27 -04:00
Neil Lalonde
ee43ce693f Add topic counts to category selector 2013-04-05 15:43:56 -04:00
Robin Ward
fe8d2377e8 admins/moderators should not receive "body is too similar" when editing 
a regular user's post.
 2013-04-05 15:38:03 -04:00
Robin Ward
72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Neil Lalonde
91b9479986 Hide search icon in category selector when there are few categories 2013-04-05 14:39:03 -04:00
Neil Lalonde
eb212aec9b Fix dashboard totals for topics, posts, and private messages 2013-04-05 14:09:16 -04:00
Robin Ward
af9b27358c If an admin or moderator edits a visitor's post, the restrictions should be based 
on the *editors* access rights, not the original poster.
 2013-04-05 13:59:00 -04:00
Wojciech Kocjan
0481fbae8c Fix for reply to user avatar and picture uploading not working when editing post with discourse running in a prefix 2013-04-05 12:46:14 +02:00
Sam
5273657537 a method called "adding_user_record" is annoying me. 5 lines of code replaced with 2 2013-04-05 17:53:39 +11:00
Sam
ea8d69fbd6 fix my broken test 2013-04-05 17:47:54 +11:00
Sam
a2cca2540e some minimal site settings diags 
fix issue where days_visited was totally out of sync
 2013-04-05 17:47:54 +11:00
Sam
a7f92ec0c1 topic reply count resync for each new post 2013-04-05 17:47:54 +11:00
Sam
bf8e756175 Merge pull request #637 from wojciechka/master 
Putting rootURL in JavaScript using Discourse::base_uri and erb
 2013-04-04 21:42:54 -07:00
Sam
27776287f4 Merge pull request #654 from ZogStriP/consistent-behavior-regarding-file-uploads 
consistent behavior regarding file uploads
 2013-04-04 21:36:17 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Régis Hanol
82bd92dd46 consistent behavior regarding file uploads 2013-04-05 01:07:31 +02:00
Jeff Atwood
6aaa0ffe5e add max-width to all img in onebox-result-body 2013-04-04 15:20:11 -07:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde
bd0e98aec2 Fix for when category description has html. Could be better. 2013-04-04 17:16:30 -04:00
Neil Lalonde
d974aea536 Underline links in the detected problems messages on admin dashboard 2013-04-04 16:16:58 -04:00
Neil Lalonde
66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Neil Lalonde
4096c6bdc2 Use a font-awesome icon in category search field instead of the default hideous one 2013-04-04 12:46:38 -04:00
Neil Lalonde
a4a09dc242 Fix styling of category select when editing a topic title 2013-04-04 11:34:07 -04:00
Neil Lalonde
3e0ef018ab Use temp variable for .chosen().next() 2013-04-04 10:44:11 -04:00
Wojciech Kocjan
a875b1c44a Store base URI in Discourse.BaseUri and use it in all places where rootURL was previously used 2013-04-04 11:16:38 +02:00
Jeff Atwood
02c6f0f631 make ban the actual icon-circle-ban, and danger 2013-04-04 02:09:27 -07:00
Jeff Atwood
9eec973fc4 screwed up the magicks a bit. 2013-04-04 01:56:35 -07:00
Jeff Atwood
90d979d88d add moderator MAGGICCCKKSSSSSsssSSss 2013-04-04 01:52:47 -07:00
Sam
e61a28f3e1 utc vs non utc is a subtle issue, tests were failing for a few hours every day cause of this 2013-04-04 13:29:54 +11:00
Sam
86cf7b1524 trust level 0 is highlighted in light gray as opposed to having special semantics around account age. 2013-04-04 12:24:23 +11:00
Sam
4871454705 Merge pull request #639 from ZogStriP/cleaner-login-modal-when-there-is-no-login-button 
cleaner login modal when there is no login button [fixes #638]
 2013-04-03 16:40:39 -07:00
Neil Lalonde
68e9a727b8 Merge branch 'categories' 2013-04-03 17:50:42 -04:00
Neil Lalonde
5871b01323 Show descriptions in category combobox 2013-04-03 17:46:51 -04:00
Régis Hanol
aca7fa01bb cleaner login modal when there is no login button [fixes #638] 2013-04-03 23:28:42 +02:00
Robin Ward
5beaf61ac0 Removes extra comma 2013-04-03 16:33:25 -04:00
Robin Ward
5ec41d454c Converted a bunch of ajax calls to use promises 2013-04-03 16:24:42 -04:00
Robin Ward
33f349a1e6 Show all Hot rankings at once with a toggle button 2013-04-03 15:25:18 -04:00
Neil Lalonde
bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward
738789f336 Admins can't lock themselves out of a site by setting approval. 2013-04-03 12:23:28 -04:00
Robin Ward
459c7e3d59 Include pinned on Categories page 2013-04-03 11:45:53 -04:00
Robin Ward
ac0bc1bb30 Including your avatar if you've posted is confusing. Let's remove it for now. 2013-04-03 11:29:50 -04:00
Robin Ward
59e4e77190 Merge pull request #634 from wojciechka/master 
Allow handling of back/forward buttons in browser when running with prefix (i.e. as /discourse)
 2013-04-03 08:11:53 -07:00
Robin Ward
2b9514a311 Merge pull request #627 from kubabrecka/translatable_flags_and_likes 
make post actions (likes, flags) translatable as whole sentences
 2013-04-03 08:09:13 -07:00
Robin Ward
368011d03b Merge pull request #628 from ZogStriP/add-uploads-controller-specs 
add UploadsController specs
 2013-04-03 08:06:49 -07:00
Robin Ward
0e09c8b9b9 Merge pull request #622 from ZogStriP/prevent-users-from-uploading-files-other-than-images 
prevent users from uploading files other than images
 2013-04-03 07:39:55 -07:00
Wojciech Kocjan
a0ef917736 Reworked rootURL in ember.js and allow handling of back/forward buttons in browser 2013-04-03 14:41:26 +02:00
Sam
814be151c1 fixed regression 2013-04-03 16:47:33 +11:00
Régis Hanol
2b120ef886 add UploadsController specs 2013-04-03 01:17:17 +02:00
Robin Ward
ee76f1926d Debugging Tool for Hot Topics 2013-04-02 18:00:53 -04:00
Sam
161fdcb364 fix weird selection bugs during quote reply. 2013-04-03 08:10:29 +11:00
Sam
f99d40b419 push login form to the bottom so its not hovering on the top in lynx or google summary 2013-04-03 07:44:35 +11:00
Kuba Brecka
f957b0aee5 make post actions (likes, flags) translatable as whole sentences 2013-04-02 21:15:55 +02:00
Neil Lalonde
202addb693 User Visits count for 30 days ago was always 0 2013-04-02 15:03:23 -04:00
Neil Lalonde
b6a6581b3c Refactor some report javascript to get rid of some helpers 2013-04-02 14:41:13 -04:00
Robin Ward
75703cfc6a Minor JS cleanup 2013-04-02 12:44:03 -04:00
Neil Lalonde
3fda486020 Use envelope icon for Private Message button 2013-04-02 12:28:41 -04:00
Robin Ward
e8d66beea5 Fix @notification text for non visitors 2013-04-02 11:58:12 -04:00
Robin Ward
422dbbd25a Exclude older topics from the first x rows in "Hot" 2013-04-02 11:15:04 -04:00
Régis Hanol
3524a93cfb prevent users from uploading files other than images 2013-04-02 11:38:15 +02:00
Régis Hanol
dd4f24919f Fix some 'quote reply' button quirks 2013-04-02 10:35:22 +02:00
Jeff Atwood
effb440de0 remove close function from browser update nag 2013-04-02 00:42:59 -07:00
Sam
9c9087b99c less bloated browser update 
no need for respond.js (ie8 compat stuff)
preload store should not be naming stuff get, its reserved
bad js generates for preload store
use browse happy, cause its better
 2013-04-02 17:44:48 +11:00
Jeff Atwood
b9be14101b remove margins from h3,h4 in onebox body 2013-04-01 21:23:47 -07:00
Sam
133ea0b8a0 no idea where this loading message came from but we don't seem to need it 2013-04-02 15:20:59 +11:00
Sam
08af09cd7d don't pass notification email into to the default cause it freezes in a potentially incorrect value 2013-04-02 13:29:34 +11:00
Robin Ward
2a6889c087 Removes repetitive view.category from the template 2013-04-01 20:56:04 -04:00
Sam
f2f82ea83b Merge pull request #614 from ZogStriP/implemented-cancel-image-upload 
users can now cancel image upload
 2013-04-01 17:39:17 -07:00
Sam
190f7b4812 classes for logo big and small 2013-04-02 11:37:41 +11:00
Sam
3376ea5615 Merge pull request #619 from ZogStriP/fix-cannot-paste-text-in-composer 
FIX: cannot paste text in composer
 2013-04-01 17:19:49 -07:00
Sam
028d3bd19f remove problem chars from browser update 2013-04-02 11:07:41 +11:00
Régis Hanol
0cb8ea1426 FIX: cannot paste text in composer 2013-04-02 02:05:20 +02:00
Robin Ward
61b5c0340e Convert all Ajax calls to use Discourse.ajax() 2013-04-01 18:09:23 -04:00
Neil Lalonde
5344ab2893 Remove weird characters from browser-update.js 2013-04-01 17:33:11 -04:00
Jeff Atwood
533936f3a2 increase max_mentions to 10 2013-04-01 14:31:07 -07:00
Neil Lalonde
acb2a18e8a Show a Please Upgrade message to people on unsupported browsers 2013-04-01 16:19:57 -04:00
Robin Ward
1e6f8dc93a Include uncategorized pinned topics on 'Hot' 2013-04-01 13:49:35 -04:00
Régis Hanol
cf9b5d1a3d users can now cancel image upload 2013-04-01 19:01:29 +02:00
Robin Ward
79c986dd92 Fix issue with duplicate slugs 2013-04-01 12:26:51 -04:00
Robin Ward
e4d190d856 XSS fix for category descriptions 2013-04-01 12:01:27 -04:00
Robin Ward
4c5ab8d688 Update Discourse to Ember 1.0 RC2 2013-04-01 11:26:24 -04:00
Robin Ward
f429e95d4e Merge pull request #601 from kubabrecka/split_multiple_pluralization 
split i18n strings where there are 2 pluralizable variables
 2013-04-01 07:49:05 -07:00
Robin Ward
0fc86a9869 Merge pull request #605 from kubabrecka/i18n_pluralization 
implement pluralization for server-side and js
 2013-04-01 07:48:10 -07:00
Neil Lalonde
68710be564 Merge pull request #610 from PragTob/ReportsRemoveDuplication 
Battling code duplication in the Report class
 2013-04-01 07:39:44 -07:00
Robin Ward
f9ea1a448d Merge pull request #600 from kubabrecka/consistent_topic_count 
make sure Category.topic_count is consistent with week/year stats
 2013-04-01 07:37:07 -07:00
Robin Ward
f8931d371c Merge pull request #609 from katiefenn/docked_topic_progress_bug 
Topic progress does change its X coordinate when switching between static and float views
 2013-04-01 07:31:00 -07:00
Robin Ward
8f518a2496 Merge pull request #604 from wpp/refactor_suggest_username 
Improve suggest_username method in user class
 2013-04-01 07:25:27 -07:00
Robin Ward
b61907fbf3 Merge pull request #593 from ZogStriP/get-quote-reply-button-working-on-ios 
Get the "quote reply" button working on iOS
 2013-04-01 07:20:49 -07:00
Robin Ward
75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload 
improved images upload on the client side
 2013-04-01 07:11:26 -07:00
Robin Ward
865cf011a2 Merge pull request #561 from ZogStriP/fix-quote-reply-gets-in-the-way 
FIX: "Quote Reply" button gets in the way
 2013-04-01 07:04:46 -07:00
Tobias Pfeiffer
3324f0f2d2 Battling code duplication in the Report class 
* the reports mainly followed the same structure but with
  different classes, so I took the code and a class as its
  parameter
* the method on which reports.data is generated may change
  but mostly is count_per_day so made that optional
* grouped the refactored methods to the top, some unrefactored
  methods remain but those are a bit harder to refactor, and not
  as reusable so I'd like to get this through first
* Overall I believe this patch enhances maintainability :-)
 2013-04-01 15:26:58 +02:00
katiefenn
2a18c9c600 Topic progress does change its X coordinate when switching between static and float views 2013-04-01 11:50:01 +01:00
Sam
dce2847b4f Merge pull request #597 from ZogStriP/fix-s3-image-upload 
FIX: S3 image upload
 2013-04-01 03:12:58 -07:00
Sam
128bba302f Merge pull request #588 from mark-rushakoff/admin-title-tooltip 
Add admin title to trophy tooltip in admin users list
 2013-04-01 03:11:37 -07:00
Sam
7043ab906f Merge pull request #602 from knoxmic/master 
FIX: Autocomplete, missing charcode for correct term
 2013-03-31 23:52:02 -07:00
Régis Hanol
72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Kuba Brecka
af0a772629 implement pluralization for server-side and js 2013-03-31 19:55:02 +02:00
Philipp Weissensteiner
c34f476b31 Improve suggest_username method in user.rb 
The suggest_username method showed up on codeclimate
so I thought I'd give it some love and make it more readable.
In the process removed trailing whitespaces and had to fix a
terrible spelling error :)
 2013-03-31 19:01:11 +02:00
knoxmic
182f794466 fix autocomplete charcode '0' and 'z' 2013-03-31 16:00:21 +02:00
Kuba Brecka
1c50c99e9a split i18n strings where there are 2 pluralizable variables 2013-03-31 14:20:02 +02:00
Kuba Brecka
d50b5e1fd8 make sure Category.topic_count is consistent with week/year stats 2013-03-31 13:22:05 +02:00
Kuba Brecka
db56d2bc97 let <title> contain site name instead of just "Discourse" 2013-03-30 23:16:59 +01:00
Neil Lalonde
92aa0f45d2 Show trends on some dashboard numbers 2013-03-30 14:07:35 -04:00
Régis Hanol
0aff5042e5 FIX: S3 image upload 2013-03-30 17:56:25 +01:00
Régis Hanol
b7a7d8b006 Get the "quote reply" button working on iOS 2013-03-30 02:52:52 +01:00
Neil Lalonde
d0f810dee5 Don't request list of problems from server as often if there weren't any problems 2013-03-29 16:05:29 -04:00
Neil Lalonde
25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Régis Hanol
5ea35ff393 FIX: "Quote Reply" button gets in the way 2013-03-29 19:34:45 +01:00
Robin Ward
df85201298 Adjust hot to include more recent topics 2013-03-29 13:33:31 -04:00
Neil Lalonde
436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward
92eaa69df9 Merge pull request #589 from goshakkk/user-admin-scope 
Create the User.admins and User.moderators scopes
 2013-03-29 10:06:28 -07:00
Robin Ward
de8f525701 Merge pull request #582 from kubabrecka/add_es_js 
adding "es" translation js file
 2013-03-29 10:04:24 -07:00
Gosha Arinich
bdfa9b0508 create the User.admins and User.moderators scopes 2013-03-29 09:52:09 +03:00
Mark Rushakoff
f633d1232f Add admin title to trophy tooltip in admin users list 2013-03-28 22:53:54 -07:00
Mark Rushakoff
3e3712a517 Don't call to_sym on param 2013-03-28 20:50:07 -07:00
Jeff Atwood
cb6b9ccc6d make h1 margins specific to .cooked, and preview 2013-03-28 17:07:57 -07:00
Neil Lalonde
f2d61496af Fix automatic selection of share link 2013-03-28 16:58:41 -04:00
Robin Ward
a819a26f34 BUGFIX: New status posts weren't using PostCreator 2013-03-28 16:40:54 -04:00
Robin Ward
473a64d39d Add score, percent_rank to topics. Adds HotTopic model and consolidated job to calculate 
hotness. Note: People on Heroku will have to update their jobs to the new structure
in Heroku.md
 2013-03-28 15:39:54 -04:00
Kuba Brecka
30babccc64 adding "es" translation js file 2013-03-28 19:30:37 +01:00
Régis Hanol
1668b5eab2 FIX: allows the selection of the default landing tab 2013-03-28 14:01:13 +01:00
Sam
0bcd142a81 Merge pull request #193 from tms/timing-is-everything 
Make topic lists show last activity more intuitively
 2013-03-27 22:57:44 -07:00
Sam
2295290383 added best=N option to get N best comment on a post 2013-03-27 22:53:11 -07:00
Neil Lalonde
e263cb81ca Make sure share dialog goes away when clicking outside of it, including links to other routes 2013-03-27 19:43:47 -04:00
Robin Ward
e0fc7afc41 Fixes bug where progress looked weird when creating a new post. 2013-03-27 17:41:02 -04:00
Neil Lalonde
55884e4b77 Escape key closes share dialog 2013-03-27 16:29:02 -04:00
Robin Ward
36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde
d1945057fd Include topic title in share links with third parties 2013-03-27 16:01:46 -04:00
Neil Lalonde
35f3cd9325 Make login buttons even smaller 2013-03-27 14:36:26 -04:00
Robin Ward
b9fee3bf00 Robin sucks at jshint 2013-03-27 12:31:17 -04:00
Neil Lalonde
4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
Robin Ward
d9539225f8 Merge pull request #574 from wojciechka/master 
Fix URL for composer /education paths when using prefix for Discourse
 2013-03-27 08:58:27 -07:00
Robin Ward
a9019288c5 Let's use a horizontal control for selecting the hotness rather than a dial. 2013-03-27 11:57:22 -04:00
Wojciech Kocjan
c88c7538b6 Fixed URL for composer /education paths 2013-03-27 16:10:47 +01:00
Robin Ward
4cb4843323 Includes post count in filter message by user 2013-03-27 10:53:43 -04:00
Robin Ward
ba8e526950 Fix z-index of "in reply to" tabs versus filter message. 2013-03-27 10:48:12 -04:00
Kuba Brecka
41c9c4f253 update Sugar.js localized date formats 2013-03-27 09:29:25 +01:00
Sam
fc94d3e551 match the create api with the update api ... so api is more consistent 2013-03-26 23:49:35 -07:00
Robin Ward
994ab94107 Remove extra comma 2013-03-26 18:37:07 -04:00
Robin Ward
af7f6fea28 Can set the hotness of a category. For the soon to be implemented "hotness" tab. 2013-03-26 18:08:58 -04:00
Neil Lalonde
5961ffc0e4 Add site setting to choose which share links to show and in what order 2013-03-26 17:17:37 -04:00
Neil Lalonde
1b779e5e71 Increase the size of the share links 2013-03-26 17:17:37 -04:00
Neil Lalonde
7bfd66aa80 Add title attrs to share links 2013-03-26 17:17:37 -04:00
Robin Ward
a30c019275 Show totals in best of yellow thigny. 2013-03-26 15:40:30 -04:00
Robin Ward
f1e2923a91 Display correct post counts, even with a filter active 2013-03-26 15:06:23 -04:00
Robin Ward
5dc47c2d82 Rename posts_count in topic view to post_counts_by_user which makes much more sense 2013-03-26 14:06:24 -04:00
tms
172173eccc Make topic lists show last activity more intuitively 2013-03-25 22:13:23 -04:00
Sam
c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam
a177264114 refactoring of topic view tracking 2013-03-25 18:04:46 -07:00