Raphael
|
bd7ce5250f
|
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
|
2010-08-10 17:14:58 -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 |
|
Raphael
|
a48fbaaf59
|
RS, DG; DashboardsController has been eliminated.
|
2010-08-10 11:36:00 -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
|
aebe7b97c0
|
DG RS; added groups. can't delete, but can make new ones
|
2010-08-09 15:58:53 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
614c8c72ba
|
RS, DG; Log files should now rotate
|
2010-08-09 14:27:17 -07:00 |
|
Raphael
|
088da2544b
|
RS, DG; We now delete channels when there is nobody subscribed to them
|
2010-08-09 14:11:46 -07:00 |
|
Raphael
|
33a827c33a
|
RS, DG; Websocket is now working again, users have a channel
|
2010-08-09 13:02:08 -07:00 |
|
Raphael
|
0a40efdaf7
|
Removing unused messages
|
2010-08-09 10:47:45 -07:00 |
|
ilya
|
27b4c19337
|
Getting the deployment changes from master
|
2010-08-08 21:24:34 -07:00 |
|
Raphael
|
8356126f8d
|
Added deploy key
|
2010-08-05 15:44:18 -07:00 |
|
ilya
|
5dfc097c88
|
replaced the functionality with openssl, didn't do the encryption spec
|
2010-08-04 20:32:15 -07:00 |
|
Raphael
|
58addca8dd
|
RS, IZ; extracted and murdered ostatus.
|
2010-08-04 16:00:01 -07:00 |
|
Raphael
|
e3c28c4fee
|
Fixed Photos, and Carrierwave initializer
|
2010-08-02 21:31:14 -07:00 |
|
Raphael
|
6b1f020839
|
Moved utilities out to special controller, took pound sign out of database name
|
2010-08-02 18:03:16 -07:00 |
|
ilya
|
1b32afc78f
|
Switching to Grid_FS, correctly
|
2010-07-23 14:53:12 -07:00 |
|
Raphael
|
84b4d12e18
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-23 11:06:19 -07:00 |
|
Raphael
|
61ffda6bf4
|
re-enabling sprinkle script
|
2010-07-23 11:05:29 -07:00 |
|
ilya
|
8f70fb89c0
|
RS IZ Switching to production
|
2010-07-23 10:41:57 -07:00 |
|
maxwell
|
0fdce91756
|
DG MS added views for ostatus following
|
2010-07-22 21:27:43 -07:00 |
|
ilya
|
e75cb8e8d2
|
Changing back to gridfs
|
2010-07-22 11:47:44 -07:00 |
|
ilya
|
9686aad842
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:26:39 -07:00 |
|
ilya
|
d7e546c3b3
|
RS IZ Vim in sprinkle, not too nice
|
2010-07-21 15:26:08 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
ilya
|
cb67a7fa1b
|
RS IZ sprinkle editing
|
2010-07-21 10:04:55 -07:00 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
Raphael
|
de3a08d031
|
Took out putses
|
2010-07-20 10:23:19 -07:00 |
|
maxwell
|
ec3f6e6765
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-17 19:22:26 -07:00 |
|
Raphael
|
1b2024f5bb
|
Adding imagemagick to sprinkle
|
2010-07-17 18:50:46 -07:00 |
|
maxwell
|
917d58acbb
|
MS found one more duplicate in the Gemfile
|
2010-07-17 14:10:31 -07:00 |
|
ilya
|
5a6fd7c6a0
|
hopefully imagemagic take 2
|
2010-07-16 23:19:33 -07:00 |
|
ilya
|
a34a458ba5
|
hopefully imagemagic will work
|
2010-07-16 23:15:42 -07:00 |
|
maxwell
|
5d0c5dbd86
|
MS kinda hacky webfinger email fix
|
2010-07-16 23:03:59 -07:00 |
|
Raphael
|
bb4d5cad59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 17:26:22 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|
maxwell
|
99f7e938fd
|
made a pubsubhub constant
|
2010-07-16 12:42:36 -07:00 |
|
Raphael
|
9165ac413a
|
image uploading started
|
2010-07-16 12:31:24 -07:00 |
|
Raphael
|
05e6dada58
|
Fixing deploy friending
|
2010-07-16 09:59:06 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
Raphael
|
89cf2db10e
|
fixing db seed
|
2010-07-15 15:47:27 -07:00 |
|
Raphael
|
fd18ac6c4b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-15 13:06:46 -07:00 |
|
maxwell
|
99446d82c4
|
MS IZ more fixes
|
2010-07-15 10:30:51 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
maxwell
|
892eec1959
|
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
|
2010-07-15 09:32:13 -07:00 |
|
Raphael
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|