IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-14 06:55:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,233 Commits 976 Branches 574 Tags
80fb20816cd6ae405cc0ceda883c18e86aeb85ff
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam 80fb20816c get rid of nonsense 404.html 
correct 404 handling for invalid pages
 2013-05-20 10:29:49 +10:00
Sam 18b00d01d0 Merge pull request #859 from lengarvey/user_refactoring 
Light refactoring of the User model
 2013-05-19 16:41:20 -07:00
Sam 24c997966e Merge pull request #861 from sanderdatema/post_creator 
Set created_at manually through PostCreator
 2013-05-19 16:34:45 -07:00
Sam e068edf362 Merge pull request #860 from chrishunt/chrishunt/page-out-of-range 
Show posts for last page when page out of range
 2013-05-19 16:33:57 -07:00
Sam ceddb6e0da fix bug where non-multisite environment would run out of connections 2013-05-20 00:23:10 +10:00
Sam b045c23ec4 Update DEVELOPER-ADVANCED.md 2013-05-18 09:12:57 +10:00
Sam 049a4c66e0 Merge pull request #858 from chrishunt/chrishunt/create-explicit-spec-task 
Create 'spec' rake task
 2013-05-17 16:12:08 -07:00
Sam 6f2e74b31e Merge pull request #855 from sanderdatema/dutch_translation 
Dutch translation updated
 2013-05-17 15:58:20 -07:00
Sam 25105082d5 Merge pull request #850 from bplexico/refactor_post_rb 
Refactored post model to reduce duplication in validator methods
 2013-05-17 15:56:53 -07:00
Sam 34f4ff9a3f Merge pull request #857 from chrishunt/chrishunt/fix-spec-rake-task 
Require rspec-rails in Gemfile to fix 'spec' task
 2013-05-17 15:53:48 -07:00
Sam be391e18fd Merge pull request #853 from joebew42/joe 
Updated client side Italian translation
 2013-05-16 16:33:34 -07:00
Sam c86124bdbb Merge pull request #854 from ZogStriP/keep-french-l10n-up-to-date-2013-05-16 
keep French l10n up to date
 2013-05-16 16:32:34 -07:00
Sam 8f46653345 refactor 2013-05-17 09:03:52 +10:00
Sam 04b8cd5c95 consistency check, need to also ensure delete cleans stuff up, maybe make notifications trashable 2013-05-16 17:50:14 +10:00
Sam 88417725b5 we need some, albeit hacky way of clearing these old pms, make at least some way of finding them 2013-05-16 17:30:30 +10:00
Sam 7e1c5ae5b7 glyph in secure categories to the right, like pms 2013-05-16 16:55:07 +10:00
Sam eb71e9de24 opening move, don't get rid of green notification till the pm is read 
TODO a way to list all unread PMs
 2013-05-16 16:37:47 +10:00
Sam 8b63c82f64 Merge pull request #852 from avdi/avoid-exceptions-for-flow-control 
Replace exceptions for flow control with idiomatic throw/catch
 2013-05-15 22:27:33 -07:00
Sam 8ac1d17c6f Merge pull request #846 from ZogStriP/fix-onebox-link-target-is-discourse-instance 
FIX: Onebox link target is discourse instance
 2013-05-15 22:19:22 -07:00
Sam 19cc930cb1 Merge pull request #848 from ZogStriP/keep-french-l10n-up-to-date-2013-05-14 
keep French l10n up to date
 2013-05-15 22:16:24 -07:00
Sam e9ebadb414 Nuke message_bus_observer move to service class and classes 
Secure all messages triggered by post creation and all user actions so they don't leak
(meaning, if you have a browser open and secure topics are created you will only get them if you are allowed to see them)
 2013-05-16 15:03:16 +10:00
Sam bae2d252fa message bus extracted, wanted to make sure the tests run regularly, so the new repo has travis enabled. 
new home is https://github.com/SamSaffron/message_bus

implemented group support over there with testing fixes
 2013-05-16 15:03:16 +10:00
Sam 1201ba9920 Merge pull request #851 from ZogStriP/fix-user-mention-when-there-are-multiple-code-blocks 
FIX: @username mentions when there are multiple code blocks in a post.
 2013-05-15 17:37:56 -07:00
Sam 0a56f64cee Merge pull request #849 from leemachin/fix-secure-categories-query 
Fix error in secured categories scope
 2013-05-15 14:56:46 -07:00
Sam a613347100 this warning is getting in the way of my presentation 2013-05-14 15:20:28 +10:00
Sam 802330269d ok ... guard needs these dependencies earlier 2013-05-14 14:00:12 +10:00
Sam ef98b60184 disable observers in tests, enable as needed, tests are 20% faster 2013-05-14 11:59:55 +10:00
Sam 670b66ade3 better add some tests here tomorrow 2013-05-13 18:47:32 +10:00
Sam b6bf95e741 speed up startup (avoid loading some gems on startup) 
correct group permission leaks
add Discourse.cache for richer caching support
 2013-05-13 18:04:03 +10:00
Sam 9b33e826f2 clear flags on reply to notify moderators 2013-05-13 11:48:01 +10:00
Sam a27046bacd fix cache hole 2013-05-13 11:09:03 +10:00
Sam d68e3f7369 optimisations (cut down on category queries, cut down on expensive current_user query) 2013-05-13 11:07:22 +10:00
Sam 98d9f174ae fix spec 2013-05-13 11:07:22 +10:00
Sam 30501e943c fix search 2013-05-13 11:07:21 +10:00
Sam d96f7ef99a Merge pull request #842 from zachlatta/patch-1 
Changed failing_emails_warning to reflect the real location of production.rb
 2013-05-10 21:45:40 -07:00
Sam ac36b591e9 Merge pull request #837 from ZogStriP/fix-pinned-topic-excerpt-is-not-properly-truncated 
FIX: pinned topic excerpt is not properly truncated
 2013-05-10 04:32:06 -07:00
Sam 942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Sam 4030722a8f gemfile cleanup, move git to https for better compat. 2013-05-10 11:50:58 +10:00
Sam 222e4674fc Merge pull request #835 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-09 18:35:44 -07:00
Sam 0534b32f19 turns out I should not have removed 2013-05-09 19:48:10 +10:00
Sam 5280b3a01b more group progress, UI getting there, controller mostly done 
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
 2013-05-09 17:37:34 +10:00
Sam 4f328e3e45 +x on files makes no sense unless they really are executable 
rails in the script dir makes no sense, use binstubs or bundler instead
 2013-05-09 17:35:15 +10:00
Sam 0f0fd281a8 group progress, never email banned users 2013-05-09 11:34:58 +10:00
Sam 6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sam 7571152d1d fix issue adding users to groups 2013-05-08 10:32:29 +10:00
Sam b26057292e change md route to raw 2013-05-08 10:26:55 +10:00
Sam 2a98e8773f Merge pull request #828 from ZogStriP/hide-show-preview-in-composer-preference-is-saved-in-local-storage 
FIX: hide/show preview in composer preference is saved in local storage
 2013-05-07 03:49:39 -07:00
Sam 71728b3adb oops 2013-05-07 18:02:56 +10:00
Sam 20493106cd fix post trashing 2013-05-07 17:56:56 +10:00
Sam a232e77fa8 whitspace 2013-05-07 17:33:04 +10:00
Sam 68e6405aca redis rack cache was crazy, it was just storing stuff in redis FOREVER, added a PR to fix, forked to my repo, sourcing a sane version 2013-05-07 17:33:04 +10:00
Sam 381c42724f comments 2013-05-07 14:50:02 +10:00
Sam 066c2bed42 better comments 2013-05-07 14:46:46 +10:00
Sam e9fc272db7 remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed 
makes upgrading to rails 4 possible
 2013-05-07 14:39:01 +10:00
Sam b0945599b7 enter will either run all specs or tell you which failed 2013-05-06 15:16:53 +10:00
Sam be1ab8b275 automatic group infrustructure 2013-05-06 14:49:56 +10:00
Sam 93e9bcc7eb add a few ignores 2013-05-06 10:54:34 +10:00
Sam d4a0d4f5dd Merge pull request #814 from ZogStriP/keep-reloaders-happy 
prevent warning message about already defined constants
 2013-05-05 17:52:22 -07:00
Sam ca17312682 Merge pull request #815 from juanpastas/patch-1 
Update TROUBLESHOOTING.md
 2013-05-05 17:51:51 -07:00
Sam 872866744f Merge pull request #812 from goodbrews/capistrano-samples 
Link to helpful article on Capistrano deployment
 2013-05-05 17:51:17 -07:00
Sam 9b1263bb3e Merge pull request #817 from ZogStriP/prevent-duplicates-actions-on-a-post 
prevent duplicate actions on a post
 2013-05-05 17:50:53 -07:00
Sam bb7a2da224 update psuedo locale 2013-05-06 10:48:30 +10:00
Sam 57950a9d2f Merge branch 'master' of github.com:discourse/discourse 2013-05-06 10:47:16 +10:00
Sam b3769b1bba am serializer update 2013-05-06 10:46:58 +10:00
Sam 63435d9bdd Merge pull request #819 from kubabrecka/cs_update42 
cs translation update
 2013-05-05 16:51:52 -07:00
Sam 8d42bf536b Merge pull request #820 from ZogStriP/keep-french-l10n-up-to-date-2013-05-04 
keep French l10n up to date [ci-skip]
 2013-05-05 16:51:30 -07:00
Sam caa3cae535 remove pointless to_sym 2013-05-06 09:51:09 +10:00
Sam f9ea5ab20b Merge pull request #821 from piglop/define-method-fix 
Fix for Debian Ruby 1.9
 2013-05-05 16:45:30 -07:00
Sam 8d1687d9d5 Merge pull request #822 from ZogStriP/prepend-the-username-in-participants-title 
prepend the username in the participant alt-text in the topic list
 2013-05-05 16:44:35 -07:00
Sam 69db4ab967 Merge pull request #816 from ngpestelos/master 
use HTTP URL to check out active_model_serializers
 2013-05-03 17:52:19 -07:00
Sam dcfa9db84b Merge pull request #805 from kubabrecka/cs_update41 
cs translation update
 2013-05-03 03:39:31 -07:00
Sam 92cf36b42d Merge pull request #808 from 9034725985/patch-1 
In client.en.yml, add a comma after a leading sorry
 2013-05-03 03:38:53 -07:00
Sam 0685d3f84a Merge pull request #807 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-03 03:38:03 -07:00
Sam aff4839075 Merge pull request #809 from goodbrews/capistrano-samples 
Add sample Capistrano deployment files
 2013-05-03 03:37:31 -07:00
Sam 3eab0be4a8 deleting posts as an admin was bust 2013-05-03 17:56:23 +10:00
Sam 42494b5bb1 we can't trust CSRF for anon the way it is designed. 
The page they have loaded may be cached we need a different way of delivering the CSRF potentially
 2013-05-03 16:43:11 +10:00
Sam 4d2c28e8b2 added setting to flush redis if you feel like doing so in dev 2013-05-03 09:56:10 +10:00
Sam 3ca263568e Merge pull request #806 from ZogStriP/clear-pin-link-in-list-topics-view 
Add a clear pin link in the list topics view
 2013-05-02 16:45:46 -07:00
Sam 40f631b5c1 fix style 2013-05-02 22:29:45 +10:00
Sam 99283e757f staff rename forgotten 2013-05-02 20:08:32 +10:00
Sam cb9a89940a display admin/mod status on user page 2013-05-02 17:40:44 +10:00
Sam 5ec52bd2e9 :s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff 2013-05-02 17:22:27 +10:00
Sam 65cd00cf25 moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5 
allow pms to be targetted at groups
 2013-05-02 15:15:53 +10:00
Sam e59ab32210 Merge pull request #800 from goodbrews/imgur-api-v3 
Update to Imgur API v3
 2013-05-01 21:52:00 -07:00
Sam 3bf3b130cc Merge pull request #798 from kubabrecka/cs_update40 
cs translation update
 2013-05-01 16:35:04 -07:00
Sam 10a3374cf4 Merge pull request #799 from Supermathie/freebsd-ps 
message_bus: support ps on FreeBSD
 2013-05-01 16:34:31 -07:00
Sam 7b0a02c273 Merge pull request #801 from goodbrews/clockworkd-fix 
Allow clockwork to be run using the daemons gem
 2013-05-01 16:27:51 -07:00
Sam 72aee82a07 Merge pull request #803 from ZogStriP/remove-rounded-corners-on-images-in-posts 
removes rounded corners on images in posts
 2013-05-01 16:27:13 -07:00
Sam 43c767fb0d Merge pull request #802 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-01 16:22:40 -07:00
Sam e4a76812a6 this is a slightly round about way of making our self oneboxes sane 
shrunk avatar to 60px, added global whitelisting
 2013-05-01 16:38:13 +10:00
Sam 3b784b50cc correct base url in emoji so I can close bug 2013-05-01 11:16:13 +10:00
Sam e5c5c0bbb3 no_js to use site customisations 2013-05-01 11:04:47 +10:00
Sam 08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Sam fc07fcbd9d oops 2013-05-01 10:34:22 +10:00
Sam 8b419794f9 added option to force polling instead of messing with the detection 2013-05-01 10:29:39 +10:00
Sam 2c4bd484af vagrant detection attempt 2013-05-01 10:04:47 +10:00
Sam 7276542231 firefox used to display "loading..." on back sometimes 2013-05-01 09:49:28 +10:00
Sam 58dbfa1b91 Merge pull request #796 from ZogStriP/fix-shift-clicks-on-links 
FIX: shift+click on links
 2013-04-30 16:02:24 -07:00
Sam acc4f73ba0 very subtle, autospec was not using inotify if guard was already running 2013-04-30 22:54:52 +10:00
Sam 560bf4dcef Merge pull request #794 from fayimora/patch-1 
Fix misspelling
 2013-04-30 02:34:44 -07:00