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
421f048458
Add a better from address to the email
2013-02-27 18:30:14 -05:00
7c1ae451fe
Send emails to users who are watching topics
2013-02-27 15:38:44 -05:00
cf867a35ff
Merge pull request #271 from goshakkk/topic-refactor
...
Refactor Topic
2013-02-27 10:32:44 -08:00
0e6cd9410f
Fixes lines that were too long.
2013-02-27 12:27:56 -05:00
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
2184763d4a
Merge pull request #222 from alxndr/rss-for-topics
...
RSS view of topics
2013-02-27 08:30:08 -08:00
acc7718c67
first attempt to serve correct localized js files as rails pipeline assets
2013-02-27 09:00:49 +01:00
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
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
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
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
b45f872c04
Added Github authentication option, disabled by default with enable options in settings.
2013-02-26 05:00:21 +00:00
cafc75b238
remove trailing whitespaces ❤️
2013-02-26 07:31:35 +03:00
79c19233bc
corrected spec labels
2013-02-25 23:58:16 +01:00
e461c84253
Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline
2013-02-25 17:16:57 -05:00
77a2d8ccc4
fixed a pile of notification craziness
...
addes some tests around post timings
2013-02-25 18:42:42 +11:00
430a397cde
comment out missing test
2013-02-24 22:59:09 +11:00
b66db4153d
refactor and organise current_user better
2013-02-24 21:42:04 +11:00
3e6641c07e
Unsign auth token cookies per discussion on #215
2013-02-23 13:40:21 -05:00
532b1f5450
Can edit category descriptions, they show up in a `title` attribute
2013-02-22 13:43:47 -05:00
ff3e012034
Add a link that allows you to send activation email again
2013-02-22 11:49:58 -05:00
45ab3ab892
JS refactoring that fixes presence errors in earlier reverted commit.
2013-02-22 11:00:47 -05:00
2b5be29d3c
Revert "Remove old unused code."
...
This reverts commit 6a617348e5
2013-02-22 10:57:11 +11:00
588c79e637
Updated JSHint settings, include smoke test.
2013-02-21 16:25:40 -05:00
6a617348e5
Remove old unused code.
2013-02-21 16:17:56 -05:00
42d996aae1
Show empty categories to those who can create them (admins/mods)
2013-02-21 10:43:10 -05:00
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
97ceea8878
add delay and trivial 200 code check
2013-02-21 16:37:17 +11:00
012941ea62
basic smoke test script
2013-02-21 16:01:40 +11:00
2226207ecd
smoke test
2013-02-21 16:01:40 +11:00
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
5616fdc475
Sign the auth token cookie and make it httpOnly
2013-02-20 17:24:19 -05:00
85f8f8f2d5
Better checking of blacklisted emails on create and when email is being updated
2013-02-20 16:25:08 -05:00
046c330858
Changes to email_domains_blacklist shouldn't invalidate existing users
2013-02-20 12:16:16 -05:00
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
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
37ca391f50
validate category user_id.
2013-02-19 21:24:38 -06:00
13b0b874fb
Merge branch 'onebox-safety' of git://github.com/tms/discourse
2013-02-19 16:15:35 -05:00
836c3a7379
Support for Fancy topic titles
2013-02-19 16:14:04 -05:00
c0371ff427
Add version checking that shows on the admin dashboard
2013-02-19 15:20:49 -05:00
e951eff5bb
Allow oneboxers to specify their simple_onebox text is unsafe
2013-02-19 14:51:44 -05:00
bb1156cee1
filter out closed/archived/invisible topics from suggested
2013-02-19 14:38:59 -05:00
b7e027cfd1
Notifications on PMs respect access rights.
2013-02-19 12:59:46 -05:00
928e215e57
Update to latest Ember.js
2013-02-19 12:28:18 -05:00
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
d9531d94d5
basic lightbox support
2013-02-19 17:57:14 +11:00
eb2a5e4654
Merge branch 'origin/master'
...
Conflicts:
lib/text_sentinel.rb
2013-02-18 21:41:20 -05:00
d520771c73
move stylesheet cache into the upload dir so its less crazy to sync across servers
2013-02-19 11:02:00 +11:00
3be7bde401
stop onebox rapid fire
2013-02-19 10:33:07 +11:00
6af69f7e77
Do not strip leading and trailing whitespace from raw posts.
2013-02-15 20:58:33 -05:00
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
fac75401ef
category stats shouldn't include deleted topics.
2013-02-16 21:10:18 -06:00
7f4ee00228
Merge pull request #170 from alxndr/remove-iconv-100
...
Removes iconv dependency
2013-02-16 13:01:09 -08:00
b440e30f45
Better filtering out private messages on user stream.
2013-02-15 17:08:28 -05:00
6c4ae05454
Removes iconv dependency
...
Fixes #100
2013-02-15 13:36:19 -08:00
3cdf89d052
Merge pull request #162 from jessepollak/omniauth-failure
...
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
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
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
5628bac5c3
Merge pull request #164 from danneu/slug-fix
...
slug should replace underscores
2013-02-14 17:24:36 -08:00
6c73b3a971
bookmarks should only show up in a users stream
2013-02-15 11:44:14 +11:00
44642d4d0c
slug should replace underscores
2013-02-14 17:04:30 -06:00
37b0c168bf
Support non-english topic titles
2013-02-14 17:13:03 -05:00
5d4efa9100
Support for non-english categories
2013-02-14 16:51:48 -05:00
d740d7b25f
Fix for foreign language titles: Only enforce upper case rule on english alphabet.
2013-02-14 16:09:57 -05:00
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
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
cba4c9051a
Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri
...
Replace hpricot with nokogiri
2013-02-14 07:55:19 -08:00
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
e4c1b9702b
Use FakeWeb to fake web requests on specs
2013-02-14 11:35:50 +01:00
6995e75d41
Replace Hpricot with Nokogiri
2013-02-14 11:35:50 +01:00
84a167725d
Add specs for oneboxer components: amazon, android, apple, flickr and wikipedia
2013-02-14 11:34:33 +01:00
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
aaf96f1e29
Replace email_blacklist_regexp with email_domains_blacklist site setting
2013-02-13 22:45:43 -05:00
80bec6efc9
Adds grant and revoke moderation buttons so admins can make users moderators
2013-02-14 01:12:23 +00:00
dee9e9a51f
Fix bug where links to posts weren't being tracked
2013-02-13 15:23:09 -05:00
941820ac88
Client-side email validation should allow capital letters
2013-02-13 14:30:00 -05:00
f00006ee7d
Fix broken Yahoo! signup.
2013-02-13 12:37:48 -05:00
f850fe1e75
Implement the email_blacklist_regexp ssite setting
2013-02-13 12:28:39 -05:00
a9da9c5fde
Merge pull request #148 from danneu/slug-simplify
...
replace reinvention of #parameterize
2013-02-13 07:23:26 -08:00
afc23cc8cb
Merge pull request #133 from xdite/apply_omniauth
...
Apply omniauth
2013-02-13 07:19:13 -08:00
161420fac0
Added method for testing ember stuff
...
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
f232c646a7
move 3 test to 1
2013-02-13 15:15:44 +08:00
27a07054d7
We never want to filter TopicView to just one post.
2013-02-12 19:02:16 -05:00
4a390bc562
remove reinvention of #parameterize
2013-02-12 17:53:06 -06:00
824b09389f
Don't allow signups without a password
2013-02-12 15:42:16 -05:00
924ad1dae0
Merge pull request #106 from gammons/master
...
Refactored TopicsController#show into something that is much more maintainable
2013-02-12 08:36:20 -08:00
4636b354b4
Use the new mothership change_nickname API
2013-02-12 10:19:02 -05:00
238032051e
Users with no email_tokens return true from email_confirmed
2013-02-12 10:19:02 -05:00
Robin Ward
Gosha Arinich
Neil Lalonde
Régis Hanol
Kuba Brecka
Alexander
nverba
Sam Saffron
tms
Dan Neumann
Jeremy Banks
Jesse Pollak
Jaime Iniesta
Ismael Abreu
xdite