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

11717 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
b583a7a444 Put dennis's changes back in 
Revert "Revert "refactoring backbone urls""

This reverts commit 838da1fd52.

Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)"

This reverts commit 2a69c0ebd4.
 2012-01-19 17:05:30 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Maxwell Salzberg
3fa2592728 fix a bug with client side validations and jquery cache thx 2 grippi for idea 2012-01-19 15:59:20 -08:00
Maxwell Salzberg
642d20cecd update cdn jquery, fix #2699 2012-01-19 15:48:17 -08:00
Maxwell Salzberg
0ce0e47ff8 fix #2698; allow a user to delete a reshare of a deleted post 2012-01-19 15:24:07 -08:00
Maxwell Salzberg
838da1fd52 Revert "refactoring backbone urls" 
This reverts commit 4ad58bdf2f.
 2012-01-19 14:20:31 -08:00
Jonne Haß
5cb8cd789e do not query for socket port in script/server [ci skip] 2012-01-19 22:33:30 +01:00
Maxwell Salzberg
2a69c0ebd4 revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection) 2012-01-19 11:18:13 -08:00
Jonne Haß
51851ea1f2 pass response into fetched event as expected 2012-01-19 15:57:11 +01:00
Jonne Haß
83e3e955b3 do not render markdown lists as comments [ci skip] 2012-01-19 14:44:06 +01:00
Jonne Haß
ecc79fb333 bump to rubygems 1.8.15 2012-01-19 14:07:11 +01:00
Jonne Haß
ce0507f9eb move config/ci to script/ci, update rubygems before bundle install 2012-01-19 13:57:47 +01:00
Jonne Haß
a4b9ae4f8a ensure known rubygems on travis 2012-01-19 13:36:51 +01:00
Maxwell Salzberg
aa449f3a2d a couple of additions to the branch 2012-01-19 13:33:05 +01:00
Jonne Haß
76cfad0675 no more cruise, no more need for ci.sh's [ci skip] 2012-01-19 13:32:55 +01:00
Florian Staudacher
ad5a17776f Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders 2012-01-19 13:29:35 +01:00
Dennis Collinson
4b960a0061 update factory girl, hopefull fix ci issues 2012-01-19 01:25:01 -08:00
Maxwell Salzberg
1fe7793ec5 Place Rack:SSL before hoptoad 2012-01-19 00:56:06 -08:00
Frederico Araujo
5ce4f60736 Added Fallback to use old hoptoad_api_key if not application.yml is not update 2012-01-19 13:20:59 +07:00
danielgrippi
8ae9fdfd81 require => false for cucumber-rails in Gemfile to supress that cuke warning 2012-01-18 21:45:06 -08:00
Daniel Grippi
50b1a21de0 Merge pull request #2693 from dmorley/patch-9 
Update config/application.yml.example [ci skip]
 2012-01-18 20:22:51 -08:00
Dennis Collinson
9b1d64bb76 stream model has a posts collection 2012-01-18 19:08:36 -08:00
Dennis Collinson
4ad58bdf2f refactoring backbone urls 2012-01-18 19:08:36 -08:00
David Morley
d6fffa1309 Update config/application.yml.example 2012-01-18 18:42:35 -08:00
Maxwell Salzberg
7cafac8c05 I should really start using autosave-on-lose-focus in vimi [ci skip] 2012-01-18 18:03:15 -08:00
Maxwell Salzberg
fe03d7875d update some docs on how circumvent_ssl_requirement works [ci skip]" 2012-01-18 18:01:38 -08:00
Maxwell Salzberg
69e81a0dc3 move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig. also, circumvent ssl requirement option is now back" 2012-01-18 17:57:26 -08:00
Maxwell Salzberg
08adcf3e3e blarg. ActionDispatch::Static isnt always there. took out the option so people can run their ssl pods correctly for now 2012-01-18 17:27:23 -08:00
Maxwell Salzberg
1b3cdbb78a Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info" 
This reverts commit ed45789403.
 2012-01-18 16:52:13 -08:00
Maxwell Salzberg
e4bb00fa2f Revert "make sure we always have app config in enviroment configuration" 
This reverts commit 23fb1b0a29.
 2012-01-18 16:52:01 -08:00
Maxwell Salzberg
23fb1b0a29 make sure we always have app config in enviroment configuration 2012-01-18 16:44:36 -08:00
Florian Staudacher
8f1ff89e10 search field should now look nice, too 2012-01-19 00:53:49 +01:00
Maxwell Salzberg
ed45789403 add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info 2012-01-18 15:50:22 -08:00
Maxwell Salzberg
18e895c247 include Rack::SSL to upgrade all requests to ssl 2012-01-18 15:09:08 -08:00
danielgrippi
ff615848ca added active_reload to development gem group. HOLY CRAP. [ci skip] 2012-01-18 13:35:17 -08:00
danielgrippi
5721c9e512 remove depricated methods 2012-01-18 13:29:43 -08:00
danielgrippi
c82ac5f3e2 fix collapsing of posts [ci skip] 2012-01-18 12:40:33 -08:00
Maxwell Salzberg
0a40cdf288 MS DG make share_visibility_converter really defensive :( 2012-01-18 11:48:23 -08:00
Maxwell Salzberg
0edb06eef7 fix for the migration for some linux users, which the AR stubs were not carring over from the migration file to the ShareVisibilityConverter 2012-01-18 09:29:00 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00
Maxwell Salzberg
38ad76d9c7 rewrite webfinger client and specs; now this is much easier to maintain. 2012-01-18 01:21:28 -08:00
Maxwell Salzberg
392e317962 fix person spec 2012-01-17 22:10:03 -08:00
Maxwell Salzberg
bfde0514bf fix webfinger specs 2012-01-17 21:43:46 -08:00
Maxwell Salzberg
22bd70664f fix post spec 2012-01-17 21:12:47 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
danielgrippi
a658552c3f fix stream helper for mobile 2012-01-17 19:21:36 -08:00
danielgrippi
880efd3e72 use '/reshare' instead of 'reshare/' to ensure the correct path (js) 2012-01-17 17:53:02 -08:00
danielgrippi
641ca9fdd2 we want to POST to /status_messages on Publisher submit 2012-01-17 17:46:49 -08:00
Maxwell Salzberg
b09e76a0ce introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
Maxwell Salzberg
30947778f9 remove stray api feature 2012-01-17 17:33:55 -08:00