Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
bf33313bf9
|
take out index, change backer seed, no puts
|
2010-09-15 17:13:17 -07:00 |
|
Raphael
|
02dda4f0a7
|
change the name of instantiate back
|
2010-09-15 17:08:56 -07:00 |
|
Raphael
|
01d26f6d0e
|
Using custom registrations controller
|
2010-09-15 17:05:21 -07:00 |
|
Raphael
|
e0ffc8bba0
|
First pass at having a custom registrationsController
|
2010-09-15 16:40:03 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Raphael
|
8c8eb02316
|
Reset albumscontroller
|
2010-09-15 10:20:46 -07:00 |
|
Raphael
|
5d303518c2
|
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
|
2010-09-15 10:09:42 -07:00 |
|
maxwell
|
0d37f065dc
|
MS RS fixed a small group adding bug
|
2010-09-14 15:13:55 -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
|
0782e0b199
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 19:54:56 -07:00 |
|
Daniel Vincent Grippi
|
aa5447f553
|
Albums are now created within a context
|
2010-09-13 19:39:51 -07:00 |
|
maxwell
|
15651a7bb6
|
IZ MS group manage page can now add friends to groups
|
2010-09-13 18:10:07 -07:00 |
|
Daniel Vincent Grippi
|
5ecbb28dc7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 17:57:59 -07:00 |
|
Daniel Vincent Grippi
|
c059069144
|
albums don't show publisher, refactored css
|
2010-09-13 17:57:30 -07:00 |
|
Daniel Vincent Grippi
|
b2b60af8aa
|
Albums_by_aspect now takes :all
|
2010-09-13 17:32:29 -07:00 |
|
maxwell
|
650a502404
|
MS IZ removed a bunch of unused request stuff
|
2010-09-13 16:58:23 -07:00 |
|
maxwell
|
3b1223c9dd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:48:50 -07:00 |
|
maxwell
|
6f75a81a9d
|
IZ MS trying again on fixing remote profile images
|
2010-09-13 15:48:30 -07:00 |
|
Daniel Vincent Grippi
|
26e4e088d7
|
flash messages are now being set.
|
2010-09-13 15:44:26 -07:00 |
|
Raphael
|
ff348eb944
|
Add flashes back in to aspect and albums
|
2010-09-13 15:20:57 -07:00 |
|
Daniel Vincent Grippi
|
40ecf176e8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:26:15 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
maxwell
|
24d957cb32
|
MS IZ removed the views and redirected the edit route
|
2010-09-13 12:20:47 -07:00 |
|
Raphael
|
e33d6d8123
|
Don't create 500s on comment posting
|
2010-09-13 11:30:10 -07:00 |
|
Raphael
|
9837340eb2
|
Rename files from group to aspect
|
2010-09-13 10:43:15 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Raphael
|
ebd4bea5de
|
Adding a log statement to zombiefriends
|
2010-09-10 18:57:08 -07:00 |
|
Raphael
|
d9bb850b5b
|
pass group not id into send_friend_request
|
2010-09-10 17:00:27 -07:00 |
|
Raphael
|
17be027738
|
redirect to root instead of search
|
2010-09-10 16:52:28 -07:00 |
|
Raphael
|
b704704334
|
People index now works when there is a non-friend on the page
|
2010-09-10 16:49:09 -07:00 |
|
Raphael
|
c170726f6c
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon
|
2010-09-10 16:04:30 -07:00 |
|
Daniel Vincent Grippi
|
82a31228fa
|
DG IZ; requests bar added to group/edit
|
2010-09-10 15:07:55 -07:00 |
|
Raphael
|
aa1f3c6438
|
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
|
2010-09-10 10:31:23 -07:00 |
|
Raphael
|
86d9a41d25
|
send_friend_request_to now takes a person and group, rather than a receive url and a group id
|
2010-09-09 16:06:42 -07:00 |
|
Raphael
|
d0de8b4988
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon
|
2010-09-09 15:43:20 -07:00 |
|
Raphael
|
3e9a36e1f1
|
Layout false on all publics controller routes
|
2010-09-09 14:15:20 -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 |
|
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 |
|
Raphael
|
5fd1602731
|
Group batch edit is for all groups
|
2010-09-08 10:00:31 -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 |
|
Daniel Vincent Grippi
|
41afd86fe7
|
DG IZ; fixed photos.
|
2010-09-07 12:03:43 -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
|
5e34506df6
|
added custom as_json methods to models
|
2010-08-29 23:46:19 -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 |
|
maxwell
|
34cb15c423
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-27 13:33:39 -07:00 |
|