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

4991 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Ward
70ce07ae49 Oops JSHint again :( 
)
 2013-10-28 13:00:34 -04:00
Robin Ward
26a8156f08 Better blockquote button in Markdown editor when non-traditional markdown linebreaks 
are enabled.
 2013-10-28 12:44:10 -04:00
Kris Aubuchon
cafc1a088d catching up with the master 
Merge remote-tracking branch 'upstream/master'
 2013-10-28 12:26:12 -04:00
Kris Aubuchon
1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward
098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward
1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Robin Ward
9ede8ac54a Merge pull request #1559 from railsaholic/topics_controller_refactoring 
Refactor topics controller and model
 2013-10-28 07:28:46 -07:00
Robin Ward
9dfdc31527 Merge pull request #1576 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-28 07:27:31 -07:00
Robin Ward
5134f54c40 Merge pull request #1579 from abbat/master 
Russian translation (actual version)
 2013-10-28 07:27:16 -07:00
Régis Hanol
c45adfda9c Merge pull request #1580 from llindemann/master 
fix fr localization
 2013-10-28 06:26:40 -07:00
lionel
3a1fe9701a fix fr localization 2013-10-28 13:29:26 +01:00
Anton Batenev
de3afe514a Russian translation (actual version) 2013-10-28 14:09:34 +04:00
Manoj
9650dbb97c Refactor topics controller 
Refactor: 1) TopicsController to reduce code climate complexity.
2) Topic model, addressed comments

fix typo
 2013-10-28 11:42:07 +05:30
Sam
c0d85fa6f9 remove change to readme 2013-10-28 16:36:28 +11:00
Sam
bdbc2f590f Merge pull request #1574 from pkallberg/master 
Cloud 66 EasyDeploy
 2013-10-27 22:35:24 -07:00
Sam
95e936c299 cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider 2013-10-28 16:29:07 +11:00
Sam
370e961a90 add failing test for AMS upgrade 2013-10-28 15:55:27 +11:00
Sam
da62a10b77 work around regression in ruby head 2013-10-28 15:13:10 +11:00
Sam
2fa911f133 use DISCOURSE_HOSTNAME instead 2013-10-28 10:35:53 +11:00
Sam
273643adfc allow passing in of hostname in sample file 2013-10-28 10:31:23 +11:00
Sam
88ccd287b4 allow uncategorized category in 2 more spots (hamburger and drop down) 2013-10-28 08:39:55 +11:00
Régis Hanol
c77a20eea5 do not deselect text when clicking on the reply button below the post 2013-10-27 19:44:46 +01:00
ofGEEK
4974567365 Update client.zh_CN.yml 2013-10-26 19:39:34 +08:00
Neil Lalonde
ce2af5c6d1 Show Log In button at the bottom of the page body when login_required and not logged in 2013-10-25 16:08:59 -04:00
Robin Ward
f4d9bf9181 Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email 
Utilize already existing method 'find_by_username_or_email'
 2013-10-25 12:57:18 -07:00
Robin Ward
a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde
4e46d91b8d Refactor SpamRulesEnforcer so that each spam rule is in its own class 2013-10-25 13:25:02 -04:00
Neil Lalonde
90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
Régis Hanol
8dded197df Merge pull request #1575 from GManzato/fix_fr_translation 
Add missing translation in FR locale
 2013-10-25 05:57:59 -07:00
Gilles Manzato
524bd5ec70 Add missing translation in FR 2013-10-25 14:03:06 +02:00
Sam
8ad103abb0 correct fixture 2013-10-25 14:59:57 +11:00
Sam
e57967c6c3 better exception when discourse.ajax is called, still need to figure out how to fix it though :) 2013-10-25 14:30:45 +11:00
Sam
a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Sam
572f036e74 filter down the top level navs 2013-10-25 11:15:20 +11:00
Sam
270fde7dbd correct rake test:prepare so it seeds the db correctly 
move category creation into seeds as well, so db can be seeded from structure.sql
 2013-10-25 10:31:33 +11:00
Sam
4929c5db71 FIX: when allow_uncategorized_topics was false, PMs can not be created 2013-10-25 09:33:39 +11:00
Neil Lalonde
d149066ac6 Show a warning on admin dashboard if running on an older patch level of ruby 2.0 2013-10-24 18:22:47 -04:00
Neil Lalonde
017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward
61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward
ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Robin Ward
9adcd1579d Renamed components to lib in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Philip Kallberg
dfd2d36089 cloud66 easydeploy 2013-10-24 16:30:44 +01:00
Manoj
96ae3cdacc Utilize already existing method 'find_by_username_or_email' 
check presence of email using include, dont use =~
 2013-10-24 19:26:06 +05:30
Régis Hanol
3909f93a7e make sure image onebox is case insensitive 2013-10-24 12:21:38 +02:00
Sam
b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam
89f801ac04 fix no sidetiq when using demon 2013-10-24 15:58:28 +11:00
Sam
636976e5d4 fix alignment of n person liked this. 2013-10-24 15:30:41 +11:00
Sam
cc83b55134 fix incorrect test, that fails if shared test state gets corrupt 2013-10-24 14:55:55 +11:00
Sam
738a25b732 fix failure in rails 4 mode 2013-10-24 13:40:18 +11:00