Robin Ward
1a60301a17
Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse
...
Conflicts:
app/assets/javascripts/discourse/controllers/composer_controller.js
app/assets/javascripts/discourse/views/composer_view.js
config/locales/client.en.yml
2013-03-15 16:49:17 -04:00
Robin Ward
76d8df6ac6
Merge pull request #462 from kubabrecka/colorpicker3
...
implement color picking from predefined set for category badges + option to change foreground color
2013-03-15 13:43:59 -07:00
Robin Ward
ad082cea70
Big commit:
...
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
2013-03-15 14:35:33 -04:00
Neil Lalonde
6c4d9ecfdc
Use one request to fetch dashboard report data and check version
2013-03-14 18:26:26 -04:00
Kuba Brecka
8784c55188
implement color picking from predefined set for category badges + option to change foreground color
2013-03-14 14:16:57 +01:00
Robin Ward
ea20993bed
FIX: Don't create a new version when a post is recovered. Also display username instead of full name for consistency.
2013-03-13 12:35:55 -04:00
Sam
fcc6aac008
hacked dates so jeff sees no more 1mons everywhere.
2013-03-13 00:05:21 -07:00
Régis Hanol
439ac95b73
the composer will now count only significant whitespaces
2013-03-12 23:54:29 +01:00
Neil Lalonde
40c27ff3cf
Add flag counts to admin dashboard
2013-03-12 14:40:59 -04:00
Neil Lalonde
4eda422cdf
Add total users report; restructure dashboard reports js
2013-03-12 14:40:59 -04:00
Robin Ward
1103dde5cd
Fix: When you split topics, featured users and like counts were incorrect.
2013-03-12 12:33:42 -04:00
Neil Lalonde
f1908fd8e8
Fix report_spec so it's not so fussy and breaks sometimes
2013-03-11 10:40:13 -04:00
Regis Hanol
2039c0f704
fix the specs errors due to a change to the min topic title's length
2013-03-11 14:51:24 +01:00
Sam
621f946193
fuff with test so it passes
2013-03-10 19:58:42 -07:00
Neil Lalonde
8927432a93
Add stats to the admin dashboard
2013-03-09 15:34:27 -05:00
Robin Ward
97ba6f32c7
Fixes broken jasmine test - PreloadStore now returns null
2013-03-08 15:10:57 -05:00
Robin Ward
d1d4530efd
User Profile enhancements:
...
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
2013-03-08 15:04:37 -05:00
Robin Ward
b8fd734d0e
Merge branch 'refactor-category' of git://github.com/goshakkk/discourse
...
Conflicts:
app/models/category.rb
2013-03-08 10:49:25 -05:00
Robin Ward
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
Robin Ward
d848a9fedc
Add opengraph and twitter card support to topics
2013-03-07 17:46:43 -05:00
Neil Lalonde
2ebe0336ae
On signup, handle duplicate key errors on email and username better
2013-03-07 14:56:55 -05:00
Robin Ward
052887c296
Category Topics are no longer invisible, they are pinned.
2013-03-07 12:46:23 -05:00
Robin Ward
5349e1b163
Merge pull request #387 from ZogStriP/g10n-wikipedia-oneboxer
...
globalized wikipedia onebox
2013-03-07 09:23:19 -08:00
Robin Ward
f8d8272406
Cleaned up TopicUserSpec, introduces clearing of pinned topics
2013-03-07 12:19:25 -05:00
Regis Hanol
5703d6c730
added the min-search-term-length site setting
2013-03-07 16:52:01 +01:00
Régis Hanol
621995f35a
globalized wikipedia onebox
2013-03-07 03:30:40 +01:00
Robin Ward
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
Robin Ward
30aae8e793
Topic was not sanitizing <b> and <img> tags from titles
2013-03-06 11:36:42 -05:00
Neil Lalonde
83f89b5c55
Fix check if you're up to date in javascript
2013-03-06 10:34:29 -05:00
Sam Saffron
8f56a09e82
PBKDF2 gem is trouble, removing and hand coding for now
2013-03-06 23:12:16 +11:00
Alexander
c4f1cb0d7b
Raise 404 from Admin::UsersController#show if no user found
...
[Fixes #353 ]
2013-03-05 14:02:23 -08:00
Robin Ward
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
Robin Ward
cf09e200a5
Moved Markdown out of Discourse.Utilities -> Discourse.Markdown
2013-03-05 14:56:43 -05:00
Robin Ward
e4277757c4
Fix onebox loading on every keystroke after a request fails.
2013-03-05 14:06:39 -05:00
Gosha Arinich
a1825fece9
refactor Category
...
* move callback bodies to separate methods (easier to test)
2013-03-05 21:09:13 +03:00
Régis Hanol
239cbd2d58
enforce coding convention
...
replaced every `and` by `&&` and every `or` by `||`
2013-03-05 01:42:44 +01:00
Robin Ward
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
Robin Ward
35d5c899dd
Merge pull request #321 from tijmenb/fix-hosts-in-oneboxer
...
Fix display hosts in oneboxer
2013-03-04 11:04:02 -08:00
Robin Ward
51f6ae69c9
Check when logging in whether a auth provider is enabled, including specs
2013-03-04 13:44:41 -05:00
Brian Kim
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
Robin Ward
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
Michael Berg
50dcaa0205
Removed Strange Test-Output
2013-03-02 12:23:40 +01:00
Gosha Arinich
28bc5a6c89
make Enum#valid? specs test the right thing
2013-03-02 10:40:32 +03:00
Tijmen Brommet
ba04e72a99
Fix weirdly indented code
2013-03-02 00:48:49 +01:00
Tijmen Brommet
eaef66a423
Fix display host for onebox
2013-03-02 00:46:55 +01:00
Robin Ward
5cf69baf56
Add specs for Enum class
2013-03-01 17:05:39 -05:00
Robin Ward
d410f043a9
Merge pull request #290 from alxndr/category-rss
...
RSS for topics in a category
2013-03-01 12:01:26 -08:00
Robin Ward
7c68224763
Merge pull request #309 from goshakkk/enums
...
Introduce Enum
2013-03-01 11:34:48 -08:00
Robin Ward
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
Gosha Arinich
0c99dea153
introduce Enum
2013-03-01 21:16:36 +03:00
