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 |
|
maxwell
|
ed0e739ac3
|
updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with
|
2010-12-20 11:22:52 -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 |
|
danielvincent
|
6c12a4c562
|
photo show page shows more photo.
|
2010-12-19 21:53:57 -08:00 |
|
zhitomirskiyi
|
e3f7bd319b
|
25 more passing tests
|
2010-12-19 21:41:46 -08:00 |
|
maxwell
|
c22894ff2a
|
limit number of notifications in notifications#index
|
2010-12-19 19:05:45 -08:00 |
|
danielvincent
|
6d63a5d3c5
|
fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller.
|
2010-12-19 17:50:07 -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 |
|
MrZYX
|
b52718e913
|
small translation fix
|
2010-12-19 14:41:47 +01:00 |
|
MrZYX
|
1b6f341348
|
made linking more robust, this fixes #732
|
2010-12-19 13:49:46 +01: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 |
|
zhitomirskiyi
|
4425c3df83
|
reshare now works as expected opens the publisher and has the share button
|
2010-12-18 22:30:12 -08:00 |
|
Mike Sofaer, Raphael Sofaer & Sarah Mei
|
3fe2924a60
|
WIP moving to mysql
|
2010-12-18 21:16:39 -08:00 |
|
danielvincent
|
01e557ba7a
|
put ajax:success for publisher where it belongs
|
2010-12-18 20:31:02 -08:00 |
|
danielvincent
|
d5916c9287
|
removed comment button from sight
|
2010-12-18 20:26:27 -08:00 |
|
Mike Sofaer, Raphael Sofaer & Sarah Mei
|
5c21e220ff
|
post_spec now passes with mysql
|
2010-12-18 20:23:16 -08:00 |
|
danielvincent
|
a42a773d3d
|
dim service icons when not public. remove 'make public' label, now checkbox title.
|
2010-12-18 20:00:13 -08:00 |
|
danielvincent
|
ee9e187e5c
|
fixed build, add photos has a solid border
|
2010-12-18 19:45:50 -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 |
|
danielvincent
|
78a50756c6
|
publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn().
|
2010-12-18 18:28:00 -08:00 |
|
Raphael
|
36b622c998
|
Fix build
|
2010-12-18 15:22:56 -08:00 |
|
MrZYX
|
c3a79f7298
|
some fixes to translations
|
2010-12-18 15:25:21 +01:00 |
|
maxwell
|
f1ae312e75
|
changes for person show page
|
2010-12-18 02:10:00 -08:00 |
|
maxwell
|
bcca61af6b
|
infinate scroll
|
2010-12-18 01:33:33 -08:00 |
|
Raphael
|
a64fa0839f
|
Hide notifications link until we take out queries from it
|
2010-12-17 20:19:02 -08:00 |
|
maxwell
|
427cf18324
|
fix birthday spec
|
2010-12-17 19:41:42 -08:00 |
|
maxwell
|
84c041ba6a
|
aspects streams now ajax
|
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
|
96b907122b
|
only show profile fields if they are filled out.
|
2010-12-17 17:40:08 -08:00 |
|
maxwell
|
2e85a9fe66
|
notifications now can be read
|
2010-12-17 17:06:49 -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
|
807187ded9
|
/notifications is now pretty cool
|
2010-12-17 17:06:48 -08:00 |
|
Raphael
|
b8648f631a
|
Use ree in the chef scripts, might revert later
|
2010-12-17 12:49:44 -08:00 |
|
maxwell
|
3c3e03993a
|
make the two links on comment notifications clearer
|
2010-12-17 11:48:08 -08:00 |
|
maxwell
|
5763b441be
|
fixing order of Notification.for
|
2010-12-17 11:37:33 -08:00 |
|
maxwell
|
39deac62fb
|
in words is not a helper
|
2010-12-17 11:05:58 -08:00 |
|
maxwell
|
0bdb6aaab5
|
more notification stuff
|
2010-12-16 19:00:32 -08:00 |
|
maxwell
|
92bbe4cd4c
|
added link to changelog, updated notifications
|
2010-12-16 18:28:22 -08:00 |
|
danielvincent
|
a41f45b846
|
contact count on home page
|
2010-12-16 18:21:06 -08:00 |
|
danielvincent
|
bc9352eabd
|
fix id/string error in receive local job
|
2010-12-16 18:21:06 -08:00 |
|
maxwell
|
b8a0abd122
|
updating notification views
|
2010-12-16 18:07:43 -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
|
f3ced6d96c
|
randomize collections of similar contacts on people#show
|
2010-12-16 16:37:13 -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 |
|
Raphael
|
d2199fa1eb
|
Profile of requestor should be visible; no outgoing request instance variable needed
|
2010-12-16 14:09:55 -08:00 |
|
Raphael
|
eb56521a66
|
Don't query inside of loops...
|
2010-12-16 12:25:31 -08:00 |
|
danielvincent
|
f821f49db1
|
added similar contacts to contact pages
|
2010-12-16 11:49:08 -08:00 |
|
maxwell
|
f00e0ada78
|
do a bad thing in the helper to get comment links
|
2010-12-16 11:23:57 -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
|
1274dbbf5d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-16 10:16:39 -08:00 |
|
maxwell
|
1451db6cd8
|
fixed rspec build
|
2010-12-16 10:15:16 -08:00 |
|
danielvincent
|
43810907f5
|
show all contacts in edit aspect pane
|
2010-12-16 10:00:18 -08:00 |
|
maxwell
|
d5ba34f245
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 18:05:54 -08:00 |
|
Raphael
|
e881edab96
|
Fix missing partials on last commit, you can now accept a request from the requestor's profile page
|
2010-12-15 18:05:18 -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 |
|
zhitomirskiyi
|
d34964651c
|
if aspect is not dropped it redirects back for consistency
|
2010-12-15 14:44:10 -08:00 |
|
zhitomirskiyi
|
4256ea34b6
|
rename aspect on the aspect show page
|
2010-12-15 14:15:07 -08:00 |
|
maxwell
|
9555fae33d
|
no notifications on retractions
|
2010-12-15 13:14:46 -08:00 |
|
maxwell
|
61b2bbbd7d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 12:28:09 -08:00 |
|
maxwell
|
d5edc9b477
|
CGI::escaping for proper, good juju activity streams
|
2010-12-15 12:27:52 -08:00 |
|
zhitomirskiyi
|
2abcd8d147
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 12:11:58 -08:00 |
|
maxwell
|
a7d36615e6
|
adding basic notification class
|
2010-12-15 12:11:37 -08:00 |
|
Maxwell Salzberg
|
555542da31
|
remove extra slash
|
2010-12-15 12:01:20 -08:00 |
|
zhitomirskiyi
|
1212b34706
|
fadeOut on delete
|
2010-12-15 11:58:38 -08:00 |
|
Maxwell Salzberg
|
f8c2f15bb1
|
use the full pod_url in the template
|
2010-12-15 11:48:13 -08:00 |
|
Dan Hansen & Sarah Mei
|
82e2f23f91
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-15 14:29:33 -05:00 |
|
Raphael
|
bd31ff3ee3
|
Fix request validations, build.
|
2010-12-15 10:48:29 -08:00 |
|
Dan Hansen & Sarah Mei
|
fbfe28bcfa
|
added vimeo method, still needs support from lib/youtube_titles.rb. updated locales
|
2010-12-15 01:20:53 -05:00 |
|
Dan Hansen & Sarah Mei
|
c4a7745c88
|
Refactored the markdownify method.
|
2010-12-15 01:00:20 -05: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 |
|
maxwell
|
d24be269f2
|
small refactor of admin mail. don't call deliver in the method
|
2010-12-14 17:36:26 -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 |
|
Raphael
|
06b7b1c99a
|
WIP pending contacts
|
2010-12-14 17:11:42 -08:00 |
|
maxwell
|
c38fbd27e4
|
prevent gifs thru getting through javascript uploader
|
2010-12-14 13:31:06 -08:00 |
|
Raphael
|
d3850292d5
|
Don't query current_user.contacts on every action
|
2010-12-14 12:38:48 -08:00 |
|
Raphael
|
e63a8a4bfa
|
Take contact.person query out of the views, only query people once in hashes_for_aspects
|
2010-12-14 12:11:36 -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 |
|
maxwell
|
2bc849fa90
|
only show permalink if the post is infact public. also, make destroy delete
|
2010-12-13 18:45:54 -08:00 |
|
maxwell
|
e3e3fd13e5
|
no trailing slash on pod url on login page. it just looks weird
|
2010-12-13 18:21:50 -08:00 |
|
zhitomirskiyi
|
7e3b2c6afd
|
removed the query from the contact list partial
|
2010-12-13 17:53:27 -08:00 |
|
maxwell
|
8ba619029e
|
adding about text on invite accept page
|
2010-12-13 17:24:33 -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 |
|
maxwell
|
c2ad170506
|
re add 'remember me' button
|
2010-12-13 17:05:35 -08:00 |
|
Raphael
|
d44df7e977
|
put remove contact link under aspect membership
|
2010-12-13 16:40:05 -08:00 |
|