Raphael Sofaer
e468075ffd
Doc AS::Photo
2011-06-26 20:59:02 -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
a1a53b34e9
Link to post in text email for comment_on_post. Fix 1144
2011-06-26 20:09:21 -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
Raphael Sofaer
c01641b619
Avoid words in person_image_tag
2011-06-24 11:09:10 -07:00
Raphael Sofaer
2857de5f1b
doc a user method
2011-06-24 10:38:06 -07:00
Raphael Sofaer
18138e1507
Doc
2011-06-24 10:38:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0
added temporary special casing on app_url in authorizations controller
2011-06-23 19:13:26 -07:00
danielgrippi
15571ecff0
render ASPhoto show page just like status message show for now
2011-06-23 15:47:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f
fixed every spec but the activity stream photos controller spec
2011-06-23 15:22:36 -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
c91cf6f38c
properly display app icon on authorizations index
2011-06-23 13:59:03 -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
Dis McCarthy
d56cac1639
List diaspora id on profile pics, courtesy diasporg
2011-06-23 09:08:07 -04:00
Raphael Sofaer
40560680fe
Title on sessions#new
2011-06-22 18:57:02 -07: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
a987b198fd
Fix search in PG
2011-06-22 15:09:00 -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
02739259b6
Don't hide the forgot password link
2011-06-22 13:19:54 -07:00
Andreas Henrich
7b3711a788
Issue #1050 : Changed cancel-link of a new message to back
2011-06-21 18:48:34 -04:00
Ilya Zhitomirskiy
c09fb776fb
added a couple of validations on the Oauth models, added an index on a user's authorizations
2011-06-20 18:30:18 -07:00
danielgrippi
890dc7efd5
put some dependent destroys on models for better sqlite compatability
2011-06-19 23:39:57 +02:00
Raphael Sofaer
2d3eeb9c46
Get another couple specs green on pg
2011-06-19 16:16:31 +02:00
Raphael Sofaer
f0cb2159c7
Make contacts appear at the beginning of search results in postgreSQL
2011-06-19 16:16:30 +02:00
Maxwell Salzberg
1f11e51a9b
add object_aspect_ids to status_message controller
2011-06-16 15:59:03 -07:00
Maxwell Salzberg
41e8a32b28
tests for data methods
2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6
move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz
2011-06-16 11:17:14 -07:00
Ilya Zhitomirskiy
75a1012c1c
moved the monkey patching to a model, need to do a couple of validations
2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b3cee70ead
if the request is bad give it as a response
2011-06-15 17:51:29 -07:00
Ilya Zhitomirskiy
78253b6885
resetting the token instead if the app already exists, should move the lookup to be homepage url
2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491
green on all the cucumbers WOOT
2011-06-14 18:30:43 -07:00
Raphael Sofaer
cba63030c9
Use rescue_from in CommentsController
2011-06-14 18:06:13 -07:00
Ilya Zhitomirskiy
dca2eca67c
cucumber specs are green
2011-06-14 15:36:05 -07:00
Raphael Sofaer
800e701f89
Document User#accept_invitation
2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1
Take loop out of remove_mentions
2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2
Document liked? and like_for
2011-06-14 10:15:32 -07:00
Ilya Zhitomirskiy
2a4932ea34
WIP verifying sig in the pre-registration endpoint
2011-06-13 22:57:56 -07:00
danielgrippi
b446404348
Revert "Without loaded? I was confused by the liked? and like_for methods."
...
This reverts commit 2103d54fe4
2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4
Without loaded? I was confused by the liked? and like_for methods.
2011-06-13 17:14:00 -07:00
Raphael Sofaer
480d7c47cf
Documentation is so rad.
2011-06-13 17:02:18 -07:00
Ilya Zhitomirskiy
ef0e48a7ff
A user can now revoke an application's token iz ms
2011-06-13 16:48:52 -07:00
Raphael Sofaer
7171aa05ed
Do a little bit more documenting.
2011-06-13 16:31:40 -07:00
Raphael Sofaer
4815482354
Start some real docs
2011-06-13 16:12:32 -07:00
Ilya Zhitomirskiy
3d77186d35
added authorizations page where a user can see all of their authorized applications
2011-06-13 15:40:55 -07:00
Patrick-Emil Zoerner
319863a7ed
fixed regex to non greedy. Therefore no strip needed.
2011-06-10 20:05:40 +02:00
MrZYX
0847d09950
ignore whitespace inside markdown links
2011-06-10 15:13:16 +02:00
Ilya Zhitomirskiy
56525c9f4f
made a slightly nicer heads up about nil ca_file
2011-06-09 16:28:45 -07:00
Raphael Sofaer
7fd86924ee
Fix pagination in AppsController
2011-06-09 16:23:15 -07:00
Raphael Sofaer
0790c3397e
Delete some useless JS
2011-06-09 16:23:15 -07:00
Ilya Zhitomirskiy
71dd8dc7f3
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/app_config.rb
2011-06-09 15:51:59 -07:00
Raphael Sofaer
e1fb5846b6
Use the example config file if travis
2011-06-09 15:45:01 -07:00
Raphael Sofaer
ac8587290a
Throw in a travis config file to try using travis
2011-06-09 15:31:16 -07:00
Ilya Zhitomirskiy
a03423309d
fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
2011-06-09 15:12:35 -07:00
Raphael Sofaer
775dbda2b2
Chubbies now uses diaspora-client
2011-06-09 12:40:30 -07:00
Ilya Zhitomirskiy
b575983c22
WIP certs
2011-06-08 18:46:38 -07:00
Ilya Zhitomirskiy
808754f8bd
added the cert bundle for facebook http things
2011-06-08 18:20:47 -07:00
Raphael Sofaer
9453f65b7d
Limit posts in the RSS feed, wecan come back to this and not limit it, and instead cache the static feed, when we have a little more time.
2011-06-08 12:00:08 -07:00
Raphael Sofaer
d9d66a5c31
WIP auth form and more oauth stuff
2011-06-08 11:55:11 -07:00
Arzumy MD
c0f5571795
do not unnecessary build the feed in users_controller#public when we want to redirect anyway
2011-06-08 17:50:13 +08:00
danielgrippi
96fc104218
paginate looks for stream elements
2011-06-06 23:12:14 -07:00
danielgrippi
b8a6bf9f51
trying something different on app show page. worth a shot.
2011-06-06 22:59:31 -07:00
Raphael Sofaer
8a2fece0f5
Don't n-query in contacts_sharing_with
2011-06-05 01:03:34 -07:00
Raphael Sofaer
753be12a1f
Don't force a query on like count
2011-06-05 00:32:10 -07:00
Raphael Sofaer
6d105e5c09
Don't n query in UsersController#public
2011-06-04 22:34:48 -07:00
Sarah Mei
243699c8e9
Tumblr service swallows exceptions raised by tumblbeasts.
2011-06-04 20:45:09 -07:00
Raphael Sofaer
21463582d4
Fix pagination on notifications page, it was getting all notifications for a user
2011-06-04 15:48:10 -07:00
Maxwell Salzberg
de55a1cbb3
remove remember aspects feature
2011-06-03 17:35:27 -07:00
Maxwell Salzberg
4b13c83de7
Chubbies now uses sqlite to have tables of pods and users
2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d
chubbies tests mow take diaspora handle
2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03
Chubbies now sends manifest data to create a client
2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d
Chubbies now sees that it has no secret and registers itself.
2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d
Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow
2011-06-03 16:22:38 -07:00
danielgrippi
40ab168a5a
DH DG; fix re-liking a post after unliking it
2011-06-03 12:20:59 -07:00
Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Maxwell Salzberg
149c086d5e
make the tumblr posting smarter
2011-06-02 17:02:29 -07:00
Dan Hansen
bc465848c9
MS DH fixed like sizes, everywhere
2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63
fix status message show page and break out Post to it's own javascript widget
2011-06-02 17:45:45 -05:00
MrZYX
82ca293825
fix services index with incomplete oauth_keys.yml
2011-06-02 13:20:22 +02:00
MrZYX
668c4ddfc5
d'oh
...
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
2011-06-02 12:32:21 +02:00
Maxwell Salzberg
f7181a7123
add tumblr translation
2011-06-01 22:43:23 -07:00
Maxwell Salzberg
72c6efe41c
basic specs
2011-06-01 22:38:15 -07:00
Maxwell Salzberg
5cbbdf2949
initial post to tumblr support
2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262
added pagination for people on tag pages
2011-06-01 18:59:15 -07:00
Raphael Sofaer
283e376712
Move initialize_signatures method out of user and into relayable
2011-06-01 16:45:30 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Sebastian
ea85daadc4
Added UsersController#confirm_email with route and some specs
2011-06-01 16:26:54 +02:00
Sebastian
f42055ae24
User#confirm_email with specs
2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153
Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update
2011-06-01 16:26:53 +02:00
Sebastian
602382e24e
Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en).
2011-06-01 16:26:53 +02:00
Sebastian
5b408ecca3
Added User#unconfirmed_email and #confirm_email_token with specs
2011-06-01 16:26:53 +02:00
MrZYX
de9e41a331
fixed total contact count
2011-06-01 12:23:37 +02:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Raphael Sofaer
71c3a29aa6
Move YoutubeTitles callback into module
2011-05-31 12:27:57 -07:00
Jonne Hass
1be2845687
Merge pull request #650 from yolk/1104-wrong-profile-picture-size
...
fixed #1104 wrong profile picture size
2011-05-31 10:33:26 -07:00
Sebastian
d4d0eacf49
fixed #1104 wrong profile picture size
2011-05-31 19:06:35 +02:00
Sebastian
d9f23b5e2a
fixed #1018 - aspects width on /aspects/manage
2011-05-31 18:29:24 +02:00
MrZYX
05aa73e93c
made everything in the sidebar translatable
2011-05-30 18:06:05 +02:00
MrZYX
3db4772652
ignore searchable if one searches by handle in people#index
2011-05-29 22:58:33 +02:00
MrZYX
502f467012
fix youtu.be links
2011-05-29 22:13:42 +02:00
MrZYX
42f5f7fc32
fixed find person by handle
2011-05-29 21:27:20 +02:00
MrZYX
cd887e9373
fixed unlike the right way
2011-05-29 18:15:46 +02:00
MrZYX
7b864dd208
Rails, welcome to 2011. Fyi: string concatenation is bad
2011-05-29 18:14:54 +02:00
MrZYX
d66fc9d99f
fix validation message if text is too long
2011-05-29 16:45:41 +02:00
MrZYX
0febee6fbb
fix unlike
2011-05-29 13:43:56 +02:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
MrZYX
54f1effdf8
Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora
2011-05-27 19:35:39 +02:00
Jakob Kramer
0efaa77c46
fixes bug #1092
2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2
Photo association on GUID 2/2: replace status_message_id with status_message_guid
2011-05-27 18:56:24 +02:00
MrZYX
ba08c38a74
fixed activity_streams::photo controller spec
2011-05-26 00:01:10 +02:00
Maxwell Salzberg
52487e87de
added a very basic page for the stream of all public activity stream photos
2011-05-25 12:57:29 -07:00
danielgrippi
d12944d57e
record objectId in post (cant use object_id booo)
2011-05-25 12:16:52 -07:00
Maxwell Salzberg
56644c9d1e
use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n
2011-05-24 21:45:12 -07:00
Sarah Mei
5e56b8a0ee
HULK SMASH PENDING SPEC
2011-05-24 23:36:00 -04:00
MrZYX
db22be43a8
really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF
2011-05-24 17:03:48 +02:00
danielgrippi
3f66458386
remove text from token page explaining there is no FF cubbies extension
2011-05-24 07:42:37 -07:00
Maxwell Salzberg
20cc3f0c7d
change the smiley for a heart.... the smiley looked sad at that size..
2011-05-23 23:53:18 -07:00
Raphael Sofaer
fc7b2cfe3f
Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation.
2011-05-23 23:09:48 -07:00
Raphael Sofaer
609439f948
Destroy notifications on contact destroy
2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781
Gross, but hopefully temporary solution for namespaced classes and old versions of libxml
2011-05-23 16:24:28 -07:00
Raphael Sofaer
cc84051541
Fall back to author if the diaspora_handle isn't set, that column just needs to be removed
2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0
Fix AS::Photo federation, hopefully
2011-05-23 13:56:42 -07:00
MrZYX
c732940b58
match trailing slash for vimeo links
2011-05-23 14:32:16 +02:00
danielgrippi
8e3149ca01
better page explaining cubbi.es and why we're promoting it on diaspora
2011-05-23 01:14:33 -07:00
Maxwell Salzberg
d776105558
grammer nazi cleanup of notification_people_link and refactor + tests
2011-05-22 17:18:44 -07:00
Maxwell Salzberg
90d62f3c8a
small ui tweak for mobile login page
2011-05-22 15:43:39 -07:00
Maxwell Salzberg
a4017ba16f
small linebreak for cubbies view for mobile
2011-05-22 15:25:37 -07:00
Maxwell Salzberg
59ae829254
there is a dumb bug where likes are targeting themselves
2011-05-22 15:02:01 -07:00
Maxwell Salzberg
77fc40d404
add application helper to notification helper spec, made the link an object_link rather than status_message_link
2011-05-22 14:59:04 -07:00
Maxwell Salzberg
2f6d079635
added failure test for deleted likes
2011-05-22 14:45:16 -07:00
Maxwell Salzberg
66c28c4caf
notification page now has links for likes
2011-05-22 14:35:35 -07:00
Maxwell Salzberg
d4d3b1e44c
MSSM like notification are concatinated, and backfilled some like tests
2011-05-22 13:59:33 -07:00
MrZYX
a68031179b
prevent inviting yourself, #515
2011-05-22 14:48:07 +02:00
MrZYX
07395fb2c9
added maxlength attribute to aspect name input, fixed #675
2011-05-22 13:50:44 +02:00
danielgrippi
3fb81d37d0
missing closing tag in aspect_dropdown helper
2011-05-21 15:08:19 -07:00
danielgrippi
6a108104e8
add spacing
2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80
better right pane sections
2011-05-21 14:52:59 -07:00
danielgrippi
7c949f4377
show diaspora handle on token page
2011-05-20 21:48:45 -07:00
Raphael Sofaer
286f1b876d
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
2011-05-20 15:14:23 -07:00
danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
Maxwell Salzberg
1e3971da3d
i think we want to not prevent non admins...
2011-05-19 22:22:03 -07:00
Arzumy MD
a060acffeb
add spec for admins_controller#add_invites
2011-05-20 10:51:04 +08:00
Arzumy MD
0ee41b3be5
removed user variable from admins_controller#user_search
2011-05-20 09:37:32 +08:00
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -07:00
Raphael Sofaer
ed61c53e09
Wrap UsersController to not 500 when no params are submitted
2011-05-19 17:01:42 -07:00
danielgrippi
f2259e5e25
put link in via link translation, add via link to mobile site
2011-05-19 16:06:29 -07:00
danielgrippi
83756c5713
actually add the views. fix object_path
2011-05-19 15:34:39 -07:00
danielgrippi
d7899d10e3
Fix various links in to cubbi.es objects
2011-05-19 15:17:42 -07:00
Maxwell Salzberg
69e83bb065
remove whitespace on your own profile
2011-05-19 15:08:17 -07:00
Maxwell Salzberg
8796c5b722
fixed build, added debugging info for notification 500s
2011-05-19 14:48:09 -07:00
Maxwell Salzberg
3c4c62abd5
moved auth token to admins page, and added a link in the dropdown
2011-05-19 14:23:04 -07:00
danielgrippi
925292a7b2
hey, federation works.
2011-05-19 13:20:58 -07:00
danielgrippi
177061d1c5
added via links
2011-05-19 13:13:08 -07:00
danielgrippi
6c31867345
check for AS object in partial hack
2011-05-19 12:40:05 -07:00
danielgrippi
e7095ba788
Tests now pass, stream_element needs de-hacking
2011-05-19 12:19:27 -07:00
danielgrippi
c8e31825c5
Bookmark -> ActivitiyStreams::Photo
2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0
only generate new token if admin
2011-05-19 11:57:06 -07:00
danielgrippi
41e1d0dd86
show photos from cubbies in the streams
2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520
Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.
2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6
added token authenticatable to user model
2011-05-19 11:57:06 -07:00
MrZYX
331aa1ff60
you know the facepalm smiley? Here it is: m(
2011-05-19 20:10:35 +02:00
Ilya Zhitomirskiy
6cda0bf9ea
Revert "added a podwide email preference"
...
This reverts commit 60c0a9839b
2011-05-18 10:38:45 -07:00
MrZYX
66380fd33f
fixed some translations
2011-05-18 13:55:50 +02:00
MrZYX
b0e9f5388b
fixed a translation; added that missing </li> for you, fixed #1078
2011-05-18 13:22:05 +02:00
Ilya Zhitomirskiy
60c0a9839b
added a podwide email preference
2011-05-17 18:19:47 -07:00
Raphael Sofaer
0bb349ff08
Merge branch 'evant_log_post_merge'
2011-05-17 18:17:14 -07:00
Raphael Sofaer
c942f76d29
Turn off user collapse and turn up status messages to over 9000
2011-05-17 18:14:35 -07:00
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02:00
Maxwell Salzberg
e95288e074
notifications by created at date so they stop jumping when you make them read
2011-05-17 14:44:42 -07:00
danielgrippi
0c62277961
add add to aspect dropdown on notifications page
2011-05-17 14:41:15 -07:00
Raphael Sofaer
d7980978fa
Render collection in services finder
2011-05-17 14:04:42 -07:00
danielgrippi
26ac8b8285
fix 500 on people index
2011-05-17 12:24:07 -07:00
danielgrippi
57a2a8fa71
remove button to add yourself to an asepct on your profile page:
2011-05-17 12:14:05 -07:00
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
Raphael Sofaer
5218bd89c6
Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated.
...
This reverts commit 0a8ce3b9f2f9ef9a4b47164226a3d7
2011-05-17 10:33:33 -07:00
MrZYX
1746f610b6
if we disable websocket in single process mode, there's no need for the JS
2011-05-17 19:26:37 +02:00
Raphael Sofaer
0a8ce3b9f2
Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge
2011-05-17 10:24:28 -07:00
Raphael Sofaer
f9ef9a4b47
Make FakeServiceUser assoc methods tolerant of nil
2011-05-17 10:14:39 -07:00
Raphael Sofaer
164226a3d7
Replace ServiceUser with fakes in ServicesController
2011-05-16 18:48:03 -07:00
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07:00
Raphael Sofaer
495dd89dd2
Fix password reset, add cucumber feature
2011-05-16 15:54:18 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
956f0044a9
set @contacts_of_contact_count in photos#index, thanks LPrelle
2011-05-16 16:21:13 +02:00
MrZYX
e338886910
fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled
2011-05-16 15:16:01 +02:00
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6
Users can log in on their phones again.
...
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
2011-05-14 14:58:52 -07:00
danielgrippi
01be909e38
well, that was dumb. (fix cucumber)
2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -07:00
danielgrippi
a02b9c01c8
eager loading aspect memberships
2011-05-13 18:22:42 -07:00
danielgrippi
30796de400
switching the order around to utilize eagerloading
2011-05-13 16:58:24 -07:00
danielgrippi
ee49fb3547
no more n-query in the view problem
2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1
Don't use rails case_sensitive false, it is very slow.
2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf
fixed cucumber with an exception of one step. added dropdowns to tag pages
2011-05-12 14:11:52 -07:00
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500
slimming down application_helper, moved markdown and aspect related methods to individual helpers
2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992
fix 500 on tags#show
2011-05-12 12:32:31 +02:00
MrZYX
9f070593ff
check if we can all cleaned_is_rtl? before doing it in direction_for helper
2011-05-12 11:05:32 +02:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea
fixed the formatting on emails
2011-05-11 17:02:05 -07:00
Raphael Sofaer
970190fb7a
OMG SO MANY EMAILS, fixed
2011-05-11 16:07:24 -07:00
danielgrippi
c67d143719
dropdown in ContactsController#sharing now works
2011-05-11 15:47:13 -07:00
Raphael Sofaer
6fa433ced8
added the header back
2011-05-11 15:33:39 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877
added translation to the likes popup, made the notification models a little clearer
2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f
unliking works right now minus on-page feedback
2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0
Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
...
This reverts commit bd74ab4acc
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc
Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec
2011-05-10 23:19:36 -05:00
Raphael Sofaer
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
Raphael Sofaer
37be13d4e0
Fix facebook finder and tests
2011-05-10 11:22:52 -07:00
=
2a11bb208e
Add message inbox link to mobile menu
2011-05-10 12:08:05 -05:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
danielgrippi
d34774f4e5
png favicon
2011-05-09 16:24:24 -07:00
danielgrippi
68601e392e
halfway to a better welcome/getting started page. wip.
2011-05-08 22:15:26 -07:00
MrZYX
3b7dd1906f
fixed 500 on /people/:person_id/photos
2011-05-08 21:36:27 +02:00
Raphael Sofaer
160e01f7bd
Fix broken sorting by activity
2011-05-07 00:50:26 -04:00
Maxwell Salzberg
7a2f6dae10
fixed js error on new comments on statusmessage show page
2011-05-06 15:29:39 -07:00
Arzumy MD
6ba2b00fb8
cleaned up formatting in application_helper, removed unnecessary return
2011-05-06 00:18:58 +08:00
Arzumy MD
2c4954bac8
spec for application_helper#page_title, with default text
2011-05-06 00:14:18 +08:00
danielgrippi
7e838fc778
only display contacts you are sharing with in aspect edit panes
2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10
#1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor
2011-05-05 00:05:59 +08:00
MrZYX
77bae90d0e
moar mappings for process_emoticons
2011-05-04 15:28:42 +02:00
Raphael Sofaer
87864bf4ff
people.diaspora_handle, not profiles.diaspora_handle
2011-05-03 11:39:34 -07:00
Raphael Sofaer
f89b6ae5be
Fix all contacts link
2011-05-03 11:02:08 -07:00
Raphael Sofaer
c7358c8664
Fix rendering into json for names with quotes
2011-05-03 10:50:13 -07:00
MrZYX
a92b28b4bf
general search and replace in markdownify ( #1042 )
2011-05-03 17:46:29 +02:00
Maxwell Salzberg
c20cd5381e
create a new notifciation if previous was read, only concatinate when it is the same unread message
2011-05-02 18:18:30 -07:00
Raphael Sofaer
567b440f3d
Use correct pagination in mobile person show
2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
MrZYX
b23f9b39eb
fixed adding contact feedback on people search result page
2011-04-30 17:00:52 +02:00
MrZYX
ff58d63191
minor cleanup to routes.rb
2011-04-30 16:28:39 +02:00
MrZYX
6623dbb1f1
fixed #1039
2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
Raphael Sofaer
28a997c2cd
Fix pagination on tags, specs are red, need to take all helpers out of applicationController
2011-04-28 09:28:59 -07:00
Raphael Sofaer
b4e36878fe
Fix pages after 1 on tag page
2011-04-28 09:28:59 -07:00
Dan Hansen
c1366e0e04
Make photos display inline on StatusMessage#show
2011-04-27 17:06:26 -05:00
Dan Hansen
4a101f25d9
Notifications.js refactor, add specs
2011-04-27 16:22:56 -05:00
Raphael Sofaer
5dcfff104a
Merge remote branch 'ritchewilson/prev_next'
...
Conflicts:
public/stylesheets/sass/mobile.sass
2011-04-19 17:05:12 -07:00
maxwell
9850a3f124
change text on manage services popup
2011-04-18 18:38:03 -07:00
maxwell
62c164e1a4
fixed displays of the days based on locale
2011-04-18 18:29:55 -07:00
maxwell
d70ef86337
make the days the right size in notification page
2011-04-18 17:55:17 -07:00
MrZYX
c06b885aa7
fixed #1027
2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980
basically fixed
2011-04-18 15:10:47 -07:00
maxwell
2223c562c0
first fix of notification page
2011-04-18 15:10:47 -07:00
maxwell
5050307179
Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])"
...
This reverts commit 981d39d220
2011-04-18 15:10:46 -07:00
MrZYX
981d39d220
Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])
...
This reverts commit a16e83df9e
2011-04-16 14:03:24 +02:00
danielgrippi
a16e83df9e
touched up notifications page
2011-04-15 10:42:21 -07:00
Raphael Sofaer
4870ffb944
Fix db seed, refactor aspect-filters a bunch, fix stream_element a little
2011-04-13 18:13:26 -07:00
Raphael Sofaer
f13304073b
The specs are green on my dev machine, let's see if CI is still red
2011-04-13 15:19:17 -07:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
Raphael Sofaer
85993a694e
Fix people#show sort order
2011-04-13 10:30:32 -07:00
Raphael Sofaer
5afe5f667e
Move js out of notifications index, fix reference to notifications badge
2011-04-12 17:15:02 -07:00
Raphael Sofaer
8c0dcdde08
Notifications should be sorted by updated_at
2011-04-12 14:06:58 -07:00
Raphael Sofaer
363ef2c276
Fix some translations (thanks MrZYX)
2011-04-12 12:24:29 -07:00
Raphael Sofaer
d5ecce7ca6
Merge branch 'limit_similar_contacts'
...
Conflicts:
app/controllers/people_controller.rb
2011-04-12 11:48:41 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
352d1c6abf
fixed disconnecting logic. specs&cucumber green
2011-04-11 15:10:51 -07:00
Raphael Sofaer
080f08187d
Disable typhoeus everywhere but the HTTPMulti specs
2011-04-11 14:52:21 -07:00
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
danielgrippi
1b8257e960
fixed 'destroy for nil class' warning in cucumber:
2011-04-11 11:11:32 -07:00
MrZYX
440fd26c14
hopefully finally fix #946
2011-04-11 19:15:14 +02:00
MrZYX
ffbe94f75c
revert moved add aspect button to the left for rtl languages, this is already done by CSS
2011-04-11 18:04:50 +02:00
MrZYX
2413b3c4bd
Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl
2011-04-11 18:01:09 +02:00
MrZYX
cf61bb756d
added dir attribute to html element; made tipsy gravity dependant on that
2011-04-11 18:00:28 +02:00
MrZYX
e91c153257
fixed #1013 thanks jbivins
2011-04-11 17:08:36 +02:00
MrZYX
fbe91aba3a
refetch profile if it's missing, comment out hydra stub for now because it breaks the specs
2011-04-09 15:20:28 +02:00
danielgrippi
1c9ca738ae
green everywhere.
2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec
specs green after moving ContactController#new to AspectsMembership#new
2011-04-08 11:44:09 -07:00
Raphael Sofaer
927ba96fcc
Take out broken 'start sharing' link from mobile site
2011-04-08 11:09:56 -07:00
Raphael Sofaer
f8359bd77d
Fix PeopleController#show mobile
2011-04-08 10:37:08 -07:00
Raphael Sofaer
761411e153
Mostly fix PeopleController#show for mobile
2011-04-08 10:37:08 -07:00
danielgrippi
aeda5a4e39
dispatching / receiving logic complete. following wip.
2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835
let admin give a user 10 ma user 10 more invites
2011-04-07 17:54:22 -07:00
Raphael Sofaer
a05b141366
Add tagged posts to db seed, make people#show and tags#show infinite scroll
2011-04-07 16:36:14 -07:00
Raphael Sofaer
157b117469
Just style links directly
2011-04-07 15:13:37 -07:00
Raphael Sofaer
d12ec38736
Fix mobile infinite scroll
2011-04-07 15:00:57 -07:00
maxwell
51b3cd9c77
attempt to fix the problem where people who wanted emails were no longer getting them
2011-04-07 14:05:40 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
Raphael Sofaer
bbf1bf00cb
Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.
2011-04-06 12:11:49 -07:00
Raphael Sofaer
fd0fa61d53
Fix query in TagsController#show
2011-04-06 10:52:10 -07:00
MrZYX
4c696603c6
some better http status codes
2011-04-06 17:16:39 +02:00
MrZYX
e925fe622c
oh yeah, render nothing on update if we don't want to redirect
2011-04-06 16:02:52 +02:00
MrZYX
95de299e6e
fixed #953
2011-04-06 14:18:33 +02:00
MrZYX
21b5f7932f
fixed #997 by turning cancel link into a reset button
2011-04-06 13:31:56 +02:00
Raphael Sofaer
9454c3a1b9
Working on fixing infinite scroll, in particular for aspects with the number 2 in their id.
2011-04-05 19:28:40 -07:00
danielgrippi
847f4fd260
edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.
2011-04-05 18:53:10 -07:00
Raphael Sofaer
59334dfaf5
Remove extra js, fix mobile view
2011-04-05 16:18:04 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
Raphael Sofaer
746a0c38b3
Take another shot at fixing pagination
2011-04-05 13:59:15 -07:00
Raphael Sofaer
4037ce48c5
Delete unused show templates
2011-04-05 13:59:15 -07:00
MrZYX
e7d48a16ee
moved + to the left for rtl languages
2011-04-05 19:33:51 +02:00
Raphael Sofaer
fdb6675f28
Make things more postgres compatible
2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b
follow wip. 2 failures.
2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
Raphael Sofaer
b48b483eab
Still working on stream query
2011-04-04 13:06:15 -07:00
danielgrippi
c800b0bfef
use fixtures in request spec; collapsed xml specs
2011-04-04 11:57:25 -07:00
maxwell
94d8fb9f3a
Revert "fpossible fix for mobile site 500 on user login"
...
This reverts commit fe52acb931
2011-04-04 11:11:11 -07:00
maxwell
fe52acb931
fpossible fix for mobile site 500 on user login
2011-04-04 10:58:50 -07:00
maxwell
95c1edbab8
disable duplicate sending of a private message
2011-04-04 10:09:53 -07:00
zhitomirskiyi
eb66f18aaa
removed the hide comments button if there are less than 3
2011-04-04 00:15:22 -07:00
MrZYX
8639dc3a77
fixed #993
2011-04-03 18:36:34 +02:00
MrZYX
c9fd4e0e5b
fixed path in getting started
2011-04-03 15:42:24 +02:00
MrZYX
100d705c2f
fixed #992
2011-04-03 14:57:30 +02:00
MrZYX
b776bb52db
made string on mobile page translatable
2011-04-03 13:17:09 +02:00
MrZYX
92bf8444a7
added spec; rtl? -> direction_for
2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75
added detection of rtl languages on every user based input
2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36
fixed #589 , no CSS!
2011-04-03 02:10:41 +02:00
MrZYX
4b7c9315c8
log error when receiving a post instead of letting the job fail with weired error later in the chain
2011-04-02 17:44:48 +02:00
MrZYX
f98a4ee42c
correct links to atom feed
2011-04-02 17:35:23 +02:00
MrZYX
65263f1905
damn, typo
2011-04-02 16:02:51 +02:00
MrZYX
e8b006eadb
finally eliminate no method error when processing a photo
2011-04-02 16:01:54 +02:00
MrZYX
a1c3a6dc1e
lets see if that fixes the build
2011-04-02 15:53:58 +02:00
MrZYX
b086142b16
fixed #991
2011-04-02 15:09:41 +02:00
MrZYX
513e838482
do not stress the server too much
2011-04-02 14:42:50 +02:00
MrZYX
3eeecebb67
201 means created…
2011-04-02 14:18:46 +02:00
danielgrippi
bdff036cda
remove spacing from stream elements
2011-04-01 11:26:04 -07:00
maxwell
41bbcc9ac9
comment out comment delete on mobile site for now
2011-04-01 11:22:48 -07:00
danielgrippi
8b8ea03582
high res logo on mobile site
2011-04-01 11:12:41 -07:00
maxwell
4bd0cbfdc8
publisher now can handle services, and is on seperate page
2011-04-01 01:18:01 -07:00
maxwell
f2ca2c2357
fix up translations, and remote on publisher"
2011-03-31 23:52:29 -07:00
maxwell
569fb66e9e
bunch of small mobile ui fixes
2011-03-31 23:38:38 -07:00
maxwell
3add704d4a
sm mobile site fix
2011-03-31 22:25:28 -07:00
maxwell
bf45026040
another small fix for the mobile site
2011-03-31 18:35:21 -07:00
maxwell
69befc059d
ms iz fixed a bit of the mobile site
2011-03-31 18:32:19 -07:00
maxwell
bb59df46f9
updating jquery mobile, fix the menu page a bit
2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
2011-03-31 17:23:54 -07:00
MrZYX
764e0c4aee
fixed #985
2011-03-31 18:59:00 +02:00
danielgrippi
b22b13d73f
Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
...
This reverts commit 326155af54
2011-03-31 01:30:02 -07:00
zhitomirskiyi
bb4c2ee85d
added a character count to the publisher
2011-03-30 19:11:24 -07:00
danielgrippi
326155af54
popstate now in aspect-filters. back button now actually works on aspect/index.
2011-03-30 17:39:08 -07:00
Raphael Sofaer
3387c20b5f
Fix redirect away from conversation
2011-03-30 17:17:16 -07:00
Raphael Sofaer
1df287b2bb
Don't redirect ajax requests to getting_started
2011-03-30 17:02:19 -07:00
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc
wip holding off until the follow model is done
2011-03-30 16:43:28 -07:00
Raphael Sofaer
e3ad078ba5
Scope querying in PhotosController#show
2011-03-30 16:40:01 -07:00
danielgrippi
5fa2a7a6f3
use popState in message inbox
2011-03-30 16:22:25 -07:00
Raphael Sofaer
716a7f64b8
Make contacts_visible accessible
2011-03-30 15:43:44 -07:00
Raphael Sofaer
8c9a7e1c41
Fix PhotosController#show
2011-03-30 15:43:44 -07:00
maxwell
66a52a49d6
add a loader for profile photo upload
2011-03-30 15:14:18 -07:00
Raphael Sofaer
c9d58d9308
Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings"
...
This reverts commit 3b7063d44a
2011-03-30 14:47:40 -07:00
maxwell
c91baf9f04
pass the param to set the profile photo
2011-03-30 14:44:06 -07:00
Raphael Sofaer
3b7063d44a
Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings
2011-03-30 14:28:58 -07:00
maxwell
6364f2a332
clean activity streams, fix test
2011-03-30 14:27:20 -07:00
Raphael Sofaer
2d31d364f2
Don't will_paginate json requests on people search
2011-03-30 13:40:16 -07:00
danielgrippi
e922ef8f22
add includes() to search query for profiles
2011-03-30 13:24:47 -07:00
Raphael Sofaer
75354c1aba
fix error on mobite status message show
2011-03-30 12:51:02 -07:00
danielgrippi
d3c0f1b3d2
ruby objects, get outta my face. (conversationscontroller new)
2011-03-30 12:45:47 -07:00
Raphael Sofaer
5c7bd6298a
Fix 500 on tags index
2011-03-30 12:43:44 -07:00
MrZYX
d97939a18f
escape the ' in the json (don't ask me why the four \ are needed, it was trial and error :P)
2011-03-30 21:14:21 +02:00
maxwell
3ba7ce41f1
make the public page show the public profile if html request
2011-03-30 11:34:54 -07:00
zhitomirskiyi
70d1c31733
fixed the issue of nothing showing up for empty aspects
2011-03-30 11:29:12 -07:00
zhitomirskiyi
4a7326e035
WIP
2011-03-30 11:29:12 -07:00
danielgrippi
c4295a7693
fix aspect_memberships_controller specs
2011-03-30 11:15:40 -07:00
Raphael Sofaer
22b9f92c27
FIx post socketing
2011-03-30 10:55:59 -07:00
danielgrippi
95578e79c6
fix removing from aspect -> contact removal bug
2011-03-30 10:44:55 -07:00
maxwell
86fe2db24e
update publish job to include .atom
2011-03-30 10:41:47 -07:00
maxwell
fa27fa2d29
make one translation absolute to attempt to fix 1.9 build
2011-03-30 10:39:40 -07:00
MrZYX
53bdb2cade
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
2011-03-30 17:17:36 +02:00
MrZYX
699264e7a3
made flash messages for conversations translatable
2011-03-30 16:52:43 +02:00
MrZYX
22b73c736b
fixed #976
2011-03-30 16:15:31 +02:00
danielgrippi
5b0da52e0a
fixed comment socketing bug, post ordering on own profile page.
2011-03-29 19:40:44 -07:00
danielgrippi
b3cb8e0a2b
temp fix for pagination. photos index fix
2011-03-29 18:55:00 -07:00
danielgrippi
aa4c20e404
pass post to comments partial. use sql in raw_visible_posts
2011-03-29 17:31:57 -07:00
danielgrippi
371aa71ca8
add ordering to raw_visible_posts
2011-03-29 17:31:56 -07:00
danielgrippi
97d8b34599
Fix all specs, add foreign key constraints on post_visibility
2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91
8 failures left. wip.
2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5
Moving PostVisibility to aspects, WIP, model specs pass
2011-03-29 17:31:56 -07:00
zhitomirskiyi
0aaaefeba2
fix tag plugin
2011-03-29 16:53:48 -07:00
zhitomirskiyi
d54a8428d3
add some limits for conversation#new
2011-03-29 15:19:14 -07:00
zhitomirskiyi
8775ab9d69
fixed the conversations create
2011-03-29 15:03:10 -07:00
zhitomirskiyi
ba15ea940b
autosuggest on tags now works, bumped up the version of the autocomplete plugin
2011-03-29 15:03:09 -07:00
zhitomirskiyi
2e25d1d745
added the bookmarklet into a box
2011-03-29 15:03:09 -07:00
zhitomirskiyi
a5bb26a3c4
almost done
2011-03-29 15:03:09 -07:00
maxwell
bbe5f56292
you can now mention in the bookmarklet
2011-03-29 13:55:14 -07:00
MrZYX
98820c0866
do not display tags on the public profile
2011-03-29 22:25:03 +02:00
maxwell
5392b5c6ef
strip more than 5 tags when updating profile so people with broken profiles can update again
2011-03-29 10:56:11 -07:00
MrZYX
aa478ddd5c
string concatenation with translations is bad, especially if you leave on part of it untranslated :P
2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e
fix translations
2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
maxwell
9e5890288c
more bookmarklet improvements
2011-03-28 18:34:52 -07:00
maxwell
f08b5dfafe
basic functionality done, fixing rough edges
2011-03-28 18:11:59 -07:00
Raphael Sofaer
349aa13c05
Revert "reduce db quries on aspects#index"
...
This reverts commit 3af5e24ac6
2011-03-28 14:59:16 -07:00
Ritchie Wilson
a1b07d84e1
Next and Previous arrows for mobile photos
2011-03-28 16:04:29 -04:00
Raphael Sofaer
c33a952bbd
Forgot parens
2011-03-28 11:22:03 -07:00
Raphael Sofaer
a0d3921d72
Fix 500 on tag show with comments
2011-03-28 10:01:19 -07:00
MrZYX
c2a4c2157d
oh yeah it's delete_all on has_many, seems like I shouldn't code today…
2011-03-28 18:04:21 +02:00
MrZYX
824c4b38ad
dependent delete for likes
2011-03-28 17:54:07 +02:00
Sarah Mei
ffe48fe189
Refactor aspects#index to be easier to read; move some expensive operations after the guard clause
2011-03-27 19:19:25 -07:00
Sarah Mei
ae106e71ae
Move sort order to a before filter, because this index method is waaaaay too big.
2011-03-27 18:52:43 -07:00
MrZYX
5c4979ccf0
use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why
2011-03-28 00:09:07 +02:00
MrZYX
315fdabd76
let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases
2011-03-27 21:08:30 +02:00
MrZYX
e2f6427724
just realized that the change to AspectsController#index in the previous commit isn't needed
2011-03-27 17:26:17 +02:00
MrZYX
3af5e24ac6
reduce db quries on aspects#index
2011-03-27 17:22:35 +02:00
MrZYX
55417cf9e3
AspectsController#move_contact -> AspectMembershipsController#update
2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
MrZYX
11b0a2c19d
dependent destroy for likes
2011-03-26 21:47:40 +01:00
MrZYX
92d6b618aa
ups that shouldn't be in the previous commit
2011-03-26 17:41:58 +01:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
danielgrippi
8a2dd36b7e
Fix autocomplete JSON
2011-03-25 17:28:04 -07:00
Raphael Sofaer
aed190dc6d
cucumber for comment retractions, modified views
2011-03-25 16:26:03 -07:00
Raphael Sofaer
fef226156c
Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable?
2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628
Relayable retractions pretty much done
2011-03-25 16:09:37 -07:00
Raphael Sofaer
31f43696cb
Initial work on retracting comments
2011-03-25 16:09:37 -07:00
danielgrippi
40953d37bd
Put an upper limit on the per_page param
2011-03-25 15:31:23 -07:00
danielgrippi
f5a03fd6ed
Make public timeline of a user publicly accessible
2011-03-25 15:06:22 -07:00
danielgrippi
c0ce0d71b8
Make pending specs green, I think there are still some to_jsons where there should be as_json
2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65
added users_profile_image, home_timeline, fixed public_timeline
2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802
statuses/ and users/ GET routes
2011-03-25 15:06:22 -07:00
maxwell
c5b6cdff4e
make a public search method
2011-03-25 15:06:22 -07:00
maxwell
310f529914
dumb api console
2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c
initial public api'
2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
danielgrippi
b6d5165f2d
scroll to post on page if you can see it (via notification popup)
2011-03-23 17:16:30 -07:00
Raphael Sofaer
555a774668
Initial contacts_of_contact page
2011-03-23 16:42:53 -07:00
zhitomirskiyi
18c7c467c7
made the manage email prefs work
2011-03-23 16:36:16 -07:00
danielgrippi
535e686b2c
fixed tag ordering in stream_element partial
2011-03-23 16:24:12 -07:00
zhitomirskiyi
7a31531258
added location to the profile
2011-03-23 15:56:46 -07:00
Raphael Sofaer
ec8aed12bb
Limit similar contacts, need a see all page
2011-03-23 15:02:26 -07:00
zhitomirskiyi
804b0b534a
moved the tooltips to be under the icons
2011-03-23 14:23:25 -07:00
zhitomirskiyi
24db7a3b87
added tooltips to the service icons
2011-03-23 14:13:54 -07:00
danielgrippi
fb5bc2805d
fix cucumber
2011-03-23 12:42:07 -07:00
Raphael Sofaer
73d4bf4327
Remove unneeded callback
2011-03-23 12:00:47 -07:00
