codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 08:09:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10568 commits 7 branches 179 tags 87 MiB
Commit graph

10568 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Ward
f753c15a30 Merge pull request #2699 from eyalev/fix-db-seed-fu 
name_lower can't be nil.
 2014-08-26 10:53:58 -04:00
Eyal Levin
94cb0c687b name_lower can't be nil. 2014-08-26 15:25:23 +03:00
Jens Maier
c58565d09f Fix: dialect block parser should not eat next block's whitespace 2014-08-26 14:11:23 +02:00
Jeff Atwood
d63c6292b3 change "Visit Profile" to just "Profile" 2014-08-26 00:37:10 -07:00
Jeff Atwood
553e0290a6 mods can use shield glyph as well, don't need two 2014-08-25 23:49:39 -07:00
Sam
1ccfb4fa20 FIX: crashing job 2014-08-26 16:22:13 +10:00
Jeff Atwood
95f9943d28 remove <br/> from top non-mobile layout 2014-08-25 22:42:41 -07:00
Jeff Atwood
b6b0cd5c15 add glyph to move posts to new topic button 2014-08-25 22:38:28 -07:00
Sam
3ea76815e4 Merge pull request #2686 from meglio/ru-plurals 
Update RU pluralization to use 3 keys: one, few, other (as by Transifex)
 2014-08-26 12:42:59 +10:00
Sam
f441e4ec03 Merge pull request #2695 from riking/local-onebox-category 
Fix local onebox subcategory urls
 2014-08-26 12:42:24 +10:00
Sam
c412d74369 HACK: suppress "1 reply" when directly below for quotes posts 2014-08-26 12:00:16 +10:00
Sam
f331855482 FIX: username autocomplete more reliable, cancel old reqs 2014-08-26 11:32:50 +10:00
riking
5261f2e751 Fix "Server Error: [missing {{code}} value]" page 
The translation was expecting a non-existent parameter.
 2014-08-25 17:20:48 -07:00
riking
41dadcc349 Fix local onebox subcategory urls 2014-08-25 16:47:54 -07:00
Sam
96af48d903 Merge pull request #2694 from riking/logster-link 
Fix Logster link by bypassing Ember router
 2014-08-26 09:30:16 +10:00
riking
4db5c8d617 Add data-auto-route=true to Logster link 2014-08-25 15:59:48 -07:00
Robin Ward
a568696098 FIX: Add the <br/> without removing stuff 2014-08-25 18:56:27 -04:00
Robin Ward
939b7ce7e2 Revert "FIX: Added <br/> for @coding-horror" 
This reverts commit d62218fb5b.
 2014-08-25 18:56:27 -04:00
Sam
64331e2ac1 row style is common, its the way we clear divs 2014-08-26 07:41:29 +10:00
Robin Ward
d62218fb5b FIX: Added <br/> for @coding-horror 2014-08-25 17:21:01 -04:00
Robin Ward
8d68e67fc5 Merge pull request #2693 from riking/sorted_badges 
Fix the tests
 2014-08-25 16:10:37 -04:00
riking
7317c6ed6a Fix tests for new route 2014-08-25 13:07:22 -07:00
Robin Ward
3437e81627 Merge pull request #2691 from fysics/master 
Adjust & pngout d-logo-sketch.png
 2014-08-25 15:57:13 -04:00
Robin Ward
c820c65172 Merge pull request #2692 from riking/sorted_badges 
Sort the badges on the user profile page
 2014-08-25 15:56:27 -04:00
Jeff Atwood
de1e0345df proper fix for top page bottom buttons on mobile 2014-08-25 12:55:45 -07:00
riking
234956234b Fix badge type ordering 2014-08-25 12:48:31 -07:00
Jeff Atwood
a11cc46c73 remove global margin right on mobile btn 2014-08-25 12:47:02 -07:00
riking
99c11e2184 Sort the badges on the user profile page 
Also clean up UserBadgesController so it isn't doing two things in one
method
 2014-08-25 12:40:51 -07:00
Jeff Atwood
024c503870 mobile login tweaks 2014-08-25 12:38:27 -07:00
Robin Ward
ed125975a1 SECURITY: Prefix session key and validate token format. 2014-08-25 15:31:49 -04:00
Jeff Atwood
3a010c34cc smallenate anon drop-down topic counts 2014-08-25 12:14:47 -07:00
Robin Ward
0fba445bc1 FIX: Broken build 2014-08-25 13:35:40 -04:00
Robin Ward
f10f9585ae Better Support for whitelisting caja tags 2014-08-25 13:11:20 -04:00
Régis Hanol
9b86d1507d VBULLETIN: add some stats about the imported groups 2014-08-25 12:33:08 +02:00
Régis Hanol
7aaf718cf3 update bbcode dialect and fix vBulletin importer 2014-08-25 10:48:29 +02:00
Jeff Atwood
a4d6855d08 add homepage change info to Admin Quick Start 2014-08-24 23:09:41 -07:00
Jeff Atwood
bd66c67398 whoops, used font awesome 3.2 styles :( 2014-08-24 22:20:59 -07:00
Jeff Atwood
01853fb9d3 replace trophy with shield to indicate admin 2014-08-24 22:05:11 -07:00
Sam
de7888cd97 reopen logs on usr1 2014-08-25 10:49:13 +10:00
Zane Beckman
d19c44d595 Adjust & pngout d-logo-sketch.png 
d-logo-sketch.png and d-logo-sketch-small.png were previously out of
alignment, causing the stylized D to shift left when the two logos
changed. This has been fixed in paint.net, and the edited png has been
compressed with pngout.
 2014-08-24 18:20:12 -06:00
riking
2e62cb7825 Add dash and plus signs to Twitter key allowed chars 2014-08-24 17:05:30 -07:00
Sam
56a0a40175 Merge pull request #2677 from keskuskentta/fi_locale 
Add Finnish
 2014-08-25 08:44:00 +10:00
Sam
9a8d7d3ef0 comment gemfile 2014-08-25 08:22:14 +10:00
Sam
32d1e962d2 Merge pull request #2689 from chancancode/lock_mail_gem 
Lock `mail` gem to ~> 2.5.4
 2014-08-25 08:21:41 +10:00
Sam
1c5bbeb348 Merge pull request #2690 from chancancode/use_latest_seed_fu 
Use the latest version of seed-fu
 2014-08-25 08:21:10 +10:00
Sam
643d0dfc13 FIX: use CDN when expanding avatar templates 2014-08-25 08:18:41 +10:00
Godfrey Chan
09b9cec009 Use the latest version of seed-fu 
seed-fu#54 has been merged, so we don't have to use the custom fork anymore.
It also include some changes that are required for Rails 4.2+, at least for now.

See d6c1205584 (commitcomment-7502487)
 2014-08-24 02:39:05 -07:00
Jeff Atwood
146eec53c0 move email_domains_white/blacklist to login cat 2014-08-24 02:06:51 -07:00
Godfrey Chan
b0f35cbf6a Lock mail gem to ~> 2.5.4 
Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`.
However, mail gem 2.6.x currently does not work with discourse because of the
reference to `Mail::RFC2822Parser` in `lib/email.rb`. This ensure discourse
would continue to work with Rails 4.1.6+ when it is released.
 2014-08-24 00:43:08 -07:00
Robin Ward
a11a21ca09 Merge pull request #2688 from Elberet/tests-passed 
Workaround markdown-js links parser bug
 2014-08-23 20:33:13 -04:00