Arnaud Delcasse
|
eeb132d825
|
Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results.
|
2010-09-21 03:20:06 +08:00 |
|
danielvincent
|
b097f93bf5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 11:39:17 -07:00 |
|
maxwell
|
5d1fdcaf3a
|
MS fixing bug #67. stripping whitespace from search
|
2010-09-20 11:38:24 -07:00 |
|
danielvincent
|
fe306b37ab
|
DG IZ; mass-assignment quick-fix in controllers
|
2010-09-20 11:30:27 -07:00 |
|
maxwell
|
64d371d9d6
|
MS added a warning for account
|
2010-09-20 11:30:08 -07:00 |
|
Ariel Zavala
|
db7ad16503
|
Added localization to comments views
|
2010-09-21 02:03:51 +08:00 |
|
Ariel Zavala
|
6501974f30
|
added more translations missing on views
|
2010-09-21 01:43:54 +08:00 |
|
TJ Peden
|
e6c8cf20d3
|
Fixed receive_url problem
|
2010-09-21 01:26:51 +08:00 |
|
maxwell
|
5bf6d358a4
|
MS added small log for when user is found from webfinger
|
2010-09-19 20:40:03 -07:00 |
|
maxwell
|
07d2de6646
|
removed an annoying log of encrypted salmon.
|
2010-09-19 20:36:39 -07:00 |
|
danielvincent
|
14ad24ba7e
|
visual tweaks on header. moved upload a file button to header on album#show
|
2010-09-19 14:27:20 -07:00 |
|
danielvincent
|
b40b81e447
|
aspect manage tab now reads 'manage aspects'
|
2010-09-19 10:11:41 -07:00 |
|
danielvincent
|
cc4e9f8d39
|
description text for all boxes in manage page. search box text defaults to query on people#index.
|
2010-09-18 17:56:26 -07:00 |
|
danielvincent
|
b5a2971302
|
search results for people now look like the stream
|
2010-09-18 17:49:52 -07:00 |
|
danielvincent
|
08f833ba7a
|
case insensitivity on search
|
2010-09-18 17:21:18 -07:00 |
|
danielvincent
|
e9a3f46fbd
|
fixed query function to go through mongomapper instead of custom
|
2010-09-18 16:42:07 -07:00 |
|
Don Park
|
2d16289e46
|
use photos_path to generate the correct POST destination for photo uploads
|
2010-09-18 07:50:12 +08:00 |
|
Patrick Aljord
|
182c6228f3
|
show comments ordered by created_at, they are showing up at random order without that
|
2010-09-18 07:36:21 +08:00 |
|
Raphael
|
84789f64c9
|
scope album queries through user
|
2010-09-17 14:57:14 -07:00 |
|
Raphael
|
b3549c79f4
|
Give slightly more specific error message
|
2010-09-17 12:49:49 -07:00 |
|
Raphael
|
ce2260b747
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-17 11:57:36 -07:00 |
|
Raphael
|
5df33a6fd0
|
Take out users/show, use current_user in update
|
2010-09-17 10:50:18 -07:00 |
|
Raphael
|
be26794e4a
|
only write to your own profile
|
2010-09-17 10:46:14 -07:00 |
|
Raphael
|
99ad001d28
|
Fix websocket spec, take out puts in by_webfinger
|
2010-09-17 09:52:31 -07:00 |
|
Raphael
|
2e8ecceaf7
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 21:53:34 -07:00 |
|
Raphael
|
b45906f902
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 21:35:48 -07:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
maxwell
|
e668071ea5
|
README.md
|
2010-09-16 18:48:18 -07:00 |
|
danielvincent
|
95a4120e57
|
DG IZ; dropzones on left back on aspect manage page.
|
2010-09-16 17:22:42 -07:00 |
|
danielvincent
|
ae83dae1ca
|
added git info (branch,date,author) to debug partial
|
2010-09-16 17:03:14 -07:00 |
|
danielvincent
|
25b4b409be
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 16:19:48 -07:00 |
|
danielvincent
|
cbb692b6a3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 16:06:28 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
maxwell
|
e7afebece8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 15:07:02 -07:00 |
|
maxwell
|
2e8785b596
|
applying this change from wiki, thanks astronouth7303
|
2010-09-16 15:04:29 -07:00 |
|
Raphael
|
0eb2c97aef
|
object_path shouldn't create links to users
|
2010-09-16 14:51:27 -07:00 |
|
maxwell
|
b155d07abd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 14:38:32 -07:00 |
|
maxwell
|
6f867d60c4
|
MS fixed the nil hostname on user
|
2010-09-16 14:38:24 -07:00 |
|
Raphael
|
d8460ed37b
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 14:21:51 -07:00 |
|
Raphael
|
feb4cbfd29
|
Merge branch 'master' of http://github.com/fbrubacher/diaspora
|
2010-09-16 12:14:11 -07:00 |
|
Michael Nutt
|
cd9639cf29
|
websocket js should honor app socket port configuration
|
2010-09-17 03:11:11 +08:00 |
|
maxwell
|
649839567d
|
MS added pagination to the search page
|
2010-09-16 11:47:34 -07:00 |
|
Daniel Vincent Grippi
|
07a8fa8bb6
|
fixed xss bug in comment view partial.
|
2010-09-16 08:32:19 -07:00 |
|
Federico Brubacher
|
05808456d8
|
fixed small issue in albums#update anad added corressponding controller test
|
2010-09-16 12:21:08 -03:00 |
|
Raphael
|
1e646fb0a9
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 23:54:57 -07:00 |
|
Raphael
|
32fc6212ab
|
Put only the hostname in diaspora_handle
|
2010-09-15 23:49:55 -07:00 |
|
Raphael
|
d124686723
|
Need more stack traces!
|
2010-09-15 23:22:02 -07:00 |
|
Raphael
|
d760725145
|
Don't webfinger another server on receiving a webfinger request
|
2010-09-15 23:01:13 -07:00 |
|
Raphael
|
c67a8ea100
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
|
2010-09-15 22:37:05 -07:00 |
|
Stephen Caudill
|
5595dc5f48
|
Retab the project
|
2010-09-16 13:16:10 +08:00 |
|