Daniel Grippi
|
0cd3878bb8
|
Merge pull request #670 from galaxor/1137-bad_rsa_keys
1137 bad rsa keys
|
2011-07-06 10:00:44 -07:00 |
|
MrZYX
|
8c1c546bdf
|
fixed #884
|
2011-07-06 15:38:54 +02:00 |
|
Raphael Sofaer
|
0ac28cd9ea
|
Pending spec for 500 on capital letters
|
2011-07-05 17:31:49 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
027f096ca7
|
turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec
|
2011-07-05 15:03:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2d8b5bd54c
|
refactored the controller, moved flash message into translations
|
2011-07-05 15:03:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
f0d9d318e8
|
a user can now follow and unfollow a tag
|
2011-07-05 15:03:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
1e4ee472b7
|
WIP you can now follow a tag, needs a clean up, and ajax love
|
2011-07-05 15:03:26 -07:00 |
|
Raphael Sofaer
|
4f056dca8e
|
Ajax in likes in stream
|
2011-07-04 22:10:30 -07:00 |
|
Ryan Hughes
|
2f89f19f34
|
Test sending to people with bad rsa keys.
|
2011-07-04 18:00:55 -07:00 |
|
danielgrippi
|
9debec4410
|
fix the build.
|
2011-07-04 16:53:43 -07:00 |
|
Raphael Sofaer
|
af6547815e
|
Some view helper cleanup
|
2011-07-04 07:36:01 -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 |
|
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 |
|
Raphael Sofaer
|
f161377480
|
Stop loading contact objects on the main page, all we need is people
|
2011-07-02 16:28:52 -07:00 |
|
Raphael Sofaer
|
290fb1e7f5
|
Cut 45 seconds out of the comments feature by using factories
|
2011-07-02 13:40:30 -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
|
3baf433b3a
|
More travis stuff
|
2011-07-02 00:50:11 -07:00 |
|
danielgrippi
|
8bf6ad45a5
|
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
|
2011-07-01 22:04:36 -07:00 |
|
Sarah Mei
|
1bbfa97e5f
|
DH SM MS pending photo spec for Dan
|
2011-06-30 21:04:18 -07:00 |
|
Robin Wellner
|
91dd4f847a
|
Adds support for converting <-> to ↔ in markdownify
|
2011-06-30 14:27:39 +02:00 |
|
danielgrippi
|
55efe132c5
|
corrected authorizations_controller_spec to assert on response codes
|
2011-06-29 17:10:43 -07:00 |
|
danielgrippi
|
144ac82577
|
only allow https and www.cubbi.es in authorizations controller for now
|
2011-06-29 16:40:43 -07:00 |
|
Raphael Sofaer
|
3887144db6
|
I seriously think that this commit is going to fix CI. SRSLY.
|
2011-06-29 15:34:45 -07:00 |
|
Raphael Sofaer
|
daf52eb21f
|
Put the source back in the second Gemfile...
|
2011-06-29 15:03:23 -07:00 |
|
Raphael Sofaer
|
7ee3fcd811
|
Fix app_config spec
|
2011-06-29 14:08:25 -07:00 |
|
Raphael Sofaer
|
02489bb7cf
|
This should fix CI for real
|
2011-06-29 12:07:10 -07:00 |
|
Raphael Sofaer
|
5243a3203f
|
Fix AS::Photo show page
|
2011-06-29 11:33:32 -07:00 |
|
Raphael Sofaer
|
d6321d2327
|
Bundle in the oauth features, take the source out of the chubbies Gemfile
|
2011-06-29 11:21:23 -07:00 |
|
Dan Hansen
|
eaf7fcd7fe
|
speed up notifications controller index spec
|
2011-06-28 23:31:34 -07:00 |
|
danielgrippi
|
b8ea8e9e75
|
start a conversation with an aspect from contact index page
|
2011-06-28 23:09:11 -07:00 |
|
Raphael Sofaer
|
0eb31e3ba7
|
added jwt to the chubbies bundle, made the asterisk black
|
2011-06-28 17:52:38 -07:00 |
|
Raphael Sofaer
|
4683047ee0
|
point diaspora client to the right place in the gemfiles
|
2011-06-28 17:36:01 -07:00 |
|
Raphael Sofaer
|
3078220bc0
|
Point diaspora-client to git
|
2011-06-28 17:25:02 -07:00 |
|
Raphael Sofaer
|
1af945de11
|
Merge branch 'master' into oauth
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
|
2011-06-28 17:13:38 -07:00 |
|
Raphael Sofaer
|
7fd9b81e55
|
Fix spec in authorizations_controller, get rid of pp
|
2011-06-28 14:37:55 -07:00 |
|
Dennis Collinson & Michael Sofaer
|
f9e8e7a041
|
notifications tests pass
|
2011-06-27 19:51:35 -07:00 |
|
Michael Sofaer
|
d6ba3c970c
|
proof of concept for notifications overlay
|
2011-06-27 19:51:35 -07:00 |
|
danielgrippi
|
00ffade884
|
sub menu for people only sharing with you on contacts page
|
2011-06-27 17:22:36 -07:00 |
|
Raphael Sofaer
|
240eb78b08
|
Change homepage_url to application_base_url
|
2011-06-27 16:44:18 -07:00 |
|
danielgrippi
|
f839714646
|
added aspect filtering to contact index. fixed rspec
|
2011-06-27 15:03:39 -07:00 |
|
Raphael Sofaer
|
17917528f6
|
IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302.
|
2011-06-27 12:31:47 -07:00 |
|
danielgrippi
|
a2609f7dac
|
simple filter on contacts index page (my/all contacts)
|
2011-06-27 12:12:50 -07:00 |
|
John Drummond
|
cc6f82fbc1
|
Added test for new plantext tag without a # symbol and fixed broken code.
|
2011-06-25 23:37:51 -07:00 |
|
Raphael Sofaer
|
b3556870d3
|
Merge remote branch 'yithian/1049-allow-plaintext-tags'
|
2011-06-25 11:23:55 -07:00 |
|
danielgrippi
|
54ef22b83e
|
lol, just needed to remove 'http://' in the specs to get the controllers passing again
|
2011-06-24 18:38:30 -07:00 |
|