e060e952b5
Accidently removed some styles in the merge
2013-07-16 19:06:33 +00:00
5e08427dd3
Merge branch 'master' into fixed_modals
...
Conflicts:
app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
app/assets/stylesheets/application/modal.css.scss
2013-07-16 18:58:49 +00:00
cc28a4ddc3
FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way.
2013-07-16 18:32:35 +00:00
7c9bd8e8c9
Remove EvilTrout's stupid mistake.
2013-07-16 13:51:00 -04:00
2577d76e4f
Revert "Merge pull request #1201 from BrentleyJones/fixed_modals"
...
This reverts commit 7e889c4e24e9d37f395f
2013-07-16 13:38:01 -04:00
4bfb546942
Removed `modelReady` hack now that the async router exists
2013-07-16 13:24:59 -04:00
6929ee9f46
Changed HTML again on hamburger menu to make it easier to style
2013-07-16 12:24:18 -04:00
82c734ec84
FIX: FAQ wasn't loading sometimes
2013-07-16 12:11:30 -04:00
d466d11e71
Ember RC6 update
2013-07-16 10:35:18 -04:00
75282576b9
Merge pull request #1195 from initforthe/post-analyser-backtrace-fix
...
Post analyser backtrace fix
2013-07-16 07:34:54 -07:00
7e889c4e24
Merge pull request #1201 from BrentleyJones/fixed_modals
...
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 07:31:17 -07:00
e9d37f395f
hmm I totally missed that it was already there
2013-07-16 21:06:04 +10:00
06bd9e3234
allow login required screen to be customized
2013-07-16 20:49:04 +10:00
dc3079db37
fix mucked up styling, glyph should be inside the hyperlink so it gets color
2013-07-16 18:01:34 +10:00
ff7d9cac38
fix non localized said: in quotes
2013-07-16 17:22:54 +10:00
ef1c71ba98
missed a qunit test
2013-07-16 15:48:41 +10:00
352ac9e60c
Finalize read only and post only categories, finished off UI work
2013-07-16 15:46:11 +10:00
fce2d0e3b6
reply to first post === reply to topic
2013-07-16 15:46:11 +10:00
a3155858a0
Fix share URL for first post
2013-07-16 15:46:11 +10:00
ecf17cfebb
work in progress, add fidelity to category group permissions (full, create posts, readonly)
2013-07-16 15:46:11 +10:00
c7697bbae2
remove duplicate code
2013-07-16 15:44:38 +10:00
d1ab694920
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 03:40:15 +00:00
5ce05ff5cb
adds the `max_attachment_size_kb` setting
...
so that we can specify a different max upload size for attachments and images.
2013-07-16 02:01:36 +02:00
8c5e0e7550
Adding Portuguese-Brazil language
2013-07-15 14:45:16 -03:00
e8f3e7c2e8
Added classes for styling to hamburger menu
2013-07-15 13:31:52 -04:00
0e504aac9b
FIX: You can reset your password even if logins are required.
2013-07-15 12:12:54 -04:00
08723f00c6
FIX: Bugs on Admin User approval interface
2013-07-15 11:28:41 -04:00
ed60f24502
Merge pull request #1194 from ZogStriP/uploads
...
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
0fee644434
Merge pull request #1191 from cfstras/patches
...
Fix bug: pressing enter on the "forgot password" modal does not submit the form
2013-07-15 03:18:23 -07:00
96065a1499
Prevent backtrace in PostAnalyser
2013-07-15 11:15:04 +01:00
52fa9a5453
widen @name autocomplete dialog 20%
2013-07-15 00:42:02 -07:00
36e6345eee
change the icon in the composer toolbar with a more generic upload icon
...
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
3397c2235f
display the size of the attachment in the preview
...
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
6f2ce93ab2
FIX: create an upload when FastImage throws an exception
...
FastImage might throw an exception when it isn't able to recognize a
file as being an image (ie. happens when users changes the extension
manually)
Also improved upload specs a lot
2013-07-13 23:42:19 +02:00
b5593daae1
Fix bug: pressing enter on the "forgot password" modal does not submit the form
2013-07-13 22:24:09 +02:00
2aa487d2c8
Show who deleted a topic
2013-07-12 16:38:21 -04:00
0c7ead339b
Don't recalculate trustLevels combobox
2013-07-12 16:24:15 -04:00
62d161fd70
Show number before trust level. Also use less memory for trust levels.
2013-07-12 16:18:32 -04:00
35128c212b
FIX: User page broke when the user had no stats
2013-07-12 15:59:35 -04:00
15a41a41f2
Use fancy formatting in the suggested topics list
2013-07-12 12:47:26 -04:00
6122d31711
FIX: Jshint in computed.js - not in qunit?
2013-07-12 12:14:32 -04:00
6ca5df0a09
Can recover deleted topics. Deleted topics show the first post as deleted in the UI.
2013-07-12 12:09:17 -04:00
5eaae063f0
Discourse Macro Helpers + Minor Fix to Admin User View
2013-07-11 19:35:52 -04:00
bb5a9aa34b
Remove reliance on views for logic, move to controller
2013-07-11 16:55:07 -04:00
19c169540c
Staff can enter and view deleted topics
2013-07-11 16:39:35 -04:00
eba662b988
FIX: Topic Status Icons had weird margins after font awesome update
2013-07-11 12:04:39 -04:00
4540a51a8f
FIX: deleted_by wasn't showing up on refresh
2013-07-11 11:18:25 -04:00
7fd8bb75d9
Merge pull request #1177 from ZogStriP/attachments
...
Attachments
2013-07-11 06:49:20 -07:00
1aef6de4b0
automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite)
...
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
2013-07-11 11:22:00 +10:00
7792b7da48
Use the solid envelope icon. Font-awesome swapped icon-envelope and icon-envelope-alt.
2013-07-10 17:06:07 -04:00
ac41e94619
refactor optimized_image a bit
2013-07-10 22:59:54 +02:00
ffb9a1250a
don't track via AJAX when clicking on local attachments
2013-07-10 22:59:53 +02:00
1f8eaa6ca3
display correct template when attachment or image
2013-07-10 22:59:53 +02:00
27ab5f471c
support arbitrary attachments
2013-07-10 22:59:53 +02:00
e8c1a81e87
do not create global variables
2013-07-10 22:59:53 +02:00
6de1fed87a
Glyph stuff: Put them on the left of the user menu, fix padding on link arrows in gutter.
2013-07-10 16:58:58 -04:00
f1a5f4ce66
left align post quotes and blockquotes
2013-07-10 13:57:52 -07:00
8814f9ed05
Fix a case when a staff user views a topic with a deleted post by a nuked user; might be a temporary solution until we decide what to do with nuked records
2013-07-10 16:52:47 -04:00
91dc0b9ef1
JSHint issue with file that didn't show up in Qunit locally. Weird!
2013-07-10 16:29:53 -04:00
f58dec1ac0
Also include `deleted_at`
2013-07-10 16:27:02 -04:00
8ffe9e28d6
Shows who deleted a post
2013-07-10 16:22:49 -04:00
8888ae4b40
Added some macros to simplify code
2013-07-10 16:21:18 -04:00
1fef617818
Qunit tests for deleting posts on the front end. Support for `deleted_by`
...
property.
2013-07-10 16:21:13 -04:00
cdf0754626
Show/update post edits count and icon after editing a post
2013-07-10 15:15:13 -04:00
0e3e5bf533
Add relative_date_duration site setting
2013-07-10 12:38:43 -04:00
cc47616cdb
Merge pull request #1157 from abbat/email-custom-headers
...
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
d4ef582f94
Correct caption of 'Make Visible' button
...
The variable 'visible' is also used for toggling the admin menu visibility,
so it is always true when the visibility toggle is shown. Hence, it's caption
is always 'Make Invisible', even when the topic already is invisible.
2013-07-10 10:16:39 +02:00
8367326e76
glyphs on the user stream, rename responses to replies
2013-07-10 16:35:06 +10:00
7cee5efab8
The flattening part 2, cleaned up styling so it is more consistent with the removal of border yesterday
...
quote style now matches block quote style
2013-07-10 12:17:43 +10:00
b7327942af
Add `deleted_by` to `Trashable` tables
2013-07-09 15:46:36 -04:00
ba7a4e9845
Merge pull request #1165 from novemberkilo/feature/log-trust-level-boosts
...
Log all changes of user trust level by an admin
2013-07-09 12:16:08 -07:00
3c38062802
Check for updates: edge cases when the message on the dashboard doesn't make sense.
2013-07-09 14:01:08 -04:00
72632670db
FIX: Font Awesome upgrade changed padding on (+) Reply as New Topic
2013-07-09 13:34:00 -04:00
82b578249c
Subtle changes to border colors
2013-07-09 13:11:13 -04:00
efd631296e
FIX: Don't allow a user to stage a post while another is being staged.
2013-07-09 12:34:28 -04:00
b0dbb0ea13
And add tests for empty string & null
2013-07-09 20:19:10 +04:00
d98f288aa4
FIX: Recovering a deleted post was not updating a topic's statistics
2013-07-09 12:15:55 -04:00
1be08dbcb5
Merge pull request #1170 from abbat/russian-translation
...
Russian translation (actual version)
2013-07-09 08:26:35 -07:00
7ad471f019
FIX: If you split one topic already, the second topic was showing "Saving..."
2013-07-09 11:18:09 -04:00
e05a3569a1
FIX: Deep linking into a category was losing the badge
2013-07-09 10:57:52 -04:00
ed1fb847ed
Russian translation (actual version)
2013-07-09 18:26:59 +04:00
5cda0e556c
Merge pull request #1111 from jamesaanderson/flash-video-onebox
...
Add flash video onebox support
2013-07-09 06:55:56 -07:00
f9d1fcb169
Merge pull request #1140 from stephankaag/code_refactoring
...
Refactor code that raises deprecating warnings in Rails 4
2013-07-09 06:48:48 -07:00
437175b102
Merge pull request #1166 from jamesaanderson/mobile-and-tablet-video-rendering-fix
...
Mobile and tablet video rendering fix
2013-07-09 06:44:49 -07:00
f4c3416f1b
Merge pull request #1167 from ZogStriP/i18n-helper
...
I18n helper
2013-07-09 06:43:48 -07:00
a6b63b2871
de-box the topic posts a bit
...
I CANT TAKE IT ANY MORE AHHHHHHH
2013-07-09 03:38:01 -07:00
0f46df4670
workaround for bust up button on topics
2013-07-09 18:16:18 +10:00
8f892da890
move bookmark to end
2013-07-09 18:16:17 +10:00
171e703e11
Mobile and tablet video rendering fix
...
http://meta.discourse.org/t/chrome-for-ipad-iphone-breaks-with-this-video-embed/7983
2013-07-08 17:22:25 -07:00
1f263c57fd
fool jshint
2013-07-09 02:14:35 +02:00
c1acce17cc
removed unnecessary console.log
2013-07-09 02:10:55 +02:00
924c5d65cb
wrapped I18n.lookup to inject the "js" namespace
2013-07-09 02:10:55 +02:00
e993d6b29b
upgrade font awesome to version 3.2.1, use scss instead of css for the include.
2013-07-09 10:06:57 +10:00
806bd98f99
Update category's topic_count immediately when trashing or recovering a topic; this ensures that a category can be deleted without waiting for the category_stats job to run.
2013-07-08 15:23:20 -04:00
d3fe8f65a2
Add tooltip to avatars of people who liked a post
2013-07-08 14:00:47 -04:00
ad096ac2b7
More nav links on admin users list page
2013-07-08 12:44:14 -04:00
9b0f63627b
Add blocked users count to dashboard
2013-07-08 12:44:13 -04:00
2abfd38aee
Refactor code that raises deprecating warnings in Rails 4
2013-07-08 18:35:11 +02:00
cfc4dda9ff
FIX: OpenGraph should feature the desired post, if found in the set.
2013-07-08 12:21:39 -04:00
d51a3cf50f
Add flash video onebox as disabled setting by default
2013-07-08 06:37:44 -07:00
d77ce23de2
Log all changes of user trust level by an admin
2013-07-08 11:53:22 +02:00
4b437ccd2f
Merge pull request #1148 from nterray/fix_html_entities_after_editing_topic_title
...
Add :title as attribute for basic_topic
2013-07-07 23:45:25 -07:00
f42fc3be37
Merge pull request #1150 from mcwumbly/topic-likes
...
little tweaks to like counts in topic list view
2013-07-07 23:39:38 -07:00
807b9d438a
Merge pull request #1159 from jd-erreape/user_refactors
...
Refactors in user model
2013-07-07 23:38:16 -07:00
180d887481
title for category pages
2013-07-08 16:01:40 +10:00
2f096083d0
custom title for user page
2013-07-08 15:56:13 +10:00
085e094497
404 if a category does not exist ....
2013-07-08 15:56:13 +10:00
f1a31cd9e6
Merge pull request #1163 from ZogStriP/refactor-cooked-post-processor
...
refactored CookedPostProcessor
2013-07-07 22:01:48 -07:00
5d6ce6d17f
Merge pull request #1164 from ZogStriP/add-label-for-boolean-settings
...
add label for boolean setting
2013-07-07 22:00:09 -07:00
91238af6f1
correct failing specs
2013-07-08 12:25:38 +10:00
3dbb4ff9bc
Reorder filters on user page and name them better (All, Topics, Posts, Responses)
2013-07-08 12:12:06 +10:00
ae6ad734eb
remove bad console.log
2013-07-08 12:11:20 +10:00
d79aa917f1
add option suppress_reply_directly_above to stop suppressing the reply directly above
...
added a bunch of debugging information to help diagnose weird positioning issues
2013-07-08 11:13:45 +10:00
f9b2738ae1
add label for boolean setting
2013-07-08 01:43:30 +02:00
ac7253a938
refactor CookedPostProcessor & specs
2013-07-08 01:39:08 +02:00
27b038cd40
Refactored username validations to avoid repeated code
2013-07-07 13:05:18 +02:00
e4fc6e02ed
Added discourse hub nickname operations simplify and avoid repeated code
2013-07-07 12:40:35 +02:00
4e04c4dddd
Add custom headers for email messages
...
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
2013-07-07 04:37:44 +04:00
337f393af5
Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting
...
removed auto_link_images_wider_than setting
2013-07-06 17:12:11 -07:00
dd6530f45c
Merge pull request #1151 from abbat/patch-1
...
Fix title for plain view
2013-07-06 17:09:44 -07:00
f314bd9215
Merge pull request #1153 from abbat/patch-2
...
Add "Next page" link to plain topic view
2013-07-06 17:09:16 -07:00
45c227c81c
fix column name in admin email logs
2013-07-06 22:29:16 +02:00
6251935b1e
removed auto_link_images_wider_than setting
2013-07-06 22:19:16 +02:00
3dc850e3d4
Add "Next page" link to plain topic view
...
"Next page" link also under noscript tag and not indexed by old crawlers.
2013-07-06 18:57:08 +04:00
8cac92dd11
Fix title for plain view
...
Fix title for plain view - remove <a href=> tag from title.
2013-07-06 16:58:44 +04:00
a3eb175683
- like counts use number formatting (so 1100 is 1.1K like other counts)
...
- made 'likes' column wide enough to hold 3 digit and > 999 likes
2013-07-06 00:07:10 -07:00
d5285e2d93
Add :title as attribute for basic_topic
...
When we update the <title> after editing a topic, we should use the raw
`topic.title` as `topic.fancy_title` may contains some htmlentities and
will be displayed as is in the browser tab.
This fix the following issue:
> Incorrect HTML title after editing title/category of topic
> http://meta.discourse.org/t/incorrect-html-title-after-editing-title-category-of-topic/8136
2013-07-05 23:22:52 +02:00
25d2cbc33f
Merge branch 'master' of github.com:discourse/discourse
2013-07-05 16:52:27 -04:00
1c0e0da683
Add rss feed for latest and hot
2013-07-05 16:49:06 -04:00
1c18490141
Revert "cheat to fix duplicate key on thumbnails"
...
This reverts commit 0c702522c4
2013-07-05 16:09:43 -04:00
6cd6484b5e
New mode for Wordpress: Filter ONLY posts liked by moderators
2013-07-05 16:07:24 -04:00
2e7eee7ebd
FIX: Clear state when you abandon.
2013-07-05 13:55:33 -04:00
d1a0b5dd44
FIX: Editing a title would not clear it out on your next edit.
2013-07-05 13:04:54 -04:00
11bb9aafc7
Extra tests for composer
2013-07-05 13:04:49 -04:00
7335f5fb7f
Merge pull request #1145 from abbat/yandex-workaround
...
Workaround solution to help Yandex crawler index discourse.
2013-07-05 10:04:40 -07:00
84ce04dfa5
Use POST for send_activation_email action
2013-07-05 12:26:46 -04:00
694a6f4970
Fix recommendations from #1145
2013-07-05 15:59:39 +04:00
363e1010c4
never double load the stream.
2013-07-05 21:23:01 +10:00
0c702522c4
cheat to fix duplicate key on thumbnails
2013-07-05 15:01:31 +10:00
9afea0ed07
spec for change
2013-07-05 14:23:29 +10:00
f3ac84d41f
our referer is bust if there is no domain
2013-07-05 14:07:08 +10:00
7c82d6d4d0
FIX: new users are allowed to upload images to your servers
2013-07-05 00:44:18 +02:00
07ebd20776
Merge pull request #1143 from ahx/fix-cas-email-name-and-improve-authentication-specs
...
Improve the omniauth controller specs. Fix the email provided by CAS. Get name from CAS attributes.
2013-07-04 14:48:52 -07:00
e58d09a463
FIX: If the progress docked and you jumped to the top it could dissappear.
2013-07-04 17:35:20 -04:00
2d821d1ff4
Clicking the #site-logo will refresh the latest list.
2013-07-04 17:31:06 -04:00
4a3bc1fb43
More Javascript Tests + Fixtures. Also a rake task to crawl them.
2013-07-04 16:20:43 -04:00
594cb50f18
Use the correct locale in html lang attribute
2013-07-04 14:32:16 -04:00
227294897e
Remove .rss from the link element of channel in a category's rss feed
2013-07-04 14:17:01 -04:00
af36d32f7f
Workaround solution to help Yandex crawler index discource.
...
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
2013-07-04 22:08:23 +04:00
28c168fc2b
FIX: Unintended edits with composer
2013-07-04 13:35:15 -04:00
Brentley Jones
Robin Ward
Sam
Régis Hanol
premprakash
Tom Russell
Jeff Atwood
Claus Strasburger
Neil Lalonde
Adrian Lang
Anton Batenev
James Anderson
Stephan Kaag
Navin
Juan de Dios Herrero
David McClure
Nicolas Terray