Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,526 Commits 214 Branches 500 Tags 863 MiB
Commit Graph

7526 Commits

Author SHA1 Message Date
Neil Lalonde 2c6fe8ec29 Merge pull request #2189 from willkara/doc-edits 
Add link to the main Discourse Plugin page for the PLUGINS doc.
 2014-03-26 15:15:02 -04:00
Neil Lalonde 79caebc00e Merge pull request #2186 from pkgr/pkgr 
Automatically generate a debian package
 2014-03-26 15:14:31 -04:00
William Karavites 9599e3768f Add link to the main Discourse Plugin page for the PLUGINS doc. 
Sorry for all of the crazy commits. I got my branches mixed up, I
should be good now.

This adds a link to the main discourse plugin page
 2014-03-26 15:04:44 -04: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
Kris Aubuchon 236eb66235 fixing admin bar chart color 2014-03-26 12:03:58 -04:00
Cyril Rohr 99772c9ea2 Fix .pkgr.yml so that discourse can be packaged with https://pkgr.io. 2014-03-26 15:08:53 +00:00
Cyril Rohr 3631ba2eb5 Use string interpolation, to avoid segmentation fault. 
The segmentation fault was ocurring when precompiling assets, with ruby2.0.0.
 2014-03-26 15:06:22 +00:00
Neil Lalonde 4d0035e7fd Remove the quote post button from pagedown editor when creating a topic and editing About Me in preferences 2014-03-26 10:45:22 -04:00
Neil Lalonde 0f98c1644a Remove more admin options code since it's gone from composer 2014-03-26 10:19:01 -04: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
Mikulas c30a9365e4 add localization to group administration 2014-03-26 13:45:58 +01:00
Onaldanm 750745ba5f French Translations Updates 
Updates client and server
Fix wrong "active" in privacy.html
Use same same terms between faq/tos/privacy page.
 2014-03-26 11:24:58 +01:00
Sam be06156629 SECURITY: when enabled_local_logins is false users could log in via API 
thanks @Nicholas Blanco
 2014-03-26 15:39:44 +11:00
Sam 1a60969347 Update onebox gem 2014-03-26 15:07:42 +11:00
Sam 30d48a4ea4 Merge pull request #2183 from riking/class 
Fix 0be7483f19
 2014-03-26 15:01:33 +11:00
Sam 5897d3419c BUGFIX: identity_url was not fished out correctly 
If I user logged in with Google and then changed email,
they would no longer be able to log in with google
 2014-03-26 14:52:50 +11:00
Sam 49dbb992ad BUGFIX: someone missed a replacement 2014-03-26 13:22:04 +11:00
riking f51cffdb94 Rename style to onebox-avatar 2014-03-25 19:01:51 -07:00
Sam 0be7483f19 Merge pull request #2175 from riking/class 
CSS rule for GitHub commit avatars
 2014-03-26 11:45:56 +11:00
Jeff Atwood 1306eaedb2 we don't need max width on header logo 2014-03-25 17:04:15 -07:00
Sam 35ee341122 SECURITY: GitHub returns unvalidated emails 2014-03-26 10:55:36 +11:00
Neil Lalonde 86244e3a4b New sub-category badges in category chooser. Normalize category badge rendering code. 2014-03-25 17:29:59 -04:00
Neil Lalonde ac32b1c5a5 Also show new sub-category badge in the message at the bottom of a topic 2014-03-25 16:20:13 -04:00
Neil Lalonde a40896bb55 Category badge preview uses new sub-category badge styling in create/edit category modal 2014-03-25 16:17:04 -04:00
Neil Lalonde 497a03fc2c Show new sub-category styling in hamburger menu too 2014-03-25 15:29:34 -04:00
Neil Lalonde e7ceb58cf4 FIX: modal buttons on Safari iOS are at the bottom of the viewport, which is an unusable part of the screen in iOS 7. Add padding so you can scroll those buttons high enough so they're clickable. Apple, fix this garbage omgwtfbbq. 2014-03-25 14:48:23 -04:00
Neil Lalonde bfc8c65212 Remove wrench icon and auto-close options from composer. The same options are available after the topic has been created. 2014-03-25 14:07:05 -04: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
Mikulas a9c20b0341 fix notification keys in czech localization 2014-03-25 15:38:43 +01:00
Mikulas d7226d512f update czech localization 2014-03-25 15:38:39 +01:00
Kris Aubuchon 71034a33a1 clearing up variable duplication as discussed https://github.com/discourse/discourse/pull/2174 2014-03-25 09:53:07 -04: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
Vikhyat Korrapati 61ec2b390e Don't display granted badges in the badge grant combobox. 2014-03-25 15:45:34 +05:30
Vikhyat Korrapati fa6ff26061 Update combobox when contents are changed. 2014-03-25 15:29:13 +05:30
Jeff Atwood a1b501c3fb was supposed to say "dismiss unread" 2014-03-25 00:45:27 -07:00
Sam 9cf23223eb BUGFIX: proxy_set_header is weird 
in particular no inheritance IF proxy_set_header is specified in child
 2014-03-25 17:06:15 +11:00
riking 87d47ece59 CSS rule for GitHub commit avatars 2014-03-24 21:52:40 -07:00
Sam 2f4ec5a17c BUGFIX: no idea how this worked in test 2014-03-25 15:15:46 +11:00
Kane York 473201c9a4 Change specified height to 450 2014-03-24 20:02:04 -07:00
Jeff Atwood 20bde6e61d add backup links, etc 2014-03-24 16:51:16 -07:00
Sam 3830f41e5f BUGFIX: attachments bust under multisite 2014-03-25 10:37:31 +11:00
Sam 14f7551f2b Fix visual bug 2014-03-25 09:45:21 +11:00
Sam 4191972afe Merge pull request #2173 from vikhyat/badge-system 
Forgot to specify "dependent: destroy" for UserBadges
 2014-03-25 08:25:31 +11: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
Neil Lalonde d05e3fd9d1 Merge pull request #2168 from zsombor/master 
Remove documentation references to "pg_dumps/development-image.sql".
 2014-03-24 13:39:40 -04:00