Jamie Wilkinson
|
5d87ca0904
|
Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting
|
2010-09-16 10:07:57 +08:00 |
|
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 |
|
maxwell
|
d1bac3e078
|
MS added a log route for easy access
|
2010-08-27 13:33:28 -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 |
|
danielvincent
|
390bf24e14
|
Don't try to put yourself in any groups
|
2010-08-26 17:34:06 -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
|
9f11a474d8
|
Take out some logging, put in log user on receive
|
2010-08-26 11:46:04 -07:00 |
|
maxwell
|
a26229223c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-25 18:07:49 -07:00 |
|
maxwell
|
b4174c664e
|
you can now reassign a peson's group
|
2010-08-25 18:07:31 -07:00 |
|
maxwell
|
22f63a4c44
|
MS IZ added the move friend method
|
2010-08-25 16:58:07 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -07:00 |
|
maxwell
|
6a613c3304
|
addded the draggable javascript
|
2010-08-25 13:53:53 -07:00 |
|
danielvincent
|
90ce31173a
|
fixed errors on album/photo pages
|
2010-08-25 09:59:18 -07:00 |
|
Raphael
|
f9dd462957
|
Check for current user again
|
2010-08-24 19:32:38 -07:00 |
|
Raphael
|
5ac5f58679
|
Tabs on the top aren't all selected on group select, some other view tweaks
|
2010-08-24 19:22:43 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
ilya
|
385472351d
|
not going through user.post
|
2010-08-24 16:25:12 -07:00 |
|
ilya
|
0f04cad670
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 16:05:43 -07:00 |
|
ilya
|
f5ae090e9b
|
posting empty albums to people
|
2010-08-24 16:05:29 -07:00 |
|
Raphael
|
de3044fa0a
|
Remove publisher selection remnants, fix posting
|
2010-08-24 15:55:35 -07:00 |
|
maxwell
|
ec3d902c36
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 15:48:02 -07:00 |
|
maxwell
|
204c910f66
|
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
|
2010-08-24 15:47:44 -07:00 |
|
ilya
|
f3f2eb5abf
|
Made it green now making it clean
|
2010-08-24 15:43:53 -07:00 |
|
ilya
|
82d140aa80
|
trying to redeploy to get photos working
|
2010-08-24 15:23:58 -07:00 |
|
ilya
|
19e2c8f898
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:48:41 -07:00 |
|
ilya
|
17080730f8
|
opening the file in the set photo
|
2010-08-24 14:48:26 -07:00 |
|
Raphael
|
03abd1ac21
|
Remove statuS MESsages new page. TaKE New OUt OF ROutes
|
2010-08-24 14:44:32 -07:00 |
|
Raphael
|
ef9cf8fc52
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:41:04 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
ilya
|
27de7f930a
|
forgot the backer number set photo
|
2010-08-24 14:29:05 -07:00 |
|
ilya
|
d92ae1c871
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:22:47 -07:00 |
|
ilya
|
a70132fcdc
|
IZ we update profile in zombie friends accept
|
2010-08-24 14:22:21 -07:00 |
|
maxwell
|
b4ab91043a
|
MS added check for current user
|
2010-08-24 13:45:38 -07:00 |
|
Raphael
|
ebfe77fc6d
|
Making warzombie work again
|
2010-08-24 12:17:06 -07:00 |
|
Raphael
|
d1c540439e
|
Moved friending out to a lib file, specs all pass
|
2010-08-24 12:13:10 -07:00 |
|
Raphael
|
fb33d955c9
|
Fix group show controller/view and haml error in nav
|
2010-08-24 11:11:25 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -07:00 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
Raphael
|
ab4ad249df
|
Forgot to return in that rescue
|
2010-08-23 17:09:20 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
Raphael
|
0cff5a45a2
|
Deleting gridfs controller
|
2010-08-23 15:02:28 -07:00 |
|
Raphael
|
76f2aa98ac
|
Push to multiple groups
|
2010-08-23 14:45:13 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
Raphael
|
dc1dd07720
|
Don't crash on requesting a non-existent email address
|
2010-08-23 11:04:57 -07:00 |
|
maxwell
|
361adda6cd
|
added group picker. sends the right params, but posts only have one group right now so thats a bummer
|
2010-08-22 22:20:34 -07:00 |
|
maxwell
|
35f6856380
|
MS search and index works
|
2010-08-19 12:40:50 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
maxwell
|
c98c52ad14
|
MS IZ renamed the array
|
2010-08-19 12:17:29 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
maxwell
|
5d25861dc6
|
IZ MS person profile page now displays only posts a user can see
|
2010-08-19 10:46:47 -07:00 |
|
maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
ilya
|
516a667ce4
|
going back to showing the first group on the index page
|
2010-08-18 16:35:11 -07:00 |
|
ilya
|
5de9362933
|
DG IZ setting group id to nil and changing the deploy script for renaming of the repo
|
2010-08-18 16:27:08 -07:00 |
|
Raphael
|
a52077b176
|
Redirect to the group you put someone in after adding them as friends
|
2010-08-18 14:57:53 -07:00 |
|
ilya
|
034755368b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-18 12:17:23 -07:00 |
|
Raphael
|
b7d648e173
|
Validate presence of name on group
|
2010-08-18 11:54:44 -07:00 |
|
Raphael
|
4cd46abaac
|
render nothing at the top
|
2010-08-18 11:48:32 -07:00 |
|
Raphael
|
10aef7a0a3
|
Begin rescue on publics controller to make the post for nonexistent user error more readable
|
2010-08-18 11:46:28 -07:00 |
|
ilya
|
b0088c73d8
|
DG IZ; user's own post gets referenced in group model
|
2010-08-18 10:37:33 -07:00 |
|
danielvincent
|
2409fd3f20
|
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
|
2010-08-18 02:40:53 -07:00 |
|
Raphael
|
539316a235
|
Removing posts relation from person
|
2010-08-17 23:50:07 -07:00 |
|
ilya
|
c501707f80
|
DG IZ posts_for to visible posts
|
2010-08-17 23:24:42 -07:00 |
|
Raphael
|
82f53663ab
|
remove user index
|
2010-08-17 20:39:05 -07:00 |
|
Raphael
|
20bc88c0bf
|
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
|
2010-08-17 20:19:29 -07:00 |
|
Raphael
|
48756e77f3
|
Friend_by_id changed to visible_person_by_id
|
2010-08-17 19:32:42 -07:00 |
|
Raphael
|
86afa7a987
|
Remove bookmarks and blogs
|
2010-08-17 18:56:42 -07:00 |
|
ilya
|
7d68089c8b
|
DG IZ using group_id when passing the id around the app
|
2010-08-17 16:02:12 -07:00 |
|
ilya
|
87bc9dad1d
|
DG IZ added group id to the action hash
|
2010-08-17 15:27:12 -07:00 |
|
ilya
|
2a90e59f1e
|
DG IZ the group should view the posts for the group (and yourself) w
|
2010-08-17 12:22:14 -07:00 |
|
ilya
|
5dff3369ad
|
DG IZ; removed puts statements.
|
2010-08-17 10:48:40 -07:00 |
|
Raphael
|
e32315b6c6
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:25:11 -07:00 |
|
Raphael
|
2c1c5df281
|
Moved search specs, renamed method
|
2010-08-17 10:24:59 -07:00 |
|
ilya
|
fc7f59bdfc
|
DG IZ stream for the current user's posts
|
2010-08-17 10:13:23 -07:00 |
|
Raphael
|
3a591b0713
|
Merging in friend-refactor...
|
2010-08-16 15:35:14 -07:00 |
|
ilya
|
16a4cbc4e2
|
DG IZ redirect to requests on error
|
2010-08-16 15:21:45 -07:00 |
|
Raphael
|
6bb8c52dc4
|
Syntax error in requests
|
2010-08-16 15:16:29 -07:00 |
|
ilya
|
33ed838b79
|
DG IZ added an error message on request delete
|
2010-08-16 15:08:05 -07:00 |
|
ilya
|
373321beef
|
DG IZ made the selector box going to the right thing by passing only the id
|
2010-08-16 14:52:59 -07:00 |
|
ilya
|
97e5468cea
|
adding the user to the correct group
|
2010-08-16 14:46:15 -07:00 |
|
ilya
|
6a3eb97fd4
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 14:43:13 -07:00 |
|
Raphael
|
e2d5bf909f
|
Call right method in dev_utilities, clear junk out of comments helper
|
2010-08-16 12:45:31 -07:00 |
|
Raphael
|
d7a9c3c087
|
Take out another couple friends.first and replace with friend_by_id
|
2010-08-16 12:18:36 -07:00 |
|
Raphael
|
4f22222b30
|
Splitting accept_friend_request into two methods
|
2010-08-16 12:10:23 -07:00 |
|
ilya
|
122da43058
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into selector
|
2010-08-16 11:50:04 -07:00 |
|
ilya
|
0ee03afe1d
|
DG IZ selector box on request page
|
2010-08-16 11:39:33 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
6ae4c31e05
|
Person show should be scoped through user
|
2010-08-16 11:18:52 -07:00 |
|
Raphael
|
3efa36587a
|
Took out a bunch of user.owner references
|
2010-08-16 11:01:58 -07:00 |
|
danielvincent
|
18cd4b858a
|
broke out group index and show
|
2010-08-14 00:27:43 -07:00 |
|
ilya
|
ac40f7974e
|
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
|
2010-08-13 18:37:09 -07:00 |
|
ilya
|
c1d2f271d9
|
RS, IZ; close the file after writing the backer number
|
2010-08-13 12:43:27 -07:00 |
|
ilya
|
7e377fc292
|
RS, IZ; adding set backer number to routes, not authenticating it
|
2010-08-13 12:37:49 -07:00 |
|
ilya
|
23c57c653f
|
RS, IZ; Trying to speed up cap db reset
|
2010-08-13 12:34:24 -07:00 |
|
ilya
|
5c9a96d245
|
That last commit was dumb, including the right module
|
2010-08-13 12:11:10 -07:00 |
|
ilya
|
0b23b959b4
|
Adding parser methods to devutilities, these should probably be in controller helpers
|
2010-08-13 12:06:29 -07:00 |
|
ilya
|
99eec04265
|
Using webfinger in dev_utilities
|
2010-08-13 11:59:54 -07:00 |
|