zhitomirskiyi
249b62445f
added the files
2011-01-06 16:51:34 -08:00
Raphael
e46b3e6cf3
Import raw services, I think we need to change the name of the type field (is it supposed to be in provider?) other than that, only posts remain.
2011-01-06 16:23:18 -08:00
zhitomirskiyi
0c8e6b0ba1
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-06 15:56:20 -08:00
zhitomirskiyi
3fae950905
also commented notification and sending ids into resque so that it works
2011-01-06 15:56:03 -08:00
Raphael
283a5501be
Boolean values aren't importing; we may need SET statements for them
2011-01-06 14:58:42 -08:00
Raphael
7c4d35cf28
raw import of notifications, failing to pull in unread
2011-01-06 14:37:59 -08:00
Raphael
564dd993b7
raw import of Invitation
2011-01-06 14:30:38 -08:00
Raphael
a1419b9dc0
Person#owner_mongo_id should be null if the csv has an empty string
2011-01-06 14:16:51 -08:00
maxwell
5818227904
adding job for posting to services
2011-01-06 13:13:09 -08:00
maxwell
27d8cc8003
added sync pubsubhubbub publisher client. we now should not longer require eventmachine, (in the server process, the websocket still requires it). this should also be in a job
2011-01-05 19:02:43 -08:00
maxwell
8b3a193156
added copyright notice to jobs
2011-01-05 18:52:43 -08:00
maxwell
beaeac2d42
comment out debug
2011-01-05 17:52:21 -08:00
maxwell
a7d651236f
make the postman work across everything. remove lots of now useless methods
2011-01-05 17:44:08 -08:00
maxwell
5e58eba240
new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times
2011-01-05 17:43:25 -08:00
maxwell
7ea6b4dd8d
more cleanup
2011-01-05 17:43:25 -08:00
maxwell
8819d288c4
i am greeen
2011-01-05 17:43:25 -08:00
maxwell
3fe30cde12
removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out
2011-01-05 17:43:25 -08:00
Raphael
ff1cad6e63
raw import for requests
2011-01-05 17:38:00 -08:00
Raphael
0d80ded2d3
Raw import for post_visibilities
2011-01-05 17:25:11 -08:00
zhitomirskiyi
ce470e74ee
notification calls email notification
2011-01-05 17:21:55 -08:00
Raphael
b34acfd4eb
Add contact raw import, fixtures have no comments
2011-01-05 16:40:16 -08:00
Raphael
e4ef2641f8
raw import of aspects and aspect memberships
2011-01-05 15:40:04 -08:00
zhitomirskiyi
82852db5ec
added the files this time
2011-01-05 15:04:28 -08:00
Sarah Mei
7f86a9e1ba
ImportToMysql now loads users.csv. Spec currently failing on datetime conversion.
2011-01-04 22:43:32 -08:00
Raphael
06d7ddbe0d
Hopefully get rid of some problems with deleted accounts moving forward
2011-01-04 15:36:42 -08:00
Raphael
16d7ccdf0b
fix youtube title stting
2011-01-04 11:48:02 -08:00
zhitomirskiyi
bd05e97c29
requiring the websocket lib file
2010-12-28 19:53:45 -08:00
Raphael
4fec1bf717
1 failure left in mysql specs
2010-12-28 11:38:26 -08:00
zhitomirskiyi
11153cf2ca
a couple more passing specs
2010-12-27 22:23:41 -08:00
Raphael
3d7d8b51d2
Add a spec to user, fix a cucumber step for mysql
2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831
Fix a couple more specs in mysql
2010-12-26 20:52:15 -08:00
Raphael
a6dcaa2327
Photo specs passing, 9 failures left in mysql
2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a
14 failures after updating mysql branch to master
2010-12-26 17:25:07 -08:00
Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
danielvincent
4ff9622bfc
notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.
2010-12-25 16:07:31 -05:00
Michael Sofaer and Raphael Sofaer
30d60021f4
11 Controller specs remain in mysql. ALMOST DONE
2010-12-24 14:12:55 -08:00
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -08:00
Michael Sofaer and Raphael Sofaer
82b226712f
Posting spec green
2010-12-24 09:58:11 -08:00
Michael Sofaer and Raphael Sofaer
426651d827
Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see
2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01
Fix retraction related failures in mysql
2010-12-23 23:04:04 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342
Status message spec now passes
2010-12-23 12:56:49 -08:00
Sarah Mei
2b7eeffd5b
Fix searching in mysql. It now does one query for all tokens. And person_spec is green!
2010-12-22 22:24:04 -08:00
Raphael
924bcca0e2
Isolated problem in status message marshalling, mysql
2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04
33 failures left in mysql
2010-12-22 16:37:41 -08:00
Raphael
55492535c6
Fix some more specs, aspects controller is green in mysql
2010-12-22 14:15:45 -08:00
Raphael
baf0533466
logical failures on person spec, 25 failing model specs
2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58
58 failures with mysql
2010-12-21 17:14:52 -08:00
Raphael
319452537e
Below 70 failures, GUIDs are next
2010-12-21 15:46:15 -08:00
Raphael
659dfd36ed
Querying spec passes, 63 model spec failures
2010-12-20 18:49:07 -08:00
Raphael
f043c9cc7e
Took MongoMapper out of the bundle, trying to fix querying.
2010-12-20 16:53:56 -08:00
Raphael
dcf630fd9a
Request spec passes, no more scope on requests
2010-12-20 13:59:46 -08:00
Raphael
4c47d8334c
Add PostVisibility model, some more specs working
2010-12-20 13:23:05 -08:00
maxwell
e0883fb176
remove object_id for notifications thx sarahmei for pointing out my evil ways
2010-12-20 12:06:50 -08:00
Sarah Mei
c1bfbd358e
Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know.
2010-12-20 02:50:38 -08:00
Raphael
d44e76a6aa
Down to 250 failures in mysql
2010-12-20 00:36:48 -08:00
zhitomirskiyi
e3f7bd319b
25 more passing tests
2010-12-19 21:41:46 -08:00
Raphael
51083e9659
Another 50 passes in mysql
2010-12-19 13:57:46 -08:00
Raphael
0c67e271df
Services are in mysql, contact_for and add_contact_to_aspect work again
2010-12-19 13:11:41 -08:00
Raphael
232de40457
Only service hasn't been migrated, there are a good 100 passing examples in mysql
2010-12-19 12:27:32 -08:00
danielvincent
bb0375d2f8
uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages.
2010-12-18 22:40:42 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60
WIP moving to mysql
2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff
post_spec now passes with mysql
2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d
profile_spec is passing with mysql... baby steps.
2010-12-18 18:45:55 -08:00
maxwell
427cf18324
fix birthday spec
2010-12-17 19:41:42 -08:00
maxwell
b3c63a3cc0
you can now unset the year of your birthday"
2010-12-17 18:05:13 -08:00
maxwell
c749d81fe9
putting a link to notifications, make them unread in the controller when you view the index
2010-12-17 17:06:48 -08:00
maxwell
5763b441be
fixing order of Notification.for
2010-12-17 11:37:33 -08:00
danielvincent
bc9352eabd
fix id/string error in receive local job
2010-12-16 18:21:06 -08:00
maxwell
e7cca604e6
refactored notifications
2010-12-16 17:30:35 -08:00
danielvincent
2758ea1625
fixed issue with diaspora handles not displaying in streams
2010-12-16 17:24:25 -08:00
Raphael
4da97be84b
Add benchmarks and logging to resque jobs
2010-12-16 16:48:36 -08:00
danielvincent
b4b6189321
time out a user session via devise after 10 minutes of inactivity
2010-12-16 15:50:00 -08:00
danielvincent
1465024f10
skipping receive process for incoming local posts, calling receive_object directly
2010-12-16 14:39:19 -08:00
maxwell
20ca2e2e93
make Notification.for return a query, not evaluate.. also limit notifications pulled back to 25
2010-12-16 11:16:09 -08:00
maxwell
d5ba34f245
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 18:05:54 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
maxwell
cb5982704e
dont url escape, xml escape
2010-12-15 17:43:46 -08:00
maxwell
8ec85d3b12
basic notifications
2010-12-15 17:31:36 -08:00
Raphael
b22398951e
Send requests from the aspect list on the person show page
2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d
add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids
2010-12-15 14:48:14 -08:00
maxwell
9555fae33d
no notifications on retractions
2010-12-15 13:14:46 -08:00
maxwell
d5edc9b477
CGI::escaping for proper, good juju activity streams
2010-12-15 12:27:52 -08:00
maxwell
a7d36615e6
adding basic notification class
2010-12-15 12:11:37 -08:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
danielvincent
2cf332e120
Remove sent boolean from requests, finish migration
2010-12-14 19:27:18 -08:00
danielvincent
dea8d248e2
user only pushes to non-pending contacts
2010-12-14 19:11:35 -08:00
danielvincent
f1ee32145d
Remove pending_requests from user, just use Request.from and Request.to.
2010-12-14 19:00:03 -08:00
danielvincent
aef5abf631
Correct some queries, look at incoming requests in search, explicit pending false in activate_contact
2010-12-14 17:33:07 -08:00
danielvincent
b1c0facfe6
initiating a request now just creates a pending contact instead of persisting a request
2010-12-14 17:11:43 -08:00
danielvincent
fd9d1332fc
break service http into its own queue
2010-12-14 11:43:26 -08:00
maxwell
0bd13ec106
use blank instead of empty for the person#name helper
2010-12-14 11:30:06 -08:00
danielvincent
d6bb5291bc
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
...
This reverts commit 2ac54eeffe , reversing
changes made to 3a13657087 .
2010-12-13 17:16:56 -08:00
mblog
d0355fdd43
Feature #348 : Change Email
2010-12-13 22:14:52 +01:00
Raphael
f861955d80
profile.image_url is set to :thumb_large in update_profile
2010-12-13 12:11:54 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -08:00
MrZYX
36043845ca
fixed requires for ruby 1.9
2010-12-10 17:25:02 +01:00
Alec Leamas
eacee54846
Replace APP_CONFIG[:terse_pod_url] with uri object.
...
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684 ,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se ;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
maxwell
416a36ea9a
ugh
2010-12-09 20:32:39 -08:00
maxwell
23e635bf20
i am an idiot
2010-12-09 20:30:38 -08:00
maxwell
645519be32
require twitter and facebook?
2010-12-09 20:24:45 -08:00