IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,610 Commits 1,018 Branches 579 Tags
605e60b01657e015aeb6f23fea65e77a0e11c599
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Régis Hanol e1b96d2f15 Merge pull request #2249 from riking/onaldanm-1 
Correct Closed Poll French Translation
 2014-04-10 18:16:52 +02:00
Régis Hanol 8e58687df5 Merge pull request #2248 from riking/closed-result 
Show results by default for closed polls
 2014-04-10 10:53:12 +02:00
Régis Hanol d0591c18f8 Merge pull request #2245 from ligthyear/category-double-selection-fix 
Bugfix: double selection of categories in user preferences
 2014-04-10 10:52:57 +02:00
Régis Hanol c3a1c867dd REFACTOR: poll mailbox specs 2014-04-09 19:26:19 +02:00
Régis Hanol 3e72de7dc1 BUGFIX: share pop-up wasn't properly positioned when activated using keyboard 2014-04-09 16:01:09 +02:00
Régis Hanol 79ad879170 BUGFIX: uses markdown instead of HTML when inserting hyperlinked images 2014-04-08 19:33:14 +02:00
Régis Hanol b328fd0031 BUGFIX: N+1 query when listing users in admin section 2014-04-08 19:12:53 +02:00
Régis Hanol 79c6bb718a BUGFIX: make sure site settings are refreshed after a restore 2014-04-08 18:06:53 +02:00
Régis Hanol 6373de550f update annotations 2014-04-08 17:35:44 +02:00
Régis Hanol 11dcd2f6c5 BUGFIX: add default value to top_topics' scores 2014-04-08 17:35:28 +02:00
Régis Hanol bb0baa6d7c BUGFIX: properly reconnect to the current db after forking 2014-04-07 19:38:47 +02:00
Régis Hanol 7e7ca43a19 BUGFIX: backup/restore when using multisite 2014-04-07 17:55:38 +02:00
Régis Hanol e7601db730 BUGFIX: ensured logged in wasn't listing all anonymous filters 2014-04-04 10:05:40 -07:00
Régis Hanol 7fd0db857f BUGFIX: check image size before uploading an avatar/background 2014-04-03 19:19:38 +02:00
Régis Hanol 8032864efe Merge pull request #2217 from vikhyat/css-import 
Allow importing Discourse styles in custom CSS
 2014-04-01 20:14:09 +02:00
Régis Hanol 89a3311bf5 Merge pull request #2215 from vikhyat/fix-post-creation-jitter 
Fix missing avatar while a post is being created
 2014-04-01 16:31:44 +02:00
Régis Hanol 77a8a4083a Revert "Merge pull request #2125 from vikhyat/css-variables" 
This reverts commit b537de3ca5, reversing
changes made to b925827e5b.
 2014-04-01 16:24:29 +02:00
Régis Hanol b537de3ca5 Merge pull request #2125 from vikhyat/css-variables 
Allow importing Discourse styles in custom stylesheets to modify vars
 2014-04-01 15:24:09 +02:00
Régis Hanol b925827e5b Merge pull request #2100 from velesin/synchronized_editor 
Synced editor scrolling PoC.
 2014-04-01 15:19:55 +02:00
Régis Hanol 524e469693 Merge pull request #2214 from vikhyat/poll-plugin 
Make polls work better on multi-language forums
 2014-04-01 15:05:45 +02:00
Régis Hanol 706fd3c59a Merge pull request #2206 from riking/posted 
Fix the 'posted' view so that it actually does something
 2014-03-31 23:05:48 +02:00
Régis Hanol ef24a4c71c FEATURE: add redirect_users_to_top_page site setting (default to true) 2014-03-31 21:53:38 +02:00
Régis Hanol 682b0c4883 typo 
thanks @Naatan
 2014-03-31 18:23:42 +02:00
Régis Hanol 7e33834afe FEATURE: create hyperlinked images from the image insertion dialog 2014-03-31 18:19:16 +02:00
Régis Hanol 97da6e7bd7 Merge pull request #2204 from ligthyear/fix-autohighlight 
Enable autohighlighting of highlight.js for all code blocks
 2014-03-31 10:16:19 +02:00
Régis Hanol 956b14a4ab Merge pull request #2208 from riking/notext 
Add no-text class to buttons with no text
 2014-03-30 18:12:35 +02:00
Régis Hanol cdeb7445dc Merge pull request #2167 from riking/higher-facebook 
Make Facebook login popup taller
 2014-03-28 15:11:30 +01:00
Régis Hanol 3ee8b087ca Merge pull request #2197 from aslakknutsen/feed_url_case 
Normalize URL from Feed Entry after adding link to original in Topic
 2014-03-28 15:09:55 +01:00
Régis Hanol e6989b5313 Merge pull request #2192 from jorgemanrubia/configurable-emails-prefix 
Option to change the subject prefix in emails
 2014-03-28 15:08:50 +01:00
Régis Hanol 93b3cc1e15 Merge pull request #2201 from vikhyat/fix-post-highlight 
Fix post highlighting
 2014-03-28 15:07:49 +01:00
Régis Hanol 622448fc9c Merge pull request #2184 from Onaldanm/translate-fr-updates 
French Translations Updates
 2014-03-28 15:07:02 +01:00
Régis Hanol f311d88d7b Merge pull request #2195 from fantasticfears/locale 
update zh_CN locale
 2014-03-28 15:06:14 +01:00
Régis Hanol d23585e444 BUGFIX: backup/restore operations keep track of the read-only mode status 2014-03-28 12:15:53 +01:00
Régis Hanol 32b7405941 BUGFIX: background on inline code blocks + pre blocks 2014-03-27 19:42:29 +01:00
Régis Hanol f397a3e157 Revert "BUGFIX: highlight standard code blocks" 
This reverts commit d5b1b64bb8.
 2014-03-27 19:21:32 +01:00
Régis Hanol 218384e86c make sure the draft-status is visible on mobile 2014-03-27 19:06:23 +01:00
Régis Hanol 20d9cb26fc make the composer smaller on mobile when creating/editing first post 2014-03-27 18:53:29 +01:00
Régis Hanol 5edec22e28 fix the build 2014-03-27 16:57:46 +01:00
Régis Hanol e663d78104 SECURITY: sanitize markdown urls (prevent XSS) 2014-03-27 15:34:35 +01:00
Régis Hanol d5b1b64bb8 BUGFIX: highlight standard code blocks 2014-03-27 15:17:50 +01:00
Régis Hanol e5a04e3d5c BUGFIX: mismatched braces 2014-03-26 18:17:40 +01:00
Régis Hanol 59f3721fff Merge pull request #2187 from awesomerobot/master 
fixing admin bar chart color
 2014-03-26 17:32:24 +01:00
Régis Hanol 71ba674167 Merge pull request #2185 from Mikulas/patch-missing-group-l10n 
add localization to group administration
 2014-03-26 14:32:20 +01:00
Régis Hanol 9d23cfcece update highlight.js to latest version 2014-03-25 18:13:38 +01:00
Régis Hanol 770852d7cc Merge pull request #2179 from awesomerobot/master 
clearing up variable duplication
 2014-03-25 16:07:52 +01:00
Régis Hanol e9eeeac37d Merge pull request #2169 from subelsky/patch-1 
Fix code block for git commands
 2014-03-25 14:37:52 +01:00
Régis Hanol c10e44c0cf Merge pull request #2171 from Mikulas/patch-missing-localization 
add localization to post multiselect
 2014-03-25 14:35:36 +01:00
Régis Hanol ae98bc91a1 Merge pull request #2178 from vikhyat/badge-system 
Don't display granted badges in the badge grant combobox
 2014-03-25 12:04:23 +01:00
Régis Hanol 0def4747da FEATURE: send the backup/restore logs when operation fails 2014-03-24 19:34:16 +01:00
Régis Hanol 9454ad1ef9 Merge pull request #2172 from vikhyat/firefox-paste-image 
Fix pasting into the subject field in Firefox
 2014-03-24 18:41:40 +01:00
Régis Hanol 6b8a5d1d78 BUGFIX: bound avatars in revision history UI 2014-03-22 17:39:59 +01:00
Régis Hanol f28c6aad4c Merge pull request #2164 from fantasticfears/patch-1 
Update client.zh_CN.yml
 2014-03-22 17:03:32 +01:00
Régis Hanol e8c53d171a Merge pull request #2161 from awesomerobot/master 
dialing back the animations I added previously
 2014-03-21 14:54:16 +01:00
Régis Hanol 88ba80b239 Merge pull request #2160 from borhub/fix-excessive-li-in-category-breadcrumb 
Fix visual bug from excessive LIs being rendered around Category breadcrumbs
 2014-03-21 10:00:04 +01:00
Régis Hanol 44888f7acc FEATURE: upload button on mobile composer 2014-03-19 18:34:08 +01:00
Régis Hanol 80bfdeee82 Merge pull request #2147 from vikhyat/serialize-params 
Route `serialize` hook argument is the model, not params
 2014-03-19 09:30:26 +01:00
Régis Hanol 5bc8e7c19b BUGFIX: BackupChunksMerger 
- actually remove the tmp directory
- merge all the chunks into a .tmp archive and then remove the .tmp extension once done
 2014-03-19 01:05:47 +01:00
Régis Hanol a2483b95df BUGFIX: stabilize the buttons in revision history UI 2014-03-19 00:36:02 +01:00
Régis Hanol 5ce84eed82 Merge pull request #2134 from Onaldanm/patch-1 
Poll - Topic Term
 2014-03-18 17:42:43 +01:00
Régis Hanol a627a062de Merge pull request #2135 from Onaldanm/poll-badge-fr 
Translation: Badges, poll and french updates
 2014-03-18 17:41:06 +01:00
Régis Hanol a279ad06d9 Merge pull request #2142 from sanderdatema/patch-5 
Dutch translation updated
 2014-03-18 17:40:37 +01:00
Régis Hanol 26578d1b73 Merge pull request #2137 from vikhyat/badge-system 
Fix badge description i18n match
 2014-03-17 14:57:03 +01:00
Régis Hanol 3fb7d0c3f8 Merge pull request #2136 from ligthyear/plugins-admin-js 
Enable Admin-Javascript for plugins
 2014-03-17 14:33:56 +01:00
Régis Hanol 2d49374357 Merge pull request #2130 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-17 09:31:17 +01:00
Régis Hanol 2085c82360 Merge pull request #2132 from vikhyat/firefox-paste-image 
Support image copy-paste for Firefox 24+
 2014-03-17 09:29:31 +01:00
Régis Hanol 473c054070 Merge pull request #2133 from Aselox/master 
Update Italian Translation
 2014-03-17 09:29:10 +01:00
Régis Hanol bd737c9eba Merge pull request #2129 from awesomerobot/master 
fixing lists on mobile posts and changing highlight color
 2014-03-15 17:08:42 +01:00
Régis Hanol 2b5e4c3919 BUGFIX: revision numbers were unbound in revision history UI 2014-03-14 17:25:02 +01:00
Régis Hanol 119d766cb5 Merge pull request #2124 from Onaldanm/french-translation 
French Translation
 2014-03-14 16:45:00 +01:00
Régis Hanol dbe72fe26d FEATURE: minimize duration of read-only mode when backing up 2014-03-14 15:53:58 +01:00
Régis Hanol ea953c9c0e BUGFIX: only wait for jobs of the current_site when backing up 2014-03-14 15:49:35 +01:00
Régis Hanol d450c7e0de BUGFIX: only resize revision history UI after it has loaded the revision 2014-03-13 19:19:42 +01:00
Régis Hanol fd1c824187 Revert "Merge pull request #2116 from LessonPlanet/disable-name-edit-for-sso" 
This reverts commit 91aa21671a, reversing
changes made to f19596af0d.
 2014-03-13 18:17:59 +01:00
Régis Hanol 50cc7dedb0 Merge pull request #2098 from nbalonso/spanish-translation 
updated spanish translation
 2014-03-13 11:00:04 +01:00
Régis Hanol 582a30ed4a Merge pull request #2113 from blang/feat_locale_de 
German translation updated (client)
 2014-03-13 10:59:31 +01:00
Régis Hanol 363fabd3e7 add tests for ListController.best_period_for 2014-03-12 12:58:41 +01:00
Régis Hanol 5b7f2b4488 ooops. I don't know how to write smtp 2014-03-12 11:55:08 +01:00
Régis Hanol c5298cd25f BUGFIX: require net/stmp module to properly handle exceptions 2014-03-12 11:53:10 +01:00
Régis Hanol 8c89931747 do not log sensitive commands during backup/restore 2014-03-12 11:45:55 +01:00
Régis Hanol 2735f286c4 UI: add calendar icon to all top buttons 2014-03-12 11:34:01 +01:00
Régis Hanol bbde2aaa97 Merge pull request #1896 from nickborromeo/category-list 
Refactor find_relevant_topics and find_categories
 2014-03-12 09:44:41 +01:00
Régis Hanol 5ffcfb1a8c TRIVIAL: remove useless condition 2014-03-11 19:06:36 +01:00
Régis Hanol aece2b61a9 FIX: revision history UI 2014-03-11 18:51:26 +01:00
Régis Hanol 9eb3958374 FEATURE: gzip backups using best compression 2014-03-11 12:47:51 +01:00
Régis Hanol 80911b92d0 Merge pull request #2109 from vikhyat/poll-plugin 
Add a test to make sure the poll prefix translation can be a regex
 2014-03-11 12:40:55 +01:00
Régis Hanol 8b6930a5cf FIX: shortDate tests 2014-03-11 12:37:54 +01:00
Régis Hanol f8bf0fbad8 FIX: encoding on FR translations 2014-03-11 12:30:59 +01:00
Régis Hanol 249e577456 Merge pull request #2108 from Onaldanm/plugin-poll-fr 
Poll - French Translation
 2014-03-11 12:03:56 +01:00
Régis Hanol a17310276f Merge pull request #2107 from riking/change-date-format 
Switch from MMM D to D MMM to separate from year
 2014-03-11 11:42:55 +01:00
Régis Hanol ad45fdaed7 Merge pull request #2106 from vikhyat/firefox-paste-image 
Set canvas height and width for Firefox image copy-paste
 2014-03-11 11:07:21 +01:00
Régis Hanol d25081ce07 Merge pull request #2104 from nschonni/additional-jshinting 
Additional jshinting
 2014-03-11 09:20:04 +01:00
Régis Hanol 7e9cf618f5 Merge pull request #2105 from nschonni/add-editorconfig 
Add EditorConfig to enforce spacing
 2014-03-11 09:19:29 +01:00
Régis Hanol f71846f269 Merge pull request #2103 from awesomerobot/master 
fixing the remnant borders left on the header buttons
 2014-03-11 09:11:32 +01:00
Régis Hanol b42a19184e FEATURE: top is now by default in the top menu 2014-03-10 21:21:16 +01:00
Régis Hanol 455ff61626 Merge pull request #2071 from nschonni/autocomplete-js-cleaning 
Autocomplete js cleaning
 2014-03-10 17:06:51 +01:00
Régis Hanol c02d636084 Merge pull request #2097 from ligthyear/pluginstore-array-support 
add support for arrays to PluginStore
 2014-03-10 15:18:17 +01:00
Régis Hanol c5beb3852f Merge pull request #2092 from nschonni/jshinting 
Jshinting during CI build
 2014-03-10 09:51:11 +01:00
Régis Hanol be8128b0c2 force refresh when the 'top_menu' setting changes 2014-03-07 19:07:53 +01:00
Régis Hanol 8214536614 BUGFIX: don't show redirect reason if you aren't redirected 
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
 2014-03-07 18:58:53 +01:00
Régis Hanol 18e9d319fd BUGFIX: catch STMP client errors in email sending background job 
Will log the exception message in the skipped reason instead of keeping
the job in the queue whenever the email address is invalid
 2014-03-07 16:33:15 +01:00