Ariel Zavala
|
0014024870
|
Added I18n translations to helpers
|
2010-09-17 15:26:31 -04:00 |
|
danielvincent
|
cbb692b6a3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 16:06:28 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
Raphael
|
0eb2c97aef
|
object_path shouldn't create links to users
|
2010-09-16 14:51:27 -07:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -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
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -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
|
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
|
00f8a3e628
|
removed ensure_bson in user. added to_id method to String and ObjectID classes
|
2010-08-25 17:11:57 -07:00 |
|
Raphael
|
55c94c385c
|
fixed photos going through the websocket. added a spec to SocketsController
|
2010-08-25 16:08:44 -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
|
5779610659
|
messed with the views
|
2010-08-24 18:31:16 -07:00 |
|
Raphael
|
1faaf1dd81
|
Fix profile pic getting unset on profile update
|
2010-08-24 17:43:11 -07:00 |
|
Raphael
|
c102e81b03
|
put the visible back in
|
2010-08-24 16:56: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 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
danielvincent
|
37a67b29a4
|
left/right arrow keys on photo show page go to prev/next
|
2010-08-23 11:22:55 -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 |
|
ilya
|
643c52fd62
|
making a clear text on the user index page
|
2010-08-19 18:10:55 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -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 |
|
ilya
|
284601c6b1
|
got moved photo.image.stuff to photo.url[:stuff]
|
2010-08-18 20:59:01 -07:00 |
|
ilya
|
3243435015
|
the album create doesn't crash the app
|
2010-08-18 20:14:31 -07:00 |
|
ilya
|
4019e4425a
|
Checking for failing to set url in photo
|
2010-08-18 17:12:28 -07:00 |
|
ilya
|
daf08cd9f9
|
DG IZ posts by the user get websocketed on the group page and albums
get signed?
|
2010-08-17 18:06:35 -07:00 |
|
ilya
|
f15b3c46b2
|
DG IZ; reverted to before removing latest message methods
|
2010-08-17 17:40:48 -07:00 |
|
ilya
|
e5036862f6
|
DG IZ removed the latest message javascript as well as the hash
|
2010-08-17 16:49:58 -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
|
7316c6073c
|
DG IZ local person bug
|
2010-08-17 10:58:50 -07:00 |
|
Raphael
|
72559cbce1
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-17 10:37:18 -07:00 |
|
Raphael
|
50919ef491
|
Requesting now searches the local server by email for a matching person.
|
2010-08-17 10:37:09 -07:00 |
|
ilya
|
dea6551374
|
DG IZ; moved post() into User from Person.
|
2010-08-17 10:35:25 -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
|
b37b8303d3
|
Check for friending yourself in requests helper
|
2010-08-16 11:55:32 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
3efa36587a
|
Took out a bunch of user.owner references
|
2010-08-16 11:01:58 -07:00 |
|
Raphael
|
a9ebe44b1d
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-10 16:03:54 -07:00 |
|
Raphael
|
a8b77cf868
|
DG RS; made an instantiate method for user which makes a person and profile
|
2010-08-10 15:35:27 -07:00 |
|
maxwell
|
016c8fa471
|
MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up
|
2010-08-10 14:11:41 -07:00 |
|
maxwell
|
0ffe893f8a
|
MS IZ merging diffs
|
2010-08-10 12:37:04 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
Raphael
|
9947a2abb8
|
RS, DG; latest_status thing now works, started putting signup back in
|
2010-08-10 12:26:43 -07:00 |
|
danielvincent
|
36adf1b6fd
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 21:10:31 -07:00 |
|
danielvincent
|
fd8d92a095
|
moved next/prev links in photo show to be inline with full size link.
|
2010-08-09 20:23:01 -07:00 |
|
maxwell
|
68c4de6c16
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-09 19:05:12 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
838fec4921
|
RS, DG; Working on group nav, fixed some stuff in photo
|
2010-08-09 16:34:06 -07:00 |
|
Raphael
|
59147eb232
|
Person.new in dev seed
|
2010-08-09 13:03:27 -07:00 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
maxwell
|
7be374ac48
|
MS IZ fixed a couple of view things as well as the dev db seed script
|
2010-08-09 10:10:41 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|
Raphael
|
d130b82e42
|
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
|
2010-08-06 11:52:33 -07:00 |
|
maxwell
|
5d924dadf4
|
MS DG; 19 failing specs left
|
2010-08-05 17:16:51 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
Raphael
|
d503c6541f
|
RS; posted statuses now use the websocket to update latest, time is now styled right
|
2010-08-02 11:13:21 -07:00 |
|
Raphael
|
c95ceecf9e
|
Clarified socket helper, added a selenium test
|
2010-07-30 12:40:02 -07:00 |
|
ilya
|
3eeb81ad34
|
DG IZ; time_created_at uses published_at instead of created_at for OstatusPost
|
2010-07-29 20:43:03 -07:00 |
|
ilya
|
f6495e2bec
|
RS IZ photos now fade in on the album upload page
|
2010-07-29 17:26:05 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -07:00 |
|
ilya
|
03cf61bd7c
|
new user top bar
|
2010-07-28 17:04:56 -07:00 |
|
ilya
|
9e3c6a0936
|
DG IZ; brushed up ostatus user page
|
2010-07-28 12:13:36 -07:00 |
|
maxwell
|
bdca2348a6
|
MS IZ profile page has more useful info, but ultimatly kinda ugly
|
2010-07-27 14:23:31 -07:00 |
|
danielvincent
|
ec59b89e83
|
DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page
|
2010-07-26 16:57:44 -07:00 |
|
maxwell
|
47f5c77e1a
|
kinda prettied up the albums page
|
2010-07-26 15:09:02 -07:00 |
|
Maxwell Salzberg
|
66f66b85a6
|
MS added test, things still seem broken though
|
2010-07-24 23:21:02 -07:00 |
|
danielvincent
|
03e06cb279
|
person sidebar has a view all; displays user images with names in tooltips instead of text
|
2010-07-24 10:24:43 -07:00 |
|
maxwell
|
9095a06738
|
MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok
|
2010-07-24 01:56:07 -07:00 |
|
danielvincent
|
e5d298040d
|
little things
|
2010-07-23 21:11:21 -07:00 |
|
ilya
|
283bbc4850
|
Switching to Grid_FS
|
2010-07-23 14:32:55 -07:00 |
|
Raphael
|
d8ebbf8d26
|
Adding some logging to requesting/subscribing
|
2010-07-23 14:20:02 -07:00 |
|
maxwell
|
e0baf9d6c5
|
MS sort the updates on a author's page
|
2010-07-22 23:36:37 -07:00 |
|
maxwell
|
7ba85e0d4e
|
MS tantek?
|
2010-07-22 22:22:08 -07:00 |
|
maxwell
|
8c50ea0c97
|
MS i really wanna subscribe to tantek
|
2010-07-22 22:14:06 -07:00 |
|
maxwell
|
0fdce91756
|
DG MS added views for ostatus following
|
2010-07-22 21:27:43 -07:00 |
|
maxwell
|
6869384732
|
i think it works - max
|
2010-07-21 21:15:16 -07:00 |
|
maxwell
|
21bd875a3f
|
MS DG request bar fix, and some other small tweaks
|
2010-07-21 16:38:33 -07:00 |
|
maxwell
|
6f7f82e818
|
added helpers for photo show page
|
2010-07-21 15:47:30 -07:00 |
|
maxwell
|
0f407b11ed
|
MS DG comments now work on photo show page; full size photos now available
|
2010-07-21 14:58:06 -07:00 |
|
maxwell
|
933bf61db8
|
RS, MS, relationship_flow returns the action and the url to execute it to
|
2010-07-20 16:15:36 -07:00 |
|
maxwell
|
5d0c5dbd86
|
MS kinda hacky webfinger email fix
|
2010-07-16 23:03:59 -07:00 |
|
danielvincent
|
180138610c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 23:02:31 -07:00 |
|
danielvincent
|
04eb66b2e6
|
user has a image url field for user picture
|
2010-07-16 23:02:24 -07:00 |
|
maxwell
|
cd31d11aca
|
MS IZ adding a friend through the webfinger profile
|
2010-07-16 22:11:55 -07:00 |
|
maxwell
|
f34e033bce
|
MS IZ getting the profile
|
2010-07-16 21:59:40 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07:00 |
|
maxwell
|
6293f9f585
|
socket is now a controller
|
2010-07-08 10:17:41 -07:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
maxwell
|
947f1a60e7
|
RS MS added url for for the socket controller
|
2010-07-07 18:59:32 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
cc603a7943
|
autotest for rafi
|
2010-07-07 15:27:44 -07:00 |
|
danielvincent
|
c27bc09e75
|
fixed user image bug
|
2010-07-01 16:35:44 -07:00 |
|
danielvincent
|
c0a744b2ce
|
owner picture selector in application helper
|
2010-07-01 15:34:35 -07:00 |
|
maxwell
|
fcbe8e42a0
|
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
|
2010-06-29 20:54:53 -07:00 |
|
maxwell
|
36b5a90d34
|
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
|
2010-06-28 17:35:38 -07:00 |
|
ilya
|
25198a7e86
|
IZ, RS; Moved XML parser to lib
|
2010-06-28 15:56:46 -04:00 |
|
Maxwell Salzberg
|
2bbfcb0bb1
|
putting debug in for master so I can check deployed servers out
|
2010-06-26 14:16:19 -07:00 |
|
maxwell
|
6467f943da
|
MS^2 Comments serialize and deserialize properly
|
2010-06-25 22:49:53 -07:00 |
|
maxwell
|
e4e2d52bcb
|
reverting typos
|
2010-06-25 22:29:36 -07:00 |
|
maxwell
|
0d700046c4
|
MS^2 Object parser can handle comments
|
2010-06-25 22:29:08 -07:00 |
|
maxwell
|
ec01e2c016
|
Comments now working, but no AJAX, need to refresh to see them
|
2010-06-25 22:15:41 -07:00 |
|
maxwell
|
64c1d99b8c
|
MS found the stupid nil. from here, i have 33 failures.
|
2010-06-24 22:20:09 -07:00 |
|
ilya
|
81157190ac
|
RS, IZ, Merged from master
|
2010-06-23 20:19:25 -04:00 |
|
ilya
|
8829714e2d
|
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
|
2010-06-23 20:17:44 -04:00 |
|
maxwell
|
9fa26f020e
|
DG MS; clicking on a person's name redirects to that person's post stream
|
2010-06-23 14:32:51 -07:00 |
|
maxwell
|
663b99924f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-23 01:26:06 -07:00 |
|
maxwell
|
60fa7e3ac4
|
view stuffs
|
2010-06-23 01:26:00 -07:00 |
|
Maxwell Salzberg
|
e6e1c22b07
|
DG; webhooks apply incoming posts to current friends with a silent fail on no match
|
2010-06-23 01:20:56 -07:00 |
|
maxwell
|
3064d208eb
|
added firefox websocket stuffs, only loads if it is not safari or chrome
|
2010-06-22 14:31:16 -07:00 |
|
maxwell
|
f696ffc3a6
|
fixed up some views, but some stuff feels like it broke
|
2010-06-21 16:46:19 -07:00 |
|
maxwell
|
a0417d13af
|
fixed merge with master
|
2010-06-21 14:38:38 -07:00 |
|
danielvincent
|
06271d5821
|
added dumb partial switcher function in dashboard controller
|
2010-06-21 14:23:59 -07:00 |
|
maxwell
|
655dd64a54
|
websockets work
|
2010-06-21 14:12:05 -07:00 |
|
maxwell
|
5286b6be69
|
DG MS; require XML root node; added header to XML (not yet required)
|
2010-06-18 18:03:13 -07:00 |
|
maxwell
|
34df8fa946
|
DG MS; resolved unknown types going to receive handler. only post objects are inputted
|
2010-06-18 16:47:34 -07:00 |
|
maxwell
|
c430aaff18
|
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
|
2010-06-18 14:35:51 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
Raphael Sofaer
|
ed26c82be4
|
RS, IZ; merged day's commits
|
2010-06-15 21:41:39 -07:00 |
|
maxwell
|
9e89b2e0a7
|
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
|
2010-06-15 21:08:29 -07:00 |
|
Raphael Sofaer
|
c4b931c309
|
IZ RS getting remote messages (not yet done)
|
2010-06-15 18:41:54 -07:00 |
|
danielvincent
|
45c926f790
|
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
|
2010-06-15 11:09:47 -07:00 |
|
danielvincent
|
d70cf5b7a7
|
DG RS; fixed newest messages bug in view. moved to helper.
|
2010-06-15 10:11:28 -07:00 |
|
maxwell
|
1a1887f77f
|
DG MS completed bookmark story
|
2010-06-14 20:20:19 -07:00 |
|
maxwell
|
960db53b9b
|
MS IZ DG completed crud for friend
|
2010-06-14 13:12:17 -07:00 |
|
maxwell
|
85e6eb2132
|
added stray local files
|
2010-06-13 21:22:52 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|