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

1026 Commits

Author SHA1 Message Date
Sam
5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles 
auto replace rules in titles
 2013-04-10 21:12:20 -07:00
Neil Lalonde
c0f3c47196 Use message bus to broadcast addition and removal of categories 2013-04-10 15:53:36 -04:00
Kuba Brecka
11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde
229395729d Make title field bigger when editing a topic title 2013-04-10 14:19:34 -04:00
Neil Lalonde
28ed4defe3 Merge pull request #692 from ZogStriP/fix-text-not-updated-when-changing-notifications 
FIX: Text not updated when changing notifications after reading a topic
 2013-04-10 10:54:44 -07:00
Neil Lalonde
b2f017e87b Merge pull request #691 from ZogStriP/fix-setting-min-topic-title-length-is-ignored 
FIX: setting min_topic_title_length is ignored
 2013-04-10 10:04:42 -07:00
Neil Lalonde
03047b0ab0 Category is fetched from server when loading edit category modal, because topic_count needs to be up-to-date for the delete button to show/hide in a sane way 2013-04-10 12:08:24 -04:00
Neil Lalonde
5d46478e38 Add UI to delete an empty category 2013-04-10 12:08:23 -04:00
Régis Hanol
ebbd5af8bc FIX: Text not updated when changing notifications after reading a topic 2013-04-10 15:41:06 +02:00
Régis Hanol
d120a5d139 FIX: setting min_topic_title_length is ignored 2013-04-10 14:54:10 +02:00
Régis Hanol
c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam
33e3ad1603 clean up onebox application so it uses a single code path 
use fragments for oneboxes
strip parent <p> if <div> is in it
clean some tests
 2013-04-10 17:52:38 +10:00
Sam
ab9c55689e don't error out if no range is selected 2013-04-10 17:49:25 +10:00
Sam
c29390386f less crazy customize screen, more consistent with other screen 2013-04-10 15:55:33 +10:00
Sam
9b487953c4 collapse some db tests 
ensure deleted topics do not show up in user stream
 2013-04-10 12:50:00 +10:00
Sam
e8a6626e6a whitespace 2013-04-10 11:55:10 +10:00
Robin Ward
00f9e628e0 Don't apply markdown to content of [quote] -- it messes up spacing. 2013-04-09 17:32:50 -04:00
Neil Lalonde
6746415ef3 Fix colour picker size on iPad 2013-04-09 13:12:29 -04:00
Neil Lalonde
78d9b44106 Show custom colours in colour picker too 2013-04-09 12:52:22 -04:00
Robin Ward
1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2" 
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
 2013-04-09 12:33:32 -04:00
Robin Ward
5ba9e484f8 Merge pull request #650 from wojciechka/double_prefix_fix 
Detect and remove prefix being added twice when going to pages already in history
 2013-04-09 09:30:01 -07:00
Robin Ward
c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2 
move i18n of UserActions to JS-side and make sentences translatable
 2013-04-09 09:25:28 -07:00
Robin Ward
ab8196faea Merge pull request #679 from mark-rushakoff/remove_param_to_sym 
Don't call to_sym on param
 2013-04-09 09:21:52 -07:00
Neil Lalonde
d0887b61c1 Use checkmark instead of X on category colour picker 2013-04-09 12:02:02 -04:00
Robin Ward
161b8f43b6 Fix content editor in smaller widths 2013-04-09 11:28:28 -04:00
Robin Ward
fa27476267 Merge pull request #676 from kubabrecka/update_localized_tos 
update localized TOS
 2013-04-09 06:30:28 -07:00
Wojciech Kocjan
3cf240ada8 Detect and remove prefix being added twice when going to pages already in history. 2013-04-09 12:12:27 +02:00
Mark Rushakoff
56acb5fcce Don't call to_sym on param 2013-04-08 22:55:39 -07:00
Neil Lalonde
64eeb7f21e jshint made me break my code. Change logic to fix usedBackgroundColors and make jshint happy 2013-04-08 19:18:24 -04:00
Neil Lalonde
93f36cdf93 Show which category colors have already been used when creating/editing a category 2013-04-08 18:33:51 -04:00
Régis Hanol
2424a656e8 improve quote reply selection 2013-04-08 23:44:12 +02:00
Kuba Brecka
8d927418e8 move i18n of UserActions to JS-side and make sentences translatable 2013-04-08 22:54:08 +02:00
Robin Ward
75aeb9550f Convert a bunch of callbacks to promises 2013-04-08 16:51:03 -04:00
Kuba Brecka
57b9fe4602 update localized TOS 2013-04-08 22:35:48 +02:00
Robin Ward
02bab415bd Convert Autocomplete to use promises 2013-04-08 14:59:00 -04:00
Robin Ward
6c983218b3 Clean up JS 2013-04-08 14:58:17 -04:00
Neil Lalonde
0f767ca227 Trim category description at 200 chars in category combobox 2013-04-08 12:18:19 -04:00
Robin Ward
4ad006ea97 FIX: non-logged in users couldn't see who liked something 2013-04-08 11:57:23 -04:00
Neil Lalonde
467d59ec5a Merge some work: topic counts in category select; fix All count on dashboard 2013-04-08 10:23:29 -04:00
Jeff Atwood
cd5b778305 fix caret alignment on drop-down notification btn 2013-04-07 23:46:45 -07:00
Sam
73c508115a better consistency check 2013-04-08 13:02:20 +10:00
Sam
9ad320768e Merge pull request #667 from ZogStriP/dont-track-links-in-oneboxes 
don't track links in oneboxes
 2013-04-07 18:30:24 -07:00
Sam
11ff0ccd03 correct logic for tracking the highest seen post number so its always consistent 2013-04-08 11:12:52 +10:00
Sam
fd31f946ee correct count 0 on user filters 2013-04-08 10:42:18 +10:00
Régis Hanol
d080ae4d2d don't track links in oneboxes 2013-04-08 02:24:12 +02:00
Sam
3ba0bf6d5d Merge pull request #651 from ZogStriP/change-title-background-when-composer-requirements-are-not-met 
Change Title background to red when requirements are not met
 2013-04-07 15:11:10 -07:00
Sam
9a1619727d Merge pull request #670 from ZogStriP/add-some-tests-for-uploads 
added some tests for uploads
 2013-04-07 15:05:35 -07:00
Régis Hanol
41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00
Régis Hanol
1692350336 added some tests for uploads 2013-04-07 17:52:46 +02:00
Régis Hanol
f211b9601a change title background to red when requirements are not met 2013-04-07 15:32:06 +02:00
Régis Hanol
aecf03c4f5 FIX: quote reply button was wrong when there is a custom header 2013-04-06 23:05:50 +02:00
Jeff Atwood
78cb85eb53 oneboxes don't need a border-radius 2013-04-06 02:12:21 -07:00
Jeff Atwood
5842233d4f remove caret style, only used one place 2013-04-06 01:43:59 -07:00
Jeff Atwood
705f94668f one more unused bootstrap style 
I CAN SEARCH WITH REGEX MANNN
 2013-04-06 00:42:36 -07:00
Jeff Atwood
a8e5d15a25 fix star alignment on topic titles 2013-04-06 00:06:45 -07:00
Jeff Atwood
836050457e remove more unused bootstrap default styles 
confirmed unused with searches
 2013-04-05 17:19:51 -07:00
Jeff Atwood
b78362bb85 add back in font-awesome <li> rule 2013-04-05 15:40:36 -07:00
Jeff Atwood
3588bb828a removing unneeded css vendor prefixes caniuse.com 2013-04-05 14:52:21 -07:00
Jeff Atwood
b89086a0ab add text-align: center to header icons 2013-04-05 14:27:58 -07:00
Jeff Atwood
66d4b5fa08 remove vendor prefixes from chosen CSS 
we're modern baby
 2013-04-05 14:23:12 -07:00
Jeff Atwood
2179675254 remove a bunch of unneeded font-awesome css 2013-04-05 13:55:35 -07:00
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