Commit graph

932 commits

Author SHA1 Message Date
maxwell
58de12df5e DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name) 2010-08-06 16:35:02 -07:00
Raphael
94406a5c27 Sprinkle back in bundle 2010-08-05 15:48:36 -07:00
Raphael
8356126f8d Added deploy key 2010-08-05 15:44:18 -07:00
Raphael
49fabe77d4 Took another hardcoded piece out of deploy.rb 2010-08-05 15:08:44 -07:00
Raphael
bffb63d9f0 IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml 2010-08-05 14:39:48 -07:00
Raphael
124fa7c78a Deploy from master 2010-08-05 11:57:24 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
Raphael
f8e7d3f313 RS, IZ; Rolling back special casing of friend-request 2010-08-05 11:14:40 -07:00
Raphael
2429a1a476 RS, IZ; keys should roxml 2010-08-05 11:13:38 -07:00
Raphael
ebe14b5afd RS, IZ; Not using person in friend request verification 2010-08-05 11:09:36 -07:00
Raphael
15f1527a72 RS, IZ; Adding logging to verify_signature 2010-08-05 10:56:38 -07:00
Raphael
d75c8870dd RS, IZ; Removing gpg infrastructure 2010-08-05 10:46:29 -07:00
Raphael
f487e271c0 RS, IZ; Posts now sign, signatures and keys now serialize 2010-08-05 10:43:02 -07:00
ilya
4a3f6b2986 need to serialize key to bson 2010-08-04 21:08:25 -07:00
ilya
f11e973602 added the inport key thing in user 2010-08-04 20: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
b74438a5dc Made comments a little easier to see, especially on photo show page 2010-08-04 18:12:12 -07:00
Raphael
6832c67a78 RS IZ friend requests are hopefully now signed 2010-08-04 17:20:34 -07:00
Raphael
7676179e54 IZ, RS; now passing correct object to verify_signature 2010-08-04 17:10:38 -07:00
Raphael
5a802299d5 IZ, RS; Retractions should now be signed 2010-08-04 17:06:15 -07:00
Raphael
2388237174 RS, IZ; Replace type_name method with object.class.to_s 2010-08-04 16:36:08 -07:00
Raphael
b8a2e8ecdf RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific 2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c Merging ostatus deletion with selenium start 2010-08-04 16:01:19 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
09958bc207 DG MS; removed delete friend button from current user's show page 2010-08-04 15:43:24 -07:00
danielvincent
7afe8e12a0 DG MS; correctly aligned publisher box submit button 2010-08-04 15:39:19 -07:00
danielvincent
1557e35a39 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 15:36:01 -07:00
ilya
04396db426 Fixed the one selenium test 2010-08-04 15:30:27 -07:00
Raphael
8abdcf292e Hamiltom picture 2010-08-04 15:22:45 -07:00
danielvincent
278189462b fixed ostatus generator references in models 2010-08-04 09:59:15 -07:00
danielvincent
9a134555d7 message handler was calling find_hub instead of hub 2010-08-04 09:49:59 -07:00
danielvincent
4179b94043 cleaned process function in ostatus parser 2010-08-04 01:40:11 -07:00
danielvincent
7142803bf2 Parser author and entry method polish 2010-08-04 01:31:47 -07:00
danielvincent
b7fb844fdf more cleanup on Diaspora::OStatusParser 2010-08-04 00:57:46 -07:00
danielvincent
2938341b54 removed parse_ from every method name in Diaspora::OStatusParser 2010-08-04 00:47:29 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -07:00
Raphael
e3c28c4fee Fixed Photos, and Carrierwave initializer 2010-08-02 21:31:14 -07:00
Raphael
da3bf35d81 Typo in album 2010-08-02 18:30:09 -07:00
Raphael
848acff02a drop the database on purge 2010-08-02 18:08:07 -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
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00
Raphael
9fe37b1d8c RS, IZ; Cleaned up user spec, started to add current_user.post 2010-08-02 16:16:23 -07:00
Raphael
8432db34b3 RS; Fixed profile marshalling spec, now CI should pass! 2010-08-02 12:52:13 -07:00
Raphael
ac45960bbf Fixed album spec, condensed traversing tests to halve the time of the spec (It was reading the photos from disk on every spec) 2010-08-02 12:33:36 -07:00
Raphael
8658276385 Post button back, but needs moving, did latest_message css change in sass 2010-08-02 11:21:48 -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
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -07:00
Raphael
dc1a164b67 Removing unused function 2010-07-30 12:42:39 -07:00