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

3039 commits

Author SHA1 Message Date
Dennis Collinson
78a2ed28b9 User can select Night and Day Moods 
headline method on post

extract headline and body from post, at first newline

Night Mood
 2012-03-28 16:22:05 -07:00
Dennis Collinson
f25effcafe move handlebars templates for asset pipeline 2012-03-28 16:21:30 -07:00
Maxwell Salzberg
e1bf6441fe update new js files 2012-03-27 18:26:46 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass 
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
 2012-03-27 18:08:27 -07:00
Steven Hancock
e1607baff4 jquery_include_tag helper 
Implement the jquery_include_tag helper, which is used in several
views but was not implemented in the code. This helper attempts to
load jQuery from the Google CDN (matching the version of the vendored
jquery.js in jquery-rails), falling back to the vendored copy if the
google CDN fails. The helper also loads jquery_ujs.js from jquery-rails.

A jquery_cdn setting is added to application.yml to enable or disable
serving jQuery from the Google CDN (for those podmins who would rather
not use Google's services).

Update app/views/application.html.haml to use the jquery_include_tag
helper since it was the only view that was including the vendored
copy of jquery directly with jquery_include_tag.
 2012-03-27 18:07:44 -07:00
Maxwell Salzberg
0e4f9ae98d fix chubbies by expliciting setting the view path 2012-03-27 17:54:27 -07:00
Maxwell Salzberg
ba917ec80b some sad fixes to try and appease travis :( 2012-03-27 16:31:56 -07:00
Dennis Collinson
6288eff599 day mood for a post responds to content 
extract creating a post with templates to a static post view method.

Legacy templates extracted, day view

day mood shows photos and has variable text size
 2012-03-27 14:54:27 -07:00
Dennis Collinson
663abcb0aa MS DC Pull out stream post logic into own class 2012-03-27 14:54:27 -07:00
Dennis Collinson
775eca0026 MS DC You can has choose a template 2012-03-27 14:52:53 -07:00
Dennis Collinson
11eb1eb7d8 MS DC fix tests 2012-03-27 14:52:53 -07:00
Dennis Collinson
e0b18f5d6c MS DC template picker override 2012-03-27 14:52:52 -07:00
Dennis Collinson
358414371e MS DC framer shows rudimentary version of post 2012-03-27 14:52:52 -07:00
Dennis Collinson
7ec1ef87c2 MS DC Post framer process init 2012-03-27 14:52:52 -07:00
Dennis Collinson
60420f1061 DG DC form autosubmits on file field change 2012-03-27 14:52:51 -07:00
Dennis Collinson
426f0278f9 DG DC uploading a photo shows up in the stream 2012-03-27 14:52:51 -07:00
Dennis Collinson
7a5841a1e1 Select multiple aspects 2012-03-27 14:52:51 -07:00
danielgrippi
4c46cc4246 MS DG; mentions work in new publisher 2012-03-27 14:52:50 -07:00
danielgrippi
fd0065598c DG MS; posting to services now works, updated form serializer to handle array attributes. 2012-03-27 14:52:50 -07:00
danielgrippi
74e9cd6ca8 DG MS; added checkboxes for services in the new publisher (currently not working) / user presenter contains services 2012-03-27 14:52:50 -07:00
Dennis Collinson
680e7f6637 select one aspect 2012-03-27 14:52:50 -07:00
Dennis Collinson
a3ecd32264 DG DC Change dropdown text on select 2012-03-27 14:52:50 -07:00
Dennis Collinson
e77d7608cd DC DGtoggle between public an private 2012-03-27 14:52:50 -07:00
Dennis Collinson
3a47590d06 DG DC OMG FORMZ 2012-03-27 14:52:50 -07:00
Dennis Collinson
cc04f492f2 MS DC added aspect presenter, and include the data on the user 2012-03-27 14:51:40 -07:00
Dennis Collinson
bf4dabc4f4 MS DC posting from post/new werks 2012-03-27 14:51:40 -07:00
Dennis Collinson
ab35f2bf3d MS DC posts/new page init 2012-03-27 14:51:40 -07:00
Florian Staudacher
49801644cc also handle images and links without sub-domain 2012-03-24 02:57:32 +01:00
Florian Staudacher
c5139c9a71 improve behaviour, add more tests 2012-03-24 01:51:41 +01:00
Florian Staudacher
b7b8a11551 fix #2665 - allow umlauts and other non-ascii characters in url 2012-03-24 00:10:36 +01:00
Stephan Schulz
716315409a Limit allowed contacts for sending messages to, to the ones that are sharing with you. 2012-03-23 01:21:04 +01:00
Diaspora Europe
88bb3403d8 added 3 invalid status message specs 2012-03-22 17:24:30 +01:00
Diaspora Europe
e8933fa1da added status message html and mobile spec 2012-03-22 16:59:14 +01:00
Diaspora Europe
97233851df added status message spec, fix render nothing 2012-03-22 16:52:19 +01:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported 
monkeypatch
 2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f MS DG down to four failures 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
a2aabeb599 remove ActiveSupport::SecureRandom 2012-03-21 13:49:34 -07:00
Maxwell Salzberg
ba01d3a7af some sad fixes for webmock in the facebook service spec 2012-03-19 20:07:36 -07:00
Maxwell Salzberg
3cb7003361 remove the swallowing of generic messages from facebook and twitter postiing. I want to know why sometimes these things are failing 2012-03-19 19:17:46 -07:00
Maxwell Salzberg
2e1f353ac4 Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more 
Conflicts:
	public/javascripts/app/views/content_view.js
 2012-03-19 19:11:57 -07:00
Maxwell Salzberg
39c7478b4a Revert "freeze time in conversations show spec to make ree travis happy" 
as it did not work :/

This reverts commit d668b21cd4.
 2012-03-17 19:21:24 -07:00
Maxwell Salzberg
d668b21cd4 freeze time in conversations show spec to make ree travis happy 2012-03-17 19:06:26 -07:00
danielgrippi
852687b31c MS DG fix a few final tests 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works, 
and improving admin functionality
 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Florian Staudacher
5dae27c170 finally some working tests for "show more" 2012-03-16 02:00:50 +01:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
danielgrippi
5c90b0d5e7 comment out a jasmine spec for now to make travis happy 2012-03-14 17:33:08 -07:00
danielgrippi
5e75c6d675 fix jasmine around contact-list.js 2012-03-14 16:26:30 -07:00
Maxwell Salzberg
1d5bc6be70 Merge branch 'fix-comment-jasmine' of https://github.com/Raven24/diaspora into Raven24-fix-comment-jasmine 2012-03-14 11:09:32 -07:00
Maxwell Salzberg
36f9ca6b1a resolve merge in notifications controller 2012-03-14 10:46:59 -07:00
Florian Staudacher
cd965e32fa fix comment stream jasmine - bind function after spy has been defined 2012-03-14 18:43:06 +01:00
Diaspora Europe
05f2be40e1 added test for notification dropdown #2998 2012-03-14 17:02:18 +01:00
Diaspora Europe
7fd39b2896 mobile: added index and read all tests to notification spec #2997 2012-03-14 15:58:07 +01:00
Maxwell Salzberg
56a7da530f small js test fixes 2012-03-13 19:30:34 -07:00
Florian Staudacher
9aa0a7ed58 extracted "show more" part from #2941, tests still WIP 2012-03-14 02:09:27 +01:00
Maxwell Salzberg
b8b6557379 adding an ajax loader, and pull out the js from the middle of the view 2012-03-13 17:10:23 -07:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07:00
Diaspora Europe
97d6b8dab8 notifications update spec and cleanup json response 2012-03-13 11:46:14 +01:00
Steven Fuchs
73fd96d439 this file should have never been added... 2012-03-10 14:21:13 -05:00
Maxwell Salzberg
0d5c518630 Merge pull request #2976 from jbivins/legacy-browser-support 
Legacy browser support
 2012-03-09 16:51:34 -08:00
Steven Fuchs
9de477cf5a jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches. 2012-03-07 23:19:51 -05:00
Steven Fuchs
ee237c6c5f jasmine spec for stimulating deferred searches 2012-03-07 23:19:51 -05:00
Steven Fuchs
7d3a6a061c add spec to ake sure background query is only set when a full diaspora id is given. 2012-03-07 23:19:51 -05:00
Steven Fuchs
ac8cd8368e fixing conflicts in merge 2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Maxwell Salzberg
db0859a83c bug fix: you can now mention and post a photo at the same time 2012-03-07 14:42:46 -08:00
Maxwell Salzberg
f81a6ced01 Merge pull request #2886 from diasp/2823-fix-unlike-unfollow 
#2823 fix unlike and unfollow update
 2012-03-06 12:22:20 -08:00
Maxwell Salzberg
5a7c8d8ea4 make the hash in oembed cache dynamic as to try to fix travis 2012-03-05 11:09:51 -08:00
Joe Bivins
7b47edff14 Move date parsing to a helper. 2012-03-04 13:36:35 -05:00
Maxwell Salzberg
9e249bb7ef small refactor of helper method [ci skip] 2012-03-03 17:53:50 -08:00
Maxwell Salzberg
e6b1111fd1 AHHHH refactor attack_vectors_spec; hopefully it now borders on understandiablity. this deffy needs another pass from another human, as I had to make tons of spec helper methods to make the crazy setup make sense, but I think we are bordering on something that would let us write new tests in a sane way. whether all of these tests now make sense to test in the first place, that is another question all togther, as it was outside the scope of this refactor 2012-03-03 17:50:51 -08:00
Maxwell Salzberg
bd021bbd91 Correct our general exception handling. 
thanks @mperham! see: http://t.co/Jyt7vV4I
 2012-03-03 16:26:06 -08:00
Maxwell Salzberg
67e4f9e159 remove puts and fix a conversationscontroller spec to be a bit more predictable 2012-03-03 16:25:10 -08:00
Joe Bivins
e26fcf836a Correct JS error in app_spec.js 2012-03-03 12:20:31 -05:00
Joe Bivins
4769a25d59 Add ISO 8601 timestamp parsing for legacy browsers. 
Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the
reverse order and the infinite scroll would not be triggered when
scrolling down to the end of the page.
 2012-03-03 12:14:43 -05:00
Daniel Grippi
7a774661bb Merge pull request #2777 from stwf/tweak-twitter-truncation 
take url shortening into effect before truncating twitter posts
 2012-02-29 22:49:46 -08:00
Diaspora Europe
e2776420bc added likes specs to post view 2012-02-29 12:12:32 +01:00
Maxwell Salzberg
0d93227f07 hopefully make travis happy: 2012-02-28 17:52:13 -08:00
danielgrippi
61b4e77bde Merge branch 'profiles' 2012-02-28 10:29:17 -08:00
danielgrippi
74cdc91bb1 fix likes and comment loading in the stream 2012-02-27 20:38:59 -08:00
Maxwell Salzberg
22cda15aa8 presenter now has a title 2012-02-27 18:11:41 -08:00
danielgrippi
0df179c514 fix specs 2012-02-27 17:56:52 -08:00
Dennis Collective
7abbe4a642 Merge pull request #2925 from diasp/2833-conversations-should-return-json 
Conversations should return json #2833
 2012-02-27 17:34:10 -08:00
Dennis Collective
f5ef1e8c14 Merge pull request #2814 from stwf/aspects-javascript-fixes 
update aspect name in aspects listing after editing.
 2012-02-27 17:19:05 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Steven Fuchs
66afb7baff use a stub instead of creating a post to simpy supply text 2012-02-25 23:59:02 -05:00
Maxwell Salzberg
42a93f9490 remove weird monkey patch in sessions controller #wtf 2012-02-25 17:41:46 -08:00
Maxwell Salzberg
27a4c1bf2d introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor 2012-02-25 16:57:14 -08:00
Maxwell Salzberg
49b0a44738 removing estates builder, as we are now using a template 2012-02-25 16:55:26 -08:00
Maxwell Salzberg
a1f39398be Merge pull request #2902 from JMSilla/master 
Fix atom feed bug (bug mash 7) [ci skip]
 2012-02-25 16:47:13 -08:00
JMSilla
8178e0712c Users controller small fix; removed the to_activity method and the corresponding tests for status_message model 2012-02-25 22:24:43 +00:00
danielgrippi
73f224e690 don't render page-viewer twice; last_post should actually get the last post posted, not the first one 2012-02-24 21:48:37 -08:00
danielgrippi
dc0b5db0ac Merge branch 'profiles' of github.com:diaspora/diaspora into profiles 2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
danielgrippi
39d31d5888 Merge branch 'master' of github.com:diaspora/diaspora into profiles 2012-02-24 14:36:18 -08:00
danielgrippi
2c0cfa53dc don't show left-right nav when idle 2012-02-24 13:31:17 -08:00