Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,605 Commits 212 Branches 500 Tags 864 MiB
Commit Graph

23605 Commits

Author SHA1 Message Date
Robin Ward 54bb2a6bc2 FIX: Don't redirect to wizard when resetting password 2017-06-07 12:36:52 -04:00
Arpit Jalan d326784ecf Update translations 2017-06-07 20:13:54 +05:30
Guo Xiang Tan 5794ff53a1 FIX: Copy custom fields when moving first post of a topic. 
https://meta.discourse.org/t/transfer-poll-votes-when-moving-a-topic-into-an-existing-one/63678
 2017-06-07 19:04:48 +09:00
Guo Xiang Tan 684b05f510 FIX: Strip zero-width characters from search terms. 2017-06-07 18:19:47 +09:00
Guo Xiang Tan 860a7e1fc0 Merge pull request #4904 from tgxworld/update_gems 
Update gems
 2017-06-07 16:53:10 +09:00
Guo Xiang Tan 0f214ed43f Merge pull request #4903 from tgxworld/use_yarn_on_travis 
Switch to yarn for our travis build.
 2017-06-07 11:20:09 +09:00
Guo Xiang Tan 61a4711e83 Update i18n. 2017-06-07 11:13:21 +09:00
Guo Xiang Tan 24cf302753 Update nokogiri. 2017-06-07 11:13:07 +09:00
Guo Xiang Tan 5332f25aa9 Update gems in development group. 2017-06-07 11:12:44 +09:00
Guo Xiang Tan f83e997cf6 Switch to yarn for our travis build. 2017-06-07 10:57:48 +09:00
Guo Xiang Tan 2cad739262 FIX: Better error message when username change fails. 
https://meta.discourse.org/t/500-error-on-username-edit/64064
 2017-06-07 10:45:53 +09:00
Guo Xiang Tan d4d0aa8ca7 Minor fixes for https://github.com/discourse/discourse/pull/4845. 2017-06-07 10:03:19 +09:00
Guo Xiang Tan da736f70a4 Merge pull request #4845 from vinothkannans/download-onebox-images 
FEATURE: pull onebox images
 2017-06-07 09:55:04 +09:00
Neil Lalonde 7dfbb5a395 UX: don't hide the subcategory filters when subcategories are listed below 2017-06-06 17:38:59 -04:00
Neil Lalonde 6aa0823bf4 FIX: lounge category security settings won't be reset after an upgrade 2017-06-06 16:57:21 -04:00
Robin Ward 0de5d01d79 FIX: Onebox wasn't using correct uri 2017-06-06 16:39:15 -04:00
Robin Ward 00f06b8086 UX: Show column headers on user topic lists 2017-06-06 16:07:47 -04:00
Robin Ward 369bb78f8e FIX: Support for cookies in onebox redirects 2017-06-06 15:02:11 -04:00
Robin Ward 53b95f009f FIX: If HEAD is not supported, try GET. Also set cookies 2017-06-06 13:53:49 -04:00
Régis Hanol 4e8e9c2d2f FIX: ensure we never collide ids in the JIVE API importer 2017-06-06 16:13:07 +02:00
Vinoth Kannan 209383faab FEATURE: pull onebox images 2017-06-06 18:51:58 +05:30
Guo Xiang Tan 17c29c972b Move the constant as well. 2017-06-06 15:38:26 +09:00
Guo Xiang Tan 26b5981f19 Fix typo. 2017-06-06 12:10:51 +09:00
Guo Xiang Tan 08cf7495da Delaying dropping topic auto close columns by one hour. 2017-06-06 12:07:31 +09:00
Guo Xiang Tan 87e77267fa Add ENV variable to specify path to write unicorn's pid. 2017-06-06 11:46:01 +09:00
Guo Xiang Tan 0ecb668d49 Merge pull request #4893 from tgxworld/remove_unused_columns 
Remove columns that are no longer being used.
 2017-06-06 10:07:00 +09:00
Guo Xiang Tan c1dc6f6cd7 FIX: Track should only continue if user is alone with bot in a PM. 2017-06-06 09:47:00 +09:00
Jeff Atwood ba578f2aa9 Merge pull request #4900 from barryvan/patch-1 
Clarify category tag settings text
 2017-06-05 14:22:25 -07:00
Robin Ward 63c32b6b21 FIX: Don't animate the progress bar unless scrolling 2017-06-05 15:38:40 -04:00
Robin Ward 02ab2706df FIX: Timeline was wrong sometimes on iPad 2017-06-05 15:23:37 -04:00
Robin Ward 4b82d4fb15 Upgrade Ember to latest patch 2017-06-05 14:39:04 -04:00
Robin Ward 79763a6b97 FIX: If a topic is really long, show the timeline 2017-06-05 13:11:25 -04:00
Joffrey JAFFEUX ea6b6c817f always run the tests 2017-06-05 19:01:52 +02:00
Joffrey JAFFEUX 2aae6cfdbe look for aliases in Emoji.lookup_unicode 2017-06-05 18:53:11 +02:00
Neil Lalonde a922db6158 FIX: set max width and prevent wrapping on composer submit button on mobile 2017-06-05 12:25:20 -04:00
Neil Lalonde d78956c0c5 FIX: topic flagged message squeezed into a small column 2017-06-05 11:23:23 -04:00
Joffrey JAFFEUX 09d34b7642 emoji images are now v5 not v3 
TODO: we should not hardcode this
 2017-06-05 16:10:36 +02:00
Joffrey JAFFEUX ab8a1a377c fixes eslint errors 2017-06-05 15:50:15 +02:00
Joffrey JAFFEUX 05f8b5b72e white_sun_small_cloud is an alias 2017-06-05 15:31:24 +02:00
Joffrey JAFFEUX b0d5b57fdb remove spec warning 2017-06-05 15:23:15 +02:00
Joffrey JAFFEUX 613f6895a6 white_sun_small_cloud is an old alias 2017-06-05 15:23:08 +02:00
Joffrey JAFFEUX ba07ae67fb prefer const over let 2017-06-05 14:35:27 +02:00
Joffrey JAFFEUX f8e5cbd81a prefer const when not reasigned 2017-06-05 14:33:52 +02:00
Joffrey JAFFEUX 64336a8c75 Emoji 5.0 support 2017-06-05 14:06:23 +02:00
Joffrey JAFFEUX f781fab972 Merge remote-tracking branch 'discourse/master' into emoji-5.0 2017-06-05 11:42:14 +02:00
Guo Xiang Tan 30f2758404 FIX: Ensure that we cancel any timeout jobs when terminating a track. 2017-06-05 16:23:25 +09:00
Guo Xiang Tan 3621647fb5 FIX: Bot should only respond to regular posts. 2017-06-05 15:21:19 +09:00
Guo Xiang Tan 0c203e61cd Raise `ActiveRecord::IrreversibleMigration` instead of `StandardError`. 2017-06-05 11:02:24 +09:00
Guo Xiang Tan 1c05ca91ea Remove columns that are no longer being used. 2017-06-05 10:59:05 +09:00
Barry van Oudtshoorn 6841ad9c83 Clarify category tag settings text 
https://meta.discourse.org/t/change-to-category-tag-settings-text/63926

This change eliminates the ambiguity in the previous copy, which suggested that the setting prevented the tags from being used in other categories, rather than the actual behaviour of constraining what can be used in the edited category.
 2017-06-05 09:43:22 +08:00