nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11415 commits 4 branches 0 tags 121 MiB
Commit graph

11415 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steven Hancock
a8843c1036 Fix JSON caching regression 
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.

Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.

closes #3094
 2012-04-02 21:40:16 -07:00
Maxwell Salzberg
4ba3ec0b42 update initializer 2012-04-02 18:43:18 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
danielgrippi
e156947d0b fix jasmine specs 2012-04-02 18:17:55 -07:00
Maxwell Salzberg
eee5a89382 Merge pull request #3090 from Raven24/ci-stuff 
css should be delivered by asset pipeline for travis(?)
 2012-04-02 17:40:59 -07:00
Maxwell Salzberg
4523add9d2 Merge pull request #3097 from Raven24/fix-comments-error-cuke 
fix cuke unhappiness I introduced with #3088
 2012-04-02 17:39:57 -07:00
Maxwell Salzberg
7ce61fd4b1 Merge pull request #3095 from Raven24/fix-jasmine-comment-error 
fix jasmine unhappiness I introduced with #3088
 2012-04-02 17:39:40 -07:00
Florian Staudacher
c9fa88a1de fix cuke unhappiness I introduced with #3088 2012-04-03 01:13:44 +02:00
Florian Staudacher
1709036764 fix jasmine unhappiness I introduced with #3088 2012-04-02 21:25:01 +02:00
Steven Hancock
4b41f8bf41 Add a comment about JS runtimes to Gemfile 
As mentioned in #3078 there may be some confusion about the asset
pipeline's dependency on an ExecJS compatible javascript runtime.

On OSX it should just work, Linux needs Node.js (recommended) or
TheRubyRacer.

This adds a comment to the :assets group to give people more
information.
 2012-04-02 01:26:18 -07:00
Steven Hancock
e2e93e8742 Merge pull request #3093 from stevenh512/db-indexes-rebased 
DB Indexes
 2012-04-01 19:35:01 -07:00
Christophe
4279d85776 New index for posts table. interacted_at still missing 2012-04-01 19:16:04 -07:00
Christophe
48571cae37 Indexes on participation table 2012-04-01 19:16:04 -07:00
Daniel Grippi
6f75fb4173 Merge pull request #3088 from Raven24/fix-bmm-2 
show an error message when creating a comment failed [ci skip]
 2012-04-01 18:24:54 -07:00
Daniel Grippi
a45eed13d5 Merge pull request #3086 from Raven24/fix-publisher-height 
reset publisher css height when "cleared" [ci skip]
 2012-04-01 18:24:00 -07:00
Daniel Grippi
9573bb55ee Merge pull request #3091 from Raven24/fix-wp-spec 
make app.views.Post.Wallpaper spec pass
 2012-04-01 18:23:21 -07:00
Daniel Grippi
2646352cb1 Merge pull request #3092 from Raven24/self-follow 
create a dummy-participation js object, for the post to appear as followed by self
 2012-04-01 18:22:17 -07:00
Florian Staudacher
ef292c40eb create a dummy-participation object, that the post appeas followed by self 2012-04-01 22:34:54 +02:00
Florian Staudacher
2a4bc32eb5 make wallpaper-post spec pass 2012-04-01 17:43:33 +02:00
Florian Staudacher
62edcb8c21 css should be delivered by asset pipeline(?) 2012-04-01 13:44:00 +02:00
Jonne Haß
a5a6378eb0 translate 'mark unread' in notifications badge 2012-04-01 13:03:44 +02:00
Maxwell Salzberg
302346bcdb Merge pull request #3089 from justindthomas/fix-migration 
change concat() to || for pgSQL
 2012-03-31 09:27:53 -07:00
Maxwell Salzberg
9677500a2f add wait and suppress all the cukes from starting on the specific cucumber task 2012-03-31 01:34:55 -04:00
Maxwell Salzberg
a54fb79bfa Merge branch 'tubbo-feature/sporkify' 2012-03-31 01:26:41 -04:00
Maxwell Salzberg
adf85e1ec6 adding a bit to tubbo's spork branch 2012-03-31 01:22:46 -04:00
Maxwell Salzberg
98b41d8f1d update seeds.rb to reflect asset pipeline, and a lil bit of refactoring 2012-03-31 00:15:56 -04:00
Maxwell Salzberg
8e0998ab88 make cukes' wait until use block form, as we were getting some weird parse errors otherwise 2012-03-31 00:15:55 -04:00
Maxwell Salzberg
0e2bcf18d2 the logged out logo is now in the branding folder 2012-03-31 00:15:55 -04:00
Justin Thomas
14a0e9c586 change concat() to || for pgSQL 2012-03-30 11:45:50 -07:00
Florian Staudacher
e6ebf4ad62 show error message when creating a comment failed 
(e.g. when the post got deleted in the meantime)
bug mash 5.2
 2012-03-30 19:42:14 +02:00
Florian Staudacher
0629f4fd9c added tests for resetting height on close 2012-03-30 16:40:08 +02:00
Florian Staudacher
859c0b93b5 reset publisher css height when "cleared" (fixes #2867) 2012-03-30 16:09:41 +02:00
Steven Hancock
125be41868 Test for mobile UI single post view 
Verify that the correct layout is rendered (rather than no layout
at all) in the mobile UI single post view.

This is a test I forgot to write at 5am when I was so excited about
having the mobile UI working on my Blackberry again (bad me!), so
here it is before it slips my mind. 😁

This tests the change made to posts_controller in 6abe718227
 2012-03-29 21:07:21 -07:00
Steven Hancock
fc4b8d2af0 Skip CSRF token for OmniAuth callbacks (prevents session reset) 
OmniAuth callbacks need to accept a raw POST from the auth provider without
verifying the CSRF token, otherwise the session will be reset.

See intridea/omniauth#203
See also http://www.communityguides.eu/articles/16

(This technique will also be needed for API endpoints when the time comes)
 2012-03-29 18:51:54 -07:00
Maxwell Salzberg
b0a9e9ee59 the header background is not in the branding folder [ci skip] 2012-03-29 16:46:08 -07:00
Maxwell Salzberg
2da0c0f585 never use s3 in the test env ::sigh:: 2012-03-29 16:11:32 -07:00
Maxwell Salzberg
3a7c92338b Merge pull request #3085 from Raven24/patch-2 
damn my brain!
 2012-03-29 15:58:32 -07:00
Raven24
5ad38a5372 damn my brain! 2012-03-30 01:50:21 +03:00
Maxwell Salzberg
033bf637cd Merge pull request #3070 from SuperTux88/fix-invite-mail 
Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!
 2012-03-29 15:41:23 -07:00
Maxwell Salzberg
7cc63348ce Merge pull request #3080 from Raven24/js-fix 
fix js error when not logged in and on root/landing page, app is undefined
 2012-03-29 15:40:15 -07:00
Maxwell Salzberg
a08711c74e Merge pull request #3083 from DeadSuperHero/branding-pack 
Branding Pack [ci skip]
 2012-03-29 15:39:58 -07:00
Maxwell Salzberg
fe1c0d34d5 Merge pull request #3084 from Raven24/non-ascii-begone 
finally (hopefully) fix non-ascii urls + new & old tests
 2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28 finally (hopefully) fix non-ascii urls + new & old tests 2012-03-30 00:29:34 +02:00
Sean Tilley
19bf699b9f Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory 2012-03-29 17:18:27 -05:00
Dennis Collinson
59f7f504e8 Wallpaper Mood 2012-03-29 15:14:09 -07:00
Maxwell Salzberg
52c9d76a86 Merge pull request #3065 from diasp/2176-url-in-rss 
Make URL clickable in RSS #2176
 2012-03-29 12:18:36 -07:00
Dennis Collinson
6488cd004b Disable Mentions in trumpeter to fix cukechange assertion of mood 2012-03-29 12:16:59 -07:00
Maxwell Salzberg
79a09dbea6 Merge pull request #3069 from movilla/trad_mobile 
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
 2012-03-29 12:14:35 -07:00
Dennis Collinson
34bdc09763 simplify env.rb for great justicethe jquery hack was messing up cukes, killed that 2012-03-29 11:51:32 -07:00
Maxwell Salzberg
53f82a3ae7 update readme to tell people about pre-asset-pipeline-tag 2012-03-29 10:48:01 -07:00