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 |
|
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 |
|
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 |
|
Don Park
|
2d16289e46
|
use photos_path to generate the correct POST destination for photo uploads
|
2010-09-18 07:50:12 +08: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
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -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 |
|
Jamie Wilkinson
|
eb0f011236
|
Show the signup link
|
2010-09-16 10:07:58 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
d2f5d3c4c1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 17:05:36 -07:00 |
|
Raphael
|
01d26f6d0e
|
Using custom registrations controller
|
2010-09-15 17:05:21 -07:00 |
|
Daniel Vincent Grippi
|
3681ae62c7
|
remove google analytics
|
2010-09-15 16:43:38 -07:00 |
|
Raphael
|
e0ffc8bba0
|
First pass at having a custom registrationsController
|
2010-09-15 16:40:03 -07:00 |
|
maxwell
|
8828707c45
|
MS fixed the login bug, deploying to master
|
2010-09-15 15:15:15 -07:00 |
|
maxwell
|
55c1530c9f
|
MS DG fixing an edit profile bug
|
2010-09-15 14:09:05 -07:00 |
|
maxwell
|
84c60e5f2e
|
DG MS fixing webfinger, i hope to goodness
|
2010-09-15 13:28:06 -07:00 |
|
Daniel Vincent Grippi
|
57bd052c5b
|
user edit bug
|
2010-09-15 12:22:03 -07:00 |
|
Daniel Vincent Grippi
|
deac53f178
|
see yourself in aspect sidebar, because you're going to post to yourself anyway
|
2010-09-15 11:59:39 -07:00 |
|
Daniel Vincent Grippi
|
fe35d60b13
|
hack on aspect nav for ff & chrome compatability
|
2010-09-15 11:44:56 -07:00 |
|
Daniel Vincent Grippi
|
ea3e372474
|
fixed 500 error with @photos
|
2010-09-15 11:24:23 -07:00 |
|
Raphael
|
d9eb3abd9d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 10:59:00 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
a38a354065
|
moving things around for consistency. consistency isn't pretty right now.
|
2010-09-15 10:26:57 -07:00 |
|
Daniel Vincent Grippi
|
73dab4b3ef
|
fixed stream elements
|
2010-09-15 10:17:37 -07:00 |
|
Daniel Vincent Grippi
|
4a86632cf3
|
show default user photos for requests
|
2010-09-14 20:47:21 -07:00 |
|
Daniel Vincent Grippi
|
f2c6e7b820
|
made group manage a little nicer
|
2010-09-14 20:35:30 -07:00 |
|
Daniel Vincent Grippi
|
d0c8f9ccd6
|
silent comments on views
|
2010-09-14 19:54:48 -07:00 |
|
Daniel Vincent Grippi
|
fc3fb817c8
|
profile photo doesn't change to null if not changed on profile update
|
2010-09-14 19:48:11 -07:00 |
|
ilya
|
8aa39c5f08
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 11:58:55 -07:00 |
|
ilya
|
0560b46080
|
MS IZ added friend redirect, and moved the webfinger responces to fixture directory
|
2010-09-14 11:58:40 -07:00 |
|
Daniel Vincent Grippi
|
be7c3f28a9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 11:43:03 -07:00 |
|
Daniel Vincent Grippi
|
71ef54dbcc
|
spelling mistake, broken links on search page
|
2010-09-14 11:42:47 -07:00 |
|
ilya
|
cb12e497f6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 11:14:10 -07:00 |
|
ilya
|
2311c33626
|
MS IZ mocked all the webrequest tests
|
2010-09-14 11:13:58 -07:00 |
|
Daniel Vincent Grippi
|
24cd518f11
|
DG, RS; Album creation no longer ejects you from context
|
2010-09-14 11:00:16 -07:00 |
|
Daniel Vincent Grippi
|
da8ec589b7
|
RS, DG; display the correct tab on manage, change edit to manage
|
2010-09-14 10:05:59 -07:00 |
|
Daniel Vincent Grippi
|
a7c6e22e01
|
DG RS; passing around params[:aspect]. querying in application controller for current aspect.
|
2010-09-14 09:44:09 -07:00 |
|
Daniel Vincent Grippi
|
01b14a66e8
|
fixed photo show header
|
2010-09-13 22:51:51 -07:00 |
|
Daniel Vincent Grippi
|
b49eaa1ceb
|
minor visual tweaks
|
2010-09-13 20:51:27 -07:00 |
|
Daniel Vincent Grippi
|
0782e0b199
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 19:54:56 -07:00 |
|