Daniel Vincent Grippi
|
39c366e2e9
|
group edit button up top.
|
2010-09-06 17:22:57 -07:00 |
|
Daniel Vincent Grippi
|
48415b4de8
|
cleaned up group edit a little
|
2010-09-06 13:01:24 -07:00 |
|
Daniel Vincent Grippi
|
7e909d4034
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 16:38:52 -07:00 |
|
Daniel Vincent Grippi
|
f9c2e0e76d
|
moved publisher down.wn. header is now a dark grey instead of black.
|
2010-08-31 13:07:11 -07:00 |
|
ilya
|
12f7d16c0b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-31 10:48:29 -07:00 |
|
ilya
|
98db03d36e
|
the group edit resets the data started to reset the from id attr
|
2010-08-31 10:46:49 -07:00 |
|
Daniel Vincent Grippi
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -07:00 |
|
Daniel Grippi
|
de8450c7c5
|
line spacing adjustments.
|
2010-08-29 23:04:28 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
5babda044d
|
cleaned up group controller. added custom as_json to group model.
|
2010-08-29 21:56:10 -07:00 |
|
Raphael
|
b85333e52b
|
error.new
|
2010-08-28 18:36:49 -07:00 |
|
Raphael
|
d25e6017e3
|
Make a couple of generic errors ArgumentError
|
2010-08-28 14:53:08 -07:00 |
|
Raphael
|
aa22a0d5c8
|
Removing unused method
|
2010-08-28 14:38:22 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
cf161cb8cf
|
publisher box back up top
|
2010-08-27 16:09:10 -07:00 |
|
maxwell
|
34cb15c423
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-27 13:33:39 -07:00 |
|
maxwell
|
d1bac3e078
|
MS added a log route for easy access
|
2010-08-27 13:33:28 -07:00 |
|
Raphael
|
7b36ae7009
|
Move back link out of big_text
|
2010-08-27 12:28:39 -07:00 |
|
Raphael
|
7223d21721
|
Add singular move friend route, it must be eliminated later
|
2010-08-27 12:27:16 -07:00 |
|
Raphael
|
5ff1bdae90
|
Groups can now be batch edited
|
2010-08-27 12:23:20 -07:00 |
|
Raphael
|
5ef442d93f
|
RS, IZ; Socket spec now more realistic, visible_person_by_id fixed
|
2010-08-27 10:48:14 -07:00 |
|
Raphael
|
f309299e22
|
Take out remove friend button on stranger, there should be an add friend
|
2010-08-27 10:26:03 -07:00 |
|
Raphael
|
e1d6c9ce03
|
fixing person show on stranger
|
2010-08-27 10:24:42 -07:00 |
|
Raphael
|
39380c3c06
|
check if you are friends before displaying group list
|
2010-08-27 10:22:58 -07:00 |
|
Raphael
|
831609ad15
|
Make a stranger that you receive a comment from visible
|
2010-08-27 10:19:10 -07:00 |
|
Raphael
|
c629c23232
|
Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document
|
2010-08-27 10:05:14 -07:00 |
|
Raphael
|
ba4468f9cc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 19:15:42 -07:00 |
|
Raphael
|
2dd2f38442
|
Attempting to make comments from unknown users save
|
2010-08-26 19:15:22 -07:00 |
|
danielvincent
|
390bf24e14
|
Don't try to put yourself in any groups
|
2010-08-26 17:34:06 -07:00 |
|
danielvincent
|
435db1ecb1
|
Pass the right url in websocketed photo json
|
2010-08-26 17:23:23 -07:00 |
|
danielvincent
|
007b4e4ff0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 17:10:37 -07:00 |
|
danielvincent
|
81438678cd
|
Refactored more photo js out to photos.js. That should be it for that refactor
|
2010-08-26 17:10:19 -07:00 |
|
Raphael
|
36342db7a8
|
logging statement in the user receive after parsing the person
|
2010-08-26 17:04:40 -07:00 |
|
danielvincent
|
81edef9b8a
|
Fading out every form tag on photo upload was a bad idea
|
2010-08-26 17:00:45 -07:00 |
|
Raphael
|
977786aa65
|
remove the raise from the top of user receive
|
2010-08-26 16:31:57 -07:00 |
|
Raphael
|
9d48b45ee4
|
merge conflict line
|
2010-08-26 16:28:34 -07:00 |
|
Raphael
|
3ed191e972
|
MS IZ testing on remote
|
2010-08-26 16:27:01 -07:00 |
|
Raphael
|
c3e199a00a
|
Also set object.person
|
2010-08-26 15:36:56 -07:00 |
|
danielvincent
|
dba8e2efe6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:13:48 -07:00 |
|
danielvincent
|
a886b8ddbc
|
made photos for album previews 200x200, small thumbnails now at 50x50
|
2010-08-26 15:13:33 -07:00 |
|
Raphael
|
0e36d89711
|
Also set object.person
|
2010-08-26 15:09:54 -07:00 |
|
Raphael
|
40957b5370
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:06:50 -07:00 |
|
Raphael
|
94bb754c34
|
Changed parseing person from xml a little, using it for comments.
|
2010-08-26 15:06:39 -07:00 |
|
danielvincent
|
1d515e7b7e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 15:02:29 -07:00 |
|
danielvincent
|
239ae048cc
|
group names are now editable
|
2010-08-26 15:02:13 -07:00 |
|
Raphael
|
1ce34bc6fc
|
Parenthases
|
2010-08-26 14:42:16 -07:00 |
|
Raphael
|
73d8317534
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-26 14:38:22 -07:00 |
|
Raphael
|
31f79be068
|
Save the person on receiving a comment
|
2010-08-26 14:38:06 -07:00 |
|
ilya
|
915144e08b
|
size 30 by 30
|
2010-08-26 12:32:14 -07:00 |
|
ilya
|
df74020a16
|
small thumbnail
|
2010-08-26 12:27:10 -07:00 |
|
ilya
|
3554de48d8
|
trying image url
|
2010-08-26 12:24:53 -07:00 |
|