b8fd734d0e
Merge branch 'refactor-category' of git://github.com/goshakkk/discourse
...
Conflicts:
app/models/category.rb
2013-03-08 10:49:25 -05:00
fb573b917f
Merge pull request #390 from ZogStriP/min-search-term-length-site-setting
...
added the min-search-term-length site setting
2013-03-08 06:58:45 -08:00
d848a9fedc
Add opengraph and twitter card support to topics
2013-03-07 17:46:43 -05:00
2ebe0336ae
On signup, handle duplicate key errors on email and username better
2013-03-07 14:56:55 -05:00
052887c296
Category Topics are no longer invisible, they are pinned.
2013-03-07 12:46:23 -05:00
5349e1b163
Merge pull request #387 from ZogStriP/g10n-wikipedia-oneboxer
...
globalized wikipedia onebox
2013-03-07 09:23:19 -08:00
f8d8272406
Cleaned up TopicUserSpec, introduces clearing of pinned topics
2013-03-07 12:19:25 -05:00
5703d6c730
added the min-search-term-length site setting
2013-03-07 16:52:01 +01:00
621995f35a
globalized wikipedia onebox
2013-03-07 03:30:40 +01:00
c123e40638
Merge pull request #373 from alxndr/master
...
Raise 404 from Admin::UsersController#show if no user found
2013-03-06 09:17:47 -08:00
30aae8e793
Topic was not sanitizing <b> and <img> tags from titles
2013-03-06 11:36:42 -05:00
83f89b5c55
Fix check if you're up to date in javascript
2013-03-06 10:34:29 -05:00
8f56a09e82
PBKDF2 gem is trouble, removing and hand coding for now
2013-03-06 23:12:16 +11:00
c4f1cb0d7b
Raise 404 from Admin::UsersController#show if no user found
...
[Fixes #353 ]
2013-03-05 14:02:23 -08:00
86af49e663
More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $.
2013-03-05 15:39:21 -05:00
cf09e200a5
Moved Markdown out of Discourse.Utilities -> Discourse.Markdown
2013-03-05 14:56:43 -05:00
e4277757c4
Fix onebox loading on every keystroke after a request fails.
2013-03-05 14:06:39 -05:00
a1825fece9
refactor Category
...
* move callback bodies to separate methods (easier to test)
2013-03-05 21:09:13 +03:00
239cbd2d58
enforce coding convention
...
replaced every `and` by `&&` and every `or` by `||`
2013-03-05 01:42:44 +01:00
e669b10966
Merge pull request #355 from dracula2000/site_setting_spec_fix
...
Fix order dependency in site_setting_spec.rb
2013-03-04 11:53:17 -08:00
35d5c899dd
Merge pull request #321 from tijmenb/fix-hosts-in-oneboxer
...
Fix display hosts in oneboxer
2013-03-04 11:04:02 -08:00
51f6ae69c9
Check when logging in whether a auth provider is enabled, including specs
2013-03-04 13:44:41 -05:00
1f94ac154b
Fix order dependency in site_setting_spec.rb
...
The spec contained an order dependency which would cause the default
bool test to fail. You can confirm this by running the spec with the
option "--order rand" a couple times. This dependency was caused by
surprising behavior in SiteSetting::setting as shown below:
SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> false
SiteSetting.random_setting = true
SiteSetting.bool_setting? #=> true
SiteSetting.setting(:bool_setting?, false)
SiteSetting.refresh!
SiteSetting.bool_setting? #=> true!
The spec is merely desriptive, and I have labeled what I think could be
possible bugs.
2013-03-04 11:18:05 -05:00
59b0299a27
Merge pull request #331 from goshakkk/enum-spec-valid
...
Make Enum#valid? specs test the right thing
2013-03-02 08:00:46 -08:00
50dcaa0205
Removed Strange Test-Output
2013-03-02 12:23:40 +01:00
28bc5a6c89
make Enum#valid? specs test the right thing
2013-03-02 10:40:32 +03:00
ba04e72a99
Fix weirdly indented code
2013-03-02 00:48:49 +01:00
eaef66a423
Fix display host for onebox
2013-03-02 00:46:55 +01:00
5cf69baf56
Add specs for Enum class
2013-03-01 17:05:39 -05:00
d410f043a9
Merge pull request #290 from alxndr/category-rss
...
RSS for topics in a category
2013-03-01 12:01:26 -08:00
7c68224763
Merge pull request #309 from goshakkk/enums
...
Introduce Enum
2013-03-01 11:34:48 -08:00
d2596c3c4c
Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access
...
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
2013-03-01 14:27:41 -05:00
0c99dea153
introduce Enum
2013-03-01 21:16:36 +03:00
fd240c1967
RSS for topics in a category
...
Creates a new route for category RSS
2013-03-01 09:52:59 -08:00
b66b17bf19
Merge pull request #300 from goshakkk/cleanup
...
Minor cleanup, using AR querying DSL over raw SQL in some places
2013-03-01 07:52:34 -08:00
4fa4c15559
Quoting another reply won't satisfy the minimum character count ( fixes #180 )
2013-02-28 23:58:40 +01:00
98d4f40d05
Merge pull request #302 from kirushik/better_search
...
Better search
2013-02-28 12:31:31 -08:00
f639397aff
Correct stripping of non BasicLatin characters
2013-02-28 23:52:35 +04:00
628927a79f
Added Site Setting to change locale.
2013-02-28 14:34:38 -05:00
e37c7f1e1d
Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse
2013-02-28 14:34:13 -05:00
6e5399d544
minor cleanup, using AR querying DSL over raw SQL in some places
2013-02-28 21:54:12 +03:00
a58668cbcd
Remove extra comma so jshint passes
2013-02-28 12:38:35 -05:00
6c25eca2d6
Merge pull request #296 from goshakkk/refactor-user
...
Refactor User and TrustLevel a bit
2013-02-28 08:17:21 -08:00
d2f3c829db
refactor User and TrustLevel a bit
...
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
`TrustLevel#level_key`
2013-02-28 19:15:54 +03:00
5d0d958a45
Merge pull request #289 from ZogStriP/bbcode-component
...
added more tests & documentation to the BBCode component
2013-02-28 08:03:44 -08:00
3922a4f356
Merge pull request #288 from ZogStriP/test-readability
...
cleaned up all javascript specs for better readability
2013-02-28 08:02:44 -08:00
dc8e1196fd
Code to support EmberJS + Discourse Tutorial feature: Admin Reports
2013-02-27 22:40:36 -05:00
f93a26e03d
added more tests & documentation to the BBCode component
2013-02-28 03:29:52 +01:00
9a40789f4d
cleaned up all javascript specs for better readability
2013-02-28 03:26:20 +01:00
a086635add
Swap out "@" for "via" in email From field
2013-02-27 19:03:57 -05:00
Robin Ward
Neil Lalonde
Regis Hanol
Régis Hanol
Sam Saffron
Alexander
Gosha Arinich
Brian Kim
Michael Berg
Tijmen Brommet
Kirill Pimenov