danielgrippi
8bf6ad45a5
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
2011-07-01 22:04:36 -07:00
danielgrippi
1a2ba034ab
added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index
2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a
More visual cleanup; top nav; edit aspects
2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e
Almost done with left-nav, added link to aspect edit facebox, colored share button
2011-07-01 14:22:38 -07:00
danielgrippi
238e859dbe
add contact images to aspect index, removed comment background color, add vertical rule to people pages
2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550
DG RS left nav almost there. touched up publisher, among other things
2011-07-01 10:49:19 -07: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
5243a3203f
Fix AS::Photo show page
2011-06-29 11:33:32 -07:00
danielgrippi
b8ea8e9e75
start a conversation with an aspect from contact index page
2011-06-28 23:09:11 -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
Michael Sofaer & Raphael Sofaer
d355e230b1
all aspects helper
2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
839756573d
set post correctly
2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041
notifications tests pass
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d
reset the notifications helper to master's version and monkey patch header
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f
Move some DB logic from helper to controller
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
Michael Sofaer
ef7580a698
Notifications page works with Vanna
2011-06-27 19:51:35 -07:00
danielgrippi
89ca5cf337
DG DH; fix the build
2011-06-27 19:26:03 -07:00
danielgrippi
73fe74c834
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
2011-06-27 18:58:29 -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
b14271342a
Give more information in error message
2011-06-27 17:09:05 -07:00
Raphael Sofaer
240eb78b08
Change homepage_url to application_base_url
2011-06-27 16:44:18 -07:00
danielgrippi
44b77c58a3
just have a remove from aspect icon when viewing an aspect in contacts index
2011-06-27 16:26:54 -07:00
danielgrippi
f839714646
added aspect filtering to contact index. fixed rspec
2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de
don't group by
2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f
sort contacts by last name on contacts page
2011-06-27 14:00:15 -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
Raphael Sofaer
c7b4e2b4f4
Merge remote branch 'drummondj/1049-unconfimed-tags'
2011-06-26 23:24:03 -07:00
Raphael Sofaer
d002c14aab
Initial implementation of allowing cross-origin requests in the webfinger flow, so that the unhosted guys can use Diaspora. May not work with caches-page on host-meta. We'll have to use X-Accel-Redirect or something.
2011-06-26 20:29:39 -07:00
Raphael Sofaer
b9c2d3758b
What is this?
2011-06-26 20:09:21 -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
John Drummond
f7abaab276
Issue 1049 fixed by pre-processing params[:profile][:tags_string] and adding # when required
2011-06-25 23:19:30 -07:00
Raphael Sofaer
4fef3b7172
Docs because I forgot what StatusMessagesController#new is
2011-06-25 16:17:38 -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
Raphael Sofaer
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f9b09d32f8
cucumber is passing rspec is red
2011-06-24 12:02:15 -07:00
danielgrippi
0b5de2aa7a
WIP getting rid of app_url in params
2011-06-24 11:22:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0
added temporary special casing on app_url in authorizations controller
2011-06-23 19:13:26 -07:00
danielgrippi
74a7c3ab00
collapsed oauth2 migrations; made app factory
2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213
Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env.
2011-06-23 14:20:53 -07:00
danielgrippi
a9b7cd1254
nicer auth prompt. wip.
2011-06-23 12:40:47 -07:00
Alex Chvatal
7a56322b60
Adds ability to parse plain-text tags
...
Tags that haven't been autocompleted and clicked on will be
added as tags as well. There should only be one tag like this
at a time, since adding a space between tags turns it into
a list item.
2011-06-23 12:23:16 -04:00
danielgrippi
13810336d3
load monkeypatched models in authorizations controller
2011-06-22 18:32:24 -07:00
danielgrippi
5917f0d695
added JWT verification support to diaspora
2011-06-22 16:15:03 -07:00
Raphael Sofaer
e8552fc417
Fix direct query execution issues in PG by using select_values/select_rows instead of execute.
2011-06-22 14:47:59 -07:00
Raphael Sofaer
2d3eeb9c46
Get another couple specs green on pg
2011-06-19 16:16:31 +02:00
Maxwell Salzberg
1f11e51a9b
add object_aspect_ids to status_message controller
2011-06-16 15:59:03 -07:00
