Neil Lalonde
50b04b2209
Add email counts to admin dashboard
2013-03-18 10:08:09 -04:00
Neil Lalonde
6a99d12784
Add likes to admin dashboard
2013-03-18 10:08:08 -04:00
Neil Lalonde
0e63de59b5
Comment out report_spec.rb for now because it fails sometimes
2013-03-16 19:42:23 -04:00
Sandy Vanderbleek
204dcc43a4
Use Diffy as DiffEngine implementation
2013-03-15 17:31:51 -07:00
Neil Lalonde
d9cdde9aa7
Add user counts for each trust level to admin dashboard
2013-03-15 18:09:02 -04:00
Neil Lalonde
8983df9856
Show current user count for now, not at different points in time
2013-03-15 18:09:01 -04:00
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
Alexander
fd240c1967
RSS for topics in a category
...
Creates a new route for category RSS
2013-03-01 09:52:59 -08:00
Robin Ward
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
Régis Hanol
4fa4c15559
Quoting another reply won't satisfy the minimum character count ( fixes #180 )
2013-02-28 23:58:40 +01:00
Robin Ward
98d4f40d05
Merge pull request #302 from kirushik/better_search
...
Better search
2013-02-28 12:31:31 -08:00
Kirill Pimenov
f639397aff
Correct stripping of non BasicLatin characters
2013-02-28 23:52:35 +04:00
Robin Ward
628927a79f
Added Site Setting to change locale.
2013-02-28 14:34:38 -05:00
Robin Ward
e37c7f1e1d
Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse
2013-02-28 14:34:13 -05:00
Gosha Arinich
6e5399d544
minor cleanup, using AR querying DSL over raw SQL in some places
2013-02-28 21:54:12 +03:00
Neil Lalonde
a58668cbcd
Remove extra comma so jshint passes
2013-02-28 12:38:35 -05:00
Robin Ward
6c25eca2d6
Merge pull request #296 from goshakkk/refactor-user
...
Refactor User and TrustLevel a bit
2013-02-28 08:17:21 -08:00
Gosha Arinich
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
Robin Ward
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
Robin Ward
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
Robin Ward
dc8e1196fd
Code to support EmberJS + Discourse Tutorial feature: Admin Reports
2013-02-27 22:40:36 -05:00
Régis Hanol
f93a26e03d
added more tests & documentation to the BBCode component
2013-02-28 03:29:52 +01:00
Régis Hanol
9a40789f4d
cleaned up all javascript specs for better readability
2013-02-28 03:26:20 +01:00
Robin Ward
a086635add
Swap out "@" for "via" in email From field
2013-02-27 19:03:57 -05:00
Robin Ward
421f048458
Add a better from address to the email
2013-02-27 18:30:14 -05:00
Robin Ward
7c1ae451fe
Send emails to users who are watching topics
2013-02-27 15:38:44 -05:00
Robin Ward
cf867a35ff
Merge pull request #271 from goshakkk/topic-refactor
...
Refactor Topic
2013-02-27 10:32:44 -08:00
Robin Ward
0e6cd9410f
Fixes lines that were too long.
2013-02-27 12:27:56 -05:00
Robin Ward
007118b00c
Merge branch 'github-auth' of git://github.com/nverba/discourse
...
Conflicts:
config/locales/server.en.yml
db/structure.sql
spec/views/omniauth_callbacks/complete.html.erb_spec.rb
2013-02-27 12:09:22 -05:00
Robin Ward
2184763d4a
Merge pull request #222 from alxndr/rss-for-topics
...
RSS view of topics
2013-02-27 08:30:08 -08:00
Kuba Brecka
acc7718c67
first attempt to serve correct localized js files as rails pipeline assets
2013-02-27 09:00:49 +01:00
Régis Hanol
3a41400d63
formatted some tests
...
- formatted the bbcode_spec
- added 3 tests regarding the quotes
- corrected a test label in the smoke test
- cleaned up a bit the Guardfile
2013-02-27 03:18:23 +01:00
Alexander
8855a0bfbe
RSS of a topic via new route
...
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
2013-02-26 14:54:17 -08:00
Gosha Arinich
12d664a610
refactor Topic
...
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
2013-02-26 19:27:59 +03:00
Robin Ward
1221c393a3
Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse
...
Conflicts:
lib/oneboxer.rb
lib/oneboxer/whitelist.rb
spec/controllers/robots_txt_controller_spec.rb
2013-02-26 10:42:49 -05:00
nverba
b45f872c04
Added Github authentication option, disabled by default with enable options in settings.
2013-02-26 05:00:21 +00:00
Gosha Arinich
cafc75b238
remove trailing whitespaces ❤️
2013-02-26 07:31:35 +03:00
Régis Hanol
79c19233bc
corrected spec labels
2013-02-25 23:58:16 +01:00
Robin Ward
e461c84253
Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline
2013-02-25 17:16:57 -05:00
Sam Saffron
77a2d8ccc4
fixed a pile of notification craziness
...
addes some tests around post timings
2013-02-25 18:42:42 +11:00
Sam Saffron
430a397cde
comment out missing test
2013-02-24 22:59:09 +11:00
Sam Saffron
b66db4153d
refactor and organise current_user better
2013-02-24 21:42:04 +11:00
tms
3e6641c07e
Unsign auth token cookies per discussion on #215
2013-02-23 13:40:21 -05:00
Robin Ward
532b1f5450
Can edit category descriptions, they show up in a `title` attribute
2013-02-22 13:43:47 -05:00
Neil Lalonde
ff3e012034
Add a link that allows you to send activation email again
2013-02-22 11:49:58 -05:00
Robin Ward
45ab3ab892
JS refactoring that fixes presence errors in earlier reverted commit.
2013-02-22 11:00:47 -05:00
Sam Saffron
2b5be29d3c
Revert "Remove old unused code."
...
This reverts commit 6a617348e5
.
2013-02-22 10:57:11 +11:00
Robin Ward
588c79e637
Updated JSHint settings, include smoke test.
2013-02-21 16:25:40 -05:00
Robin Ward
6a617348e5
Remove old unused code.
2013-02-21 16:17:56 -05:00
Robin Ward
42d996aae1
Show empty categories to those who can create them (admins/mods)
2013-02-21 10:43:10 -05:00
Robin Ward
84cb08e035
Merge pull request #215 from tms/auth-token-changes
...
Sign the auth token cookie and make it httpOnly
2013-02-21 07:14:15 -08:00
Sam Saffron
97ceea8878
add delay and trivial 200 code check
2013-02-21 16:37:17 +11:00
Sam Saffron
012941ea62
basic smoke test script
2013-02-21 16:01:40 +11:00
Sam Saffron
2226207ecd
smoke test
2013-02-21 16:01:40 +11:00
Robin Ward
f661fa609e
Convert all CoffeeScript to Javascript. See:
...
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
2013-02-20 19:01:13 -05:00
tms
5616fdc475
Sign the auth token cookie and make it httpOnly
2013-02-20 17:24:19 -05:00
Neil Lalonde
85f8f8f2d5
Better checking of blacklisted emails on create and when email is being updated
2013-02-20 16:25:08 -05:00
Neil Lalonde
046c330858
Changes to email_domains_blacklist shouldn't invalidate existing users
2013-02-20 12:16:16 -05:00
Sam
d81cd6eb80
Merge pull request #207 from danneu/validate-category-user-id
...
validate category user_id presence to match DB constraint.
2013-02-19 22:48:39 -08:00
Sam Saffron
0c085059c9
added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies
...
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
2013-02-20 16:11:56 +11:00
Dan Neumann
37ca391f50
validate category user_id.
2013-02-19 21:24:38 -06:00
Robin Ward
13b0b874fb
Merge branch 'onebox-safety' of git://github.com/tms/discourse
2013-02-19 16:15:35 -05:00
Robin Ward
836c3a7379
Support for Fancy topic titles
2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427
Add version checking that shows on the admin dashboard
2013-02-19 15:20:49 -05:00
tms
e951eff5bb
Allow oneboxers to specify their simple_onebox text is unsafe
2013-02-19 14:51:44 -05:00
Robin Ward
bb1156cee1
filter out closed/archived/invisible topics from suggested
2013-02-19 14:38:59 -05:00
Robin Ward
b7e027cfd1
Notifications on PMs respect access rights.
2013-02-19 12:59:46 -05:00
Robin Ward
928e215e57
Update to latest Ember.js
2013-02-19 12:28:18 -05:00
Robin Ward
ae9bee2a91
Merge pull request #172 from jeremybanks/master
...
Do not strip leading and trailing whitespace from raw posts
2013-02-19 08:15:39 -08:00
Sam Saffron
d9531d94d5
basic lightbox support
2013-02-19 17:57:14 +11:00
Jeremy Banks
eb2a5e4654
Merge branch 'origin/master'
...
Conflicts:
lib/text_sentinel.rb
2013-02-18 21:41:20 -05:00
Sam Saffron
d520771c73
move stylesheet cache into the upload dir so its less crazy to sync across servers
2013-02-19 11:02:00 +11:00
Sam Saffron
3be7bde401
stop onebox rapid fire
2013-02-19 10:33:07 +11:00
Jeremy Banks
6af69f7e77
Do not strip leading and trailing whitespace from raw posts.
2013-02-15 20:58:33 -05:00
Sam
8631a6850b
Merge pull request #178 from danneu/update-stats-fix
...
Category year/month/week stats shouldn't include deleted topics.
2013-02-17 14:00:12 -08:00
Dan Neumann
fac75401ef
category stats shouldn't include deleted topics.
2013-02-16 21:10:18 -06:00
Robin Ward
7f4ee00228
Merge pull request #170 from alxndr/remove-iconv-100
...
Removes iconv dependency
2013-02-16 13:01:09 -08:00
Robin Ward
b440e30f45
Better filtering out private messages on user stream.
2013-02-15 17:08:28 -05:00
Alexander
6c4ae05454
Removes iconv dependency
...
Fixes #100
2013-02-15 13:36:19 -08:00
Robin Ward
3cdf89d052
Merge pull request #162 from jessepollak/omniauth-failure
...
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Jesse Pollak
ad5a5b4866
This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml
2013-02-14 18:08:40 -08:00
Sam Saffron
a8085f15c4
grab highest post number from the raw data, so deletions at the end of a topic work
2013-02-15 13:08:37 +11:00
Sam
5628bac5c3
Merge pull request #164 from danneu/slug-fix
...
slug should replace underscores
2013-02-14 17:24:36 -08:00
Sam Saffron
6c73b3a971
bookmarks should only show up in a users stream
2013-02-15 11:44:14 +11:00
Dan Neumann
44642d4d0c
slug should replace underscores
2013-02-14 17:04:30 -06:00
Robin Ward
37b0c168bf
Support non-english topic titles
2013-02-14 17:13:03 -05:00
Robin Ward
5d4efa9100
Support for non-english categories
2013-02-14 16:51:48 -05:00
Robin Ward
d740d7b25f
Fix for foreign language titles: Only enforce upper case rule on english alphabet.
2013-02-14 16:09:57 -05:00
Robin Ward
b9457197c0
First stab at new user education - configurable messages that pop up on a user's first
...
few posts/topics.
2013-02-14 15:33:51 -05:00
Neil Lalonde
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
Robin Ward
cba4c9051a
Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri
...
Replace hpricot with nokogiri
2013-02-14 07:55:19 -08:00
Robin Ward
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
Jaime Iniesta
e4c1b9702b
Use FakeWeb to fake web requests on specs
2013-02-14 11:35:50 +01:00
Jaime Iniesta
6995e75d41
Replace Hpricot with Nokogiri
2013-02-14 11:35:50 +01:00
Jaime Iniesta
84a167725d
Add specs for oneboxer components: amazon, android, apple, flickr and wikipedia
2013-02-14 11:34:33 +01:00
Sam Saffron
87d83802b9
added option that allows users to decide when they consider topics new (default 2 days old or newer)
...
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Neil Lalonde
aaf96f1e29
Replace email_blacklist_regexp with email_domains_blacklist site setting
2013-02-13 22:45:43 -05:00
Ismael Abreu
80bec6efc9
Adds grant and revoke moderation buttons so admins can make users moderators
2013-02-14 01:12:23 +00:00
Robin Ward
dee9e9a51f
Fix bug where links to posts weren't being tracked
2013-02-13 15:23:09 -05:00
Neil Lalonde
941820ac88
Client-side email validation should allow capital letters
2013-02-13 14:30:00 -05:00
Robin Ward
f00006ee7d
Fix broken Yahoo! signup.
2013-02-13 12:37:48 -05:00