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

1162 commits

Author SHA1 Message Date
Raphael
3e9a36e1f1 Layout false on all publics controller routes 2010-09-09 14:15:20 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Raphael
240dda4eab Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished 2010-09-09 12:21:36 -07:00
Daniel Vincent Grippi
1c2bfa64a1 cleaned login page resources 2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
bb30b69685 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi
134bdab49d group header now has a page_title field. 2010-09-08 20:52:35 -07:00
maxwell
3cf7938028 MS fixing pagination numbers and couple of other things 2010-09-08 20:51:46 -07:00
maxwell
2ce4fb27fa MS; removing some dumb user stuff 2010-09-08 20:39:05 -07:00
maxwell
c3a1b36282 MS fixing this to be request host on the login page 2010-09-08 19:49:09 -07:00
Daniel Vincent Grippi
7072c633ec Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 19:39:42 -07:00
Raphael
4fd0853e71 Moving to salmon 2010-09-08 18:29:39 -07:00
Raphael
061f9de668 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 17:35:39 -07:00
Raphael
91f2e2e6ae Add public key to webfinger profile 2010-09-08 17:35:18 -07:00
Daniel Vincent Grippi
ca780f3560 DG MS; hide debug info by default. also, made the text lighter. 2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi
1e6b309163 DG MS; tweaking top nav and publisher. 2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi
20d5043e81 DG MS; moved tabs around up top 2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi
f7dd0b10b9 DG MS; changed the gear on top nav to not be a tab 2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
5fd105c1dc DG MS; search now links user names if you're friends with them 2010-09-08 12:04:05 -07:00
Daniel Vincent Grippi
edae8f1e66 DG MS; fixed a view bug in user edit page. page also displays diaspora username . 2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi
36730978ca login page is more elegant 2010-09-08 11:37:54 -07:00
Raphael
d25327d32d Add example to request partial 2010-09-08 11:07:49 -07:00
Raphael
91667c1990 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 10:59:17 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Daniel Vincent Grippi
1749a9c52d no console 2010-09-08 10:51:18 -07:00
Raphael
5fd1602731 Group batch edit is for all groups 2010-09-08 10:00:31 -07:00
maxwell
2b165df85c Merge branch 'master' of github.com:diaspora/diaspora into rails_rc 2010-09-07 18:21:17 -07:00
Daniel Vincent Grippi
20d9334ce1 DG IZ; changed the photo uploader to drag and drop. now works in firefox. 2010-09-07 17:20:48 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -07:00
Daniel Vincent Grippi
41afd86fe7 DG IZ; fixed photos. 2010-09-07 12:03:43 -07:00
maxwell
6c33c2a463 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-07 00:55:02 -07:00
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
maxwell
919d7d23c0 MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays 2010-09-06 17:46:09 +02: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
ilya
1d69b88e2e to id so that change of group works 2010-08-26 12:17:35 -07:00
Raphael
6a48c07c90 Return if nil 2010-08-26 12:10:22 -07:00
Raphael
5a92f9e8a8 Do some logging 2010-08-26 12:07:35 -07:00
Raphael
f3c20bf3c0 accept comments from strangers 2010-08-26 12:01:11 -07:00
Raphael
c7974f8046 Save comment's person in receive 2010-08-26 11:53:32 -07:00
Raphael
c3fe3bf443 RS, IZ, check against self.person, not self in user receive 2010-08-26 11:48:34 -07:00
Raphael
9f11a474d8 Take out some logging, put in log user on receive 2010-08-26 11:46:04 -07:00
Raphael
7feb30e3e1 RS, IZ, try saving the comment 2010-08-26 11:41:16 -07:00
Raphael
958627cc1c RS IZ object.post 2010-08-26 11:32:33 -07:00
Raphael
a65f512fa3 verify post creator signature in receive 2010-08-26 11:29:06 -07:00
Raphael
f186dd98c8 SIGNATOR 2010-08-26 11:13:44 -07:00
Raphael
7911357210 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 11:11:40 -07:00
Raphael
36f265fa2f Log safely 2010-08-26 11:11:30 -07:00
danielvincent
d2b471a58d Merge branch 'master' of github.com:diaspora/diaspora 2010-08-26 11:09:07 -07:00
danielvincent
39551a0162 fixed comments not showing for photos in stream 2010-08-26 11:08:03 -07:00
Raphael
a29a1bec3e Add some logging to comments 2010-08-26 11:07:26 -07:00
Raphael
19e8aa5c35 Refactored view js 2010-08-26 11:06:35 -07:00
maxwell
9b690b863a droping things 2010-08-25 21:53:04 -07:00
Raphael
6d3d37b7c6 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:20:37 -07:00