Maxwell Salzberg
|
2f1118f95f
|
refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect
|
2011-07-04 13:54:05 -07:00 |
|
Dan Goldenberg
|
20e2a16717
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-07-04 13:34:05 -07:00 |
|
Dan Goldenberg
|
39ef006aef
|
Revert "Changed ajax spinners to an asterix (both sizes) to look like login page. I made them in Flash so I can adjust the speed or whatever"
This reverts commit 3467c8d996.
|
2011-07-04 13:33:36 -07:00 |
|
Dan Goldenberg
|
fa01b4f09d
|
Revert "Also replaced facebox loading GIF"
This reverts commit 2e10643d00.
|
2011-07-04 13:33:02 -07:00 |
|
Raphael Sofaer
|
7bc5bc6662
|
Output collation in travis run
|
2011-07-04 13:17:59 -07:00 |
|
Maxwell Salzberg
|
f4f34e0faa
|
fix for public posts in development mode, in single process mode, when your pod_url is still set to localhost
|
2011-07-04 12:20:15 -07:00 |
|
Dan Goldenberg
|
2e10643d00
|
Also replaced facebox loading GIF
|
2011-07-04 12:14:36 -07:00 |
|
Raphael Sofaer
|
c180454e95
|
Drop database before creating it? Checking for collation problems.
|
2011-07-04 12:05:09 -07:00 |
|
Raphael Sofaer
|
f2f96f36aa
|
Disable notifications from travis.
|
2011-07-04 12:05:09 -07:00 |
|
Raphael Sofaer
|
fa3cdeb8cb
|
Remove a few unused cucumber steps
|
2011-07-04 12:05:09 -07:00 |
|
Dan Goldenberg
|
3467c8d996
|
Changed ajax spinners to an asterix (both sizes) to look like login page. I made them in Flash so I can adjust the speed or whatever
|
2011-07-04 12:00:14 -07:00 |
|
Raphael Sofaer
|
4e1e8fdb80
|
Get rid of 'bogus ps syntax' maybe figure out why 1.9 is freaking out about the oauth steps
|
2011-07-04 09:49:50 -07:00 |
|
Raphael Sofaer
|
b64ba85878
|
Apparently running a regex against every element on the page takes 10 seconds. Who knew?
|
2011-07-04 09:19:03 -07:00 |
|
Raphael Sofaer
|
04f8abcf13
|
Check for all aspects in selected_contacts link switch, take out a couple extra steps
|
2011-07-04 08:39:07 -07:00 |
|
Raphael Sofaer
|
a715630471
|
make cucumber faster by logging in through a much simpler stubby controller. Save about 1m on my laptop.
|
2011-07-04 08:11:12 -07:00 |
|
Raphael Sofaer
|
af6547815e
|
Some view helper cleanup
|
2011-07-04 07:36:01 -07:00 |
|
danielgrippi
|
1cd3ef4971
|
comment out a notifications feature for now that seems to break cucumber. what it's testing is kind of already asserted in the previous feature. thoughts?
|
2011-07-04 01:58:47 -07:00 |
|
danielgrippi
|
403d18bac4
|
fixed content expander in comments; comments have a smaller limit than posts
|
2011-07-03 22:06:58 -07:00 |
|
Michael Sofaer
|
d2b7168195
|
Use an explicit per_page param instead of switching on format
|
2011-07-03 21:16:58 -07:00 |
|
Sarah Mei
|
58ac33607a
|
Fix build - stub request in notifications#index specs
|
2011-07-03 20:48:42 -07:00 |
|
danielgrippi
|
511a651377
|
don't query for mentioned people if mention syntax isn't present in message text.
|
2011-07-03 20:36:46 -07:00 |
|
danielgrippi
|
829c86823d
|
remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them
|
2011-07-03 20:08:11 -07:00 |
|
danielgrippi
|
04e53fa1fc
|
remove unused aspect helper methods
|
2011-07-03 19:20:50 -07:00 |
|
Maxwell Salzberg
|
73172f9c22
|
remove completely unused method #yay
|
2011-07-03 18:04:00 -07:00 |
|
MrZYX
|
b8ff203af8
|
updated locales
|
2011-07-04 01:19:17 +02:00 |
|
danielgrippi
|
45834f1edf
|
remove 'start a conversation button' until we have a limit, or a warning message if a person is sending a message to more than ~20 people
|
2011-07-03 14:50:37 -07:00 |
|
Maxwell Salzberg
|
a104f4e309
|
if a user is logged in, redirect them to the proper authenticated view, not the public route
|
2011-07-03 09:13:39 -07:00 |
|
Maxwell Salzberg
|
4b0157f5b0
|
fix notification mark all as read ui bug
|
2011-07-03 08:20:24 -07:00 |
|
Maxwell Salzberg
|
6f72a0cb38
|
order facebook friends
|
2011-07-02 19:01:58 -07:00 |
|
danielgrippi
|
8a8f8db9ad
|
Merge branch 'notifications'
|
2011-07-02 17:53:55 -07:00 |
|
danielgrippi
|
9ec905560c
|
visual touchups, show loading gif right away
|
2011-07-02 17:53:07 -07:00 |
|
Dan Hansen
|
eb0fbe519c
|
remove read/unread state, always mark notifications as read, only return 5 notifications for json requests
|
2011-07-02 16:39:01 -07:00 |
|
Raphael Sofaer
|
f161377480
|
Stop loading contact objects on the main page, all we need is people
|
2011-07-02 16:28:52 -07:00 |
|
danielgrippi
|
24d84d7756
|
fixed stupid 500 caused by publisher
|
2011-07-02 16:02:14 -07:00 |
|
danielgrippi
|
689bde2e5f
|
take out useless 'reshare'
|
2011-07-02 15:41:50 -07:00 |
|
Dan Hansen
|
0b56ade468
|
basic unread/read states
|
2011-07-02 15:14:02 -07:00 |
|
Dan Hansen
|
3941d562a8
|
clean up notifications-badge.js
|
2011-07-02 14:57:17 -07:00 |
|
Raphael Sofaer
|
86c06c4d15
|
Try taking out some contact loading again
|
2011-07-02 14:43:15 -07:00 |
|
Raphael Sofaer
|
6b46d69b65
|
Revert "Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost."
This reverts commit 7baeaebe57.
|
2011-07-02 14:38:17 -07:00 |
|
Raphael Sofaer
|
98799b3971
|
Make feature a little prettier
|
2011-07-02 14:20:57 -07:00 |
|
Raphael Sofaer
|
290fb1e7f5
|
Cut 45 seconds out of the comments feature by using factories
|
2011-07-02 13:40:30 -07:00 |
|
Raphael Sofaer
|
7baeaebe57
|
Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost.
|
2011-07-02 12:39:25 -07:00 |
|
Raphael Sofaer
|
a36bd9897f
|
Put the cruisecontrol stuff back in the cruise rake task, rather than a method.
|
2011-07-02 12:25:19 -07:00 |
|
Maxwell Salzberg
|
f4ca8898f6
|
adding old school resque inline send. confusion b/c Resque.inline is a newer feature
|
2011-07-02 12:10:25 -07:00 |
|
Maxwell Salzberg
|
2d9d9bd1a1
|
Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same""
This reverts commit 696779d589.
|
2011-07-02 12:05:26 -07:00 |
|
Maxwell Salzberg
|
696779d589
|
Revert "remove perform delegate: use a gem that unobtrusivly does the same"
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
|
2011-07-02 12:01:31 -07:00 |
|
Maxwell Salzberg
|
dd752d7dd9
|
remove perform delegate: use a gem that unobtrusivly does the same
thing. use built in resque inline method for single process mode
|
2011-07-02 11:57:10 -07:00 |
|
Raphael Sofaer
|
7f55279962
|
I have no idea why travis ran the specs twice, but let's try again.
|
2011-07-02 10:21:30 -07:00 |
|
Raphael Sofaer
|
bc5d29bff3
|
Take some stuff out of the travis run, I think we need to use headless instead of an explicit xvfb. Turning off travis for now.
|
2011-07-02 10:21:30 -07:00 |
|
Raphael Sofaer
|
757b87e994
|
Merge pull request #669 from mblog/no-public-profile-edit-button
Don't need edit button on public profiles
|
2011-07-02 09:38:15 -07:00 |
|