github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 05:07:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,088 Commits 190 Branches 500 Tags 938 MiB
38abac8877
Commit Graph

3088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
38abac8877 no idea why, but jenkins does not like this pending spec 2013-06-26 16:38:52 +10:00
Sam
bb0c3302f3 oddly enough having this code in a pending block causes an error in jenkins 2013-06-26 16:28:07 +10:00
Sam
48d7a33157 Flag UI now displays deleted status for post/topic correctly on old flags 
Commented out a spec that was failing in order random, with a TODO
 2013-06-26 16:18:50 +10:00
Sam
148d2f2cd4 bug fixes 2013-06-26 16:00:17 +10:00
Sam
65dc04c00e simplify flag reporting and correct it so it properly displays old flags 2013-06-26 15:57:55 +10:00
Jeff Atwood
1323a717da Merge pull request #1094 from Supermathie/sysadmin-docs 
docs: fix ugly linebreak issues in INSTALL-email
 2013-06-25 22:34:50 -07:00
Michael Brown
6dc5659fed docs: fix ugly linebreak issues in INSTALL-email 2013-06-26 01:22:11 -04:00
Sam
7a16472041 Merge pull request #1093 from ZogStriP/soften-the-lightbox-overlay 
soften the lightbox overlay
 2013-06-25 18:49:12 -07:00
Régis Hanol
d3eae56e71 soften the lightbox overlay 2013-06-26 02:44:20 +02:00
Sam
92562c2090 Merge pull request #1057 from house9/list-controller-1 
refactor list_controller
 2013-06-25 17:36:56 -07:00
Sam
4b56aa8183 Merge pull request #1089 from budnik/minor_refactorings 
Some refactorings
 2013-06-25 17:29:51 -07:00
Sam
3af12ba7d3 Merge pull request #1088 from ComputerDruid/fix-ipv6 
Fix ipv6 addresses in the database
 2013-06-25 17:25:48 -07:00
Sam
3d75e69bd5 gem update 2013-06-26 10:04:41 +10:00
Dan Johnson
98f926f193 remove unneeded has_ip_address gem 2013-06-25 19:47:32 -04:00
Dan Johnson
9f6b7889a8 views: convert 'ip' (bigint) -> 'ip_address' (inet) 
This fixes all known issues when connecting to discourse over IPv6.

This table has no primary key, so the migration is done with update_all,
for each ip address in the views table. Since this table can potentially
grow quite large, this process might take a long time. I don't know any
way around this, though.

This migration uses a SQL command to populate the new field from the old
one, so as not to rely on the View model class, which should keep the
migration from failing if that class is modified in the future.
 2013-06-25 19:47:25 -04:00
Dan Johnson
2e478d8537 TopicLinkClick: convert 'ip' (bigint) -> 'ip_address' (inet) 
When accessed over IPv6, the ip address of the user is a 128-bit number,
too big for PostgreSQL's bigint data type. Since PostgresSQL has the
built-in inet type, which handles both IPv4 and IPv6 addresses, we
should use that instead. Where this is done elsewhere in the codebase,
the column is called ip_address, so we should follow that convention as
well.

This migration uses a SQL command to populate the new field from the old
one, so as not to rely on the TopicLinkClick model class, which should
keep the migration from failing if that class is modified in the future.
 2013-06-25 19:41:19 -04:00
Neil Lalonde
b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Neil Lalonde
a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Robin Ward
9a19c0d9c4 Fix for multiple paragraph emails with text em-dashes in them (--). 2013-06-25 14:06:05 -04:00
Jeff Atwood
87db582297 minor copyedit on "20 to go.." 2013-06-25 10:36:46 -07:00
Jeff Atwood
a9f4fa4927 copyedits on reply via email 2013-06-25 10:07:27 -07:00
Robin Ward
3067c2ed3b Private messages have instructions for reply by email. We also strip X-Discourse headers 
before sending the message as they are no longer needed.
 2013-06-25 11:35:26 -04:00
Jesse House
2e12eb2b62 refactor list_controller 
- minor refactoring of actions 'category' and 'category_feed'
- fix defect in 'category' where check was for literal
  string 'uncategorized' instead of SiteSetting.uncategorized_name
- major refactoring on defined topic actions
 2013-06-25 08:29:00 -07:00
Robin Ward
3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Dmitriy Budnik
2722029d38 stylistic refactorings 
w/ less syntactic sugar
 2013-06-25 18:23:23 +03:00
Robin Ward
62daeedf08 Merge pull request #1092 from ZogStriP/rolling-back-markdown-conversion-pipeline-order-changes 
reverting changes to the markdown conversion pipeline order
 2013-06-25 08:20:10 -07:00
Régis Hanol
573c4b41f0 reverting changes to the markdown conversion pipeline order 2013-06-25 17:13:41 +02:00
Neil Lalonde
8ee00b4d5e Make the reply-on-which-topic modal bigger 2013-06-25 10:50:36 -04:00
Robin Ward
a4e8a828c8 Merge pull request #1091 from mfeckie/refactor-tests 
Refactor tests
 2013-06-25 07:31:19 -07:00
Martin Feckie
674e26e6c3 Updated tests to decrease string repetition 
Removed an unused variable
Some minor style changes
 2013-06-25 22:15:41 +08:00
Sam
7d1e8239e0 Merge pull request #1070 from house9/top-menu 
adds TopMenuItem model which encapsulates top_menu parsing logic
 2013-06-25 02:51:57 -07:00
Sam
4c51f36db2 was dropping off the last key when inviting a user by email. 2013-06-25 17:53:12 +10:00
Sam
1106eb9902 correct the category chooser to properly convert any html in category descriptions to text 2013-06-25 17:22:56 +10:00
Jeff Atwood
1ac7c28680 add method='post' to JS injected login form 2013-06-24 21:42:08 -07:00
Neil Lalonde
008f3b4785 Use tiny date format on posts 2013-06-24 18:46:58 -04:00
Jeff Atwood
d9a8419d68 Merge pull request #1087 from ZogStriP/fix-posts-rebake 
Fix posts rebake
 2013-06-24 15:32:14 -07:00
Régis Hanol
52b8e6014b forgot to commit the test 2013-06-24 22:56:03 +02:00
Régis Hanol
3d2ef18bb7 move BBCode formating before the markdown conversion 2013-06-24 22:25:08 +02:00
Régis Hanol
da52ac88b0 do not throw exception when parsing a bad URI 2013-06-24 21:38:00 +02:00
Neil Lalonde
e12dff2c31 New bootbox renders all the buttons backwards. :< 2013-06-24 15:29:58 -04:00
Neil Lalonde
c79ab3fc2e Change modal that asks which topic you want to reply in; upgrade bootbox.js 2013-06-24 15:01:07 -04:00
Jesse House
06be760257 adds TopMenuItem model which encapsulates top_menu parsing logic 2013-06-24 10:04:18 -07:00
Robin Ward
0c4de24dd5 Merge pull request #1086 from budnik/facebook_user_info_assoc_was_missing 
adding a missing User association
 2013-06-24 07:15:20 -07:00
Dmitriy Budnik
d12288de49 adding a missing User association 2013-06-24 17:08:49 +03:00
Robin Ward
b56f8a0176 Merge pull request #1085 from ThomasHarper/patch-4 
Update server.fr.yml
 2013-06-24 06:45:41 -07:00
ThomasHarper
7e9d942060 Update server.fr.yml 
Adding quotes and few things missing
 2013-06-24 15:41:24 +02:00
Robin Ward
bad7707cf3 Merge pull request #1082 from ThomasHarper/patch-2 
Update client.fr.yml
 2013-06-24 06:28:51 -07:00
Robin Ward
4b638a0fea Merge pull request #1083 from ThomasHarper/patch-3 
Update client.fr.yml
 2013-06-24 06:27:59 -07:00
Robin Ward
adce747d1b Merge pull request #1084 from abbat/master 
Russian translation (actual version)
 2013-06-24 06:27:11 -07:00
Robin Ward
1b8c9d2efd Merge pull request #1077 from jamesaanderson/jump-to-last-post-in-best-of-mode-fix 
Jump to last post in "Best of" mode fix
 2013-06-24 06:26:44 -07:00