Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
danielgrippi
00ffade884
sub menu for people only sharing with you on contacts page
2011-06-27 17:22:36 -07:00
Raphael Sofaer
240eb78b08
Change homepage_url to application_base_url
2011-06-27 16:44:18 -07:00
Raphael Sofaer
e468075ffd
Doc AS::Photo
2011-06-26 20:59:02 -07:00
Raphael Sofaer
2857de5f1b
doc a user method
2011-06-24 10:38:06 -07:00
Raphael Sofaer
18138e1507
Doc
2011-06-24 10:38:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f
fixed every spec but the activity stream photos controller spec
2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00
collapsed oauth2 migrations; made app factory
2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213
Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env.
2011-06-23 14:20:53 -07:00
danielgrippi
5917f0d695
added JWT verification support to diaspora
2011-06-22 16:15:03 -07:00
Raphael Sofaer
a987b198fd
Fix search in PG
2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417
Fix direct query execution issues in PG by using select_values/select_rows instead of execute.
2011-06-22 14:47:59 -07:00
Ilya Zhitomirskiy
c09fb776fb
added a couple of validations on the Oauth models, added an index on a user's authorizations
2011-06-20 18:30:18 -07:00
danielgrippi
890dc7efd5
put some dependent destroys on models for better sqlite compatability
2011-06-19 23:39:57 +02:00
Raphael Sofaer
f0cb2159c7
Make contacts appear at the beginning of search results in postgreSQL
2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
75a1012c1c
moved the monkey patching to a model, need to do a couple of validations
2011-06-15 18:30:05 -07:00
Raphael Sofaer
800e701f89
Document User#accept_invitation
2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1
Take loop out of remove_mentions
2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2
Document liked? and like_for
2011-06-14 10:15:32 -07:00
danielgrippi
b446404348
Revert "Without loaded? I was confused by the liked? and like_for methods."
...
This reverts commit 2103d54fe4 .
2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4
Without loaded? I was confused by the liked? and like_for methods.
2011-06-13 17:14:00 -07:00
Raphael Sofaer
480d7c47cf
Documentation is so rad.
2011-06-13 17:02:18 -07:00
Raphael Sofaer
7171aa05ed
Do a little bit more documenting.
2011-06-13 16:31:40 -07:00
Raphael Sofaer
4815482354
Start some real docs
2011-06-13 16:12:32 -07:00
Ilya Zhitomirskiy
3d77186d35
added authorizations page where a user can see all of their authorized applications
2011-06-13 15:40:55 -07:00
Ilya Zhitomirskiy
56525c9f4f
made a slightly nicer heads up about nil ca_file
2011-06-09 16:28:45 -07:00
Ilya Zhitomirskiy
71dd8dc7f3
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/app_config.rb
2011-06-09 15:51:59 -07:00
Raphael Sofaer
e1fb5846b6
Use the example config file if travis
2011-06-09 15:45:01 -07:00
Raphael Sofaer
ac8587290a
Throw in a travis config file to try using travis
2011-06-09 15:31:16 -07:00
Ilya Zhitomirskiy
a03423309d
fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
2011-06-09 15:12:35 -07:00
Ilya Zhitomirskiy
b575983c22
WIP certs
2011-06-08 18:46:38 -07:00
Ilya Zhitomirskiy
808754f8bd
added the cert bundle for facebook http things
2011-06-08 18:20:47 -07:00
Raphael Sofaer
6d105e5c09
Don't n query in UsersController#public
2011-06-04 22:34:48 -07:00
Sarah Mei
243699c8e9
Tumblr service swallows exceptions raised by tumblbeasts.
2011-06-04 20:45:09 -07:00
Raphael Sofaer
381b85189d
Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow
2011-06-03 16:22:38 -07:00
danielgrippi
40ab168a5a
DH DG; fix re-liking a post after unliking it
2011-06-03 12:20:59 -07:00
Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Maxwell Salzberg
149c086d5e
make the tumblr posting smarter
2011-06-02 17:02:29 -07:00
MrZYX
668c4ddfc5
d'oh
...
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
2011-06-02 12:32:21 +02:00
Maxwell Salzberg
72c6efe41c
basic specs
2011-06-01 22:38:15 -07:00
Maxwell Salzberg
5cbbdf2949
initial post to tumblr support
2011-06-01 22:30:22 -07:00
Raphael Sofaer
283e376712
Move initialize_signatures method out of user and into relayable
2011-06-01 16:45:30 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Raphael Sofaer
71c3a29aa6
Move YoutubeTitles callback into module
2011-05-31 12:27:57 -07:00
MrZYX
cd887e9373
fixed unlike the right way
2011-05-29 18:15:46 +02:00
MrZYX
7b864dd208
Rails, welcome to 2011. Fyi: string concatenation is bad
2011-05-29 18:14:54 +02:00
MrZYX
d66fc9d99f
fix validation message if text is too long
2011-05-29 16:45:41 +02:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00