Raphael Sofaer
d68c8a3a03
Merge pull request #657 from ndee/1050-cancel-message
...
Issue #1050 : Changed cancel-link of a new message to back
2011-07-01 10:46:27 -07:00
Sarah Mei
948a7c5d55
DH SM MS Fix showing image in the publisher when it gets uploaded
2011-06-30 20:36:15 -07:00
danielgrippi
4e48db23f0
aspect dropdown shows name of aspect if contact is only in one; green
2011-06-30 12:18:41 -07:00
danielgrippi
53c87562f4
switch aspect listings and info stuffs on aspect/index
2011-06-28 23:40:57 -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
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
bc874e92cd
close link for notifications ajax
2011-06-27 19:51:35 -07:00
Michael Sofaer
2c4a75f6a6
Handle multiple notification objects correctly
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
a6cb04aadb
wider!
2011-06-27 19:38:14 -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
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
f9a23b8120
added inf scroll to contacts index page
2011-06-27 15:54:03 -07:00
danielgrippi
9e92230cf7
make contact listings more compact on contact index (we don't need to know their tags here)
2011-06-27 15:32:39 -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
danielgrippi
a2609f7dac
simple filter on contacts index page (my/all contacts)
2011-06-27 12:12:50 -07:00
Raphael Sofaer
b2f7ff5dd4
Fix notifications.
2011-06-26 21:59:04 -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
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
danielgrippi
15571ecff0
render ASPhoto show page just like status message show for now
2011-06-23 15:47:59 -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
Raphael Sofaer
40560680fe
Title on sessions#new
2011-06-22 18:57:02 -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
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
2a4932ea34
WIP verifying sig in the pre-registration endpoint
2011-06-13 22:57:56 -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
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
Raphael Sofaer
d9d66a5c31
WIP auth form and more oauth stuff
2011-06-08 11:55:11 -07: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
753be12a1f
Don't force a query on like count
2011-06-05 00:32:10 -07:00
Maxwell Salzberg
4b13c83de7
Chubbies now uses sqlite to have tables of pods and users
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
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
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
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
Sebastian
ea85daadc4
Added UsersController#confirm_email with route and some 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
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
42f5f7fc32
fixed find person by handle
2011-05-29 21:27:20 +02: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
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
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
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
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
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
MrZYX
07395fb2c9
added maxlength attribute to aspect name input, fixed #675
2011-05-22 13:50:44 +02: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
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -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
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
41e1d0dd86
show photos from cubbies in the streams
2011-05-19 11:57:06 -07:00
Ilya Zhitomirskiy
6cda0bf9ea
Revert "added a podwide email preference"
...
This reverts commit 60c0a9839b
2011-05-18 10:38:45 -07: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
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02: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
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
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -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
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
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
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
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
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
=
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
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
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
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
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
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -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
5afe5f667e
Move js out of notifications index, fix reference to notifications badge
2011-04-12 17:15:02 -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
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02: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
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
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
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
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
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
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
f98a4ee42c
correct links to atom feed
2011-04-02 17:35:23 +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
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
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
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
danielgrippi
5fa2a7a6f3
use popState in message inbox
2011-03-30 16:22:25 -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
Raphael Sofaer
75354c1aba
fix error on mobite status message show
2011-03-30 12:51:02 -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
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
danielgrippi
aa4c20e404
pass post to comments partial. use sql in raw_visible_posts
2011-03-29 17:31:57 -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
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
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
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
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +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
Raphael Sofaer
aed190dc6d
cucumber for comment retractions, modified views
2011-03-25 16:26:03 -07:00
maxwell
310f529914
dumb api console
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
zhitomirskiyi
1cfba68416
this should fix the getting started, going to test on staging first
2011-03-23 11:05:04 -07:00
danielgrippi
b9b9d7e07d
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
2011-03-23 10:29:34 -07:00
danielgrippi
0cab18d5aa
autofocus username on login page
2011-03-22 17:43:11 -07:00
danielgrippi
fe44ee8230
fix tab order in publisher; removed 'to mention...' text
2011-03-22 17:29:03 -07:00
danielgrippi
2b8b824230
fixed private mention popup in firefox
2011-03-22 17:25:32 -07:00
danielgrippi
a44ca157e6
added text to private message notification; user picture in popup
2011-03-22 17:14:37 -07:00
MrZYX
643a066691
moar translatable
2011-03-22 22:45:36 +01:00
Sarah Mei
631163ec02
"Add contact" buttons on tag page are smaller and don't appear on top of names.
...
Moved some logic from view into user model.
2011-03-22 13:16:58 -07:00
maxwell
a036a8035f
add a plaintext layout for emails, and include a link to change your email settings in the emails
2011-03-22 12:26:38 -07:00
danielgrippi
728d0537cb
comment out likes just in the views for now
2011-03-22 10:53:46 -07:00
MrZYX
deff67f486
fixed a translation
2011-03-22 13:47:44 +01:00
Raphael Sofaer
2b997e70c2
Refactor image processing to use 2 uploaders. Federation and s3 need testing
2011-03-21 16:40:53 -07:00
zhitomirskiyi
4517c7c1b1
move service icons to right on publisher. swap out RSS for world icon
2011-03-21 16:23:27 -07:00
zhitomirskiyi
058b74846a
removed the bring your friends message from the stream
2011-03-21 15:23:34 -07:00
zhitomirskiyi
821703f4d4
fixed url. photo
2011-03-21 14:56:50 -07:00
zhitomirskiyi
93d69c4ec7
fixed the views for the friend finder
2011-03-21 14:56:50 -07:00
zhitomirskiyi
aa5bef0c3f
calls the job on login does a sync call if the cache friends was not called before, fixed the views
2011-03-21 14:56:50 -07:00
zhitomirskiyi
dcc80d5b43
almost done, need to figure out how whats the deal with the controller not being called
2011-03-21 14:56:50 -07:00
MrZYX
a2715ca963
fixed migration naming, fixed translation
2011-03-20 23:00:56 +01:00
MrZYX
1b1a23aa8f
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
2011-03-20 18:10:58 +01:00
Sarah Mei
0b1fa4d014
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
2011-03-19 20:53:55 -07:00
Sarah Mei
c1bf68068f
Pull relationship action button from search results out into a partial.
...
Copyedit messages.
2011-03-19 15:59:56 -07:00
MrZYX
a05c9b0010
fixed a translation, keep up the new format in en.yml, set pagination labels in application controller
2011-03-19 14:04:11 +01:00
danielgrippi
3db11cf38d
PostsController#index -> TagsController#show
2011-03-18 20:57:39 -07:00
zhitomirskiyi
379f242a1f
removed the mention_popup class inless in profile
2011-03-17 16:29:04 -07:00
maxwell
562c0d40ac
profile tags now federate
2011-03-17 16:28:17 -07:00
maxwell
b2c0cfb173
remove stray br in stream_element
2011-03-17 15:24:00 -07:00
zhitomirskiyi
43fc2c4d63
fixed the style on the share with list element
2011-03-17 15:19:12 -07:00
zhitomirskiyi
2b6165d8ea
wip
2011-03-17 14:32:07 -07:00
zhitomirskiyi
433db9fc8b
wip, still need to auto hide, and expand on click the contact setting, styling, also would be nice to cache the friend list, and maybe on login queue up a job to refresh it
2011-03-17 14:32:06 -07:00
maxwell
1de52d3ba2
fixed failing cucumber
2011-03-17 13:59:53 -07:00
maxwell
14ff1e0143
ms dg improved styling, fixed delete
2011-03-17 13:59:53 -07:00
maxwell
7ba90a5a98
stuff works
2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f
there is a job to process photos and it is called from the controller
2011-03-17 13:59:53 -07:00
maxwell
516b620148
gif and delayed processing wip
2011-03-17 13:59:53 -07:00
MrZYX
149b1832fd
added newline to stream element partial, otherwise timeago & comment won't display if aspect badge is too big
2011-03-17 20:51:08 +01:00
zhitomirskiyi
574a3b45b1
made it flash the sm on the profile page
2011-03-17 11:54:13 -07:00
MrZYX
78eebc8920
fixed #935
2011-03-17 16:59:02 +01:00
MrZYX
a78710690a
moar translations
2011-03-17 15:11:24 +01:00
zhitomirskiyi
6a33ae7795
fixed the css, added a space
2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e
moved the fixture to the right place
2011-03-16 18:10:50 -07:00
danielgrippi
e9c094fc2f
add styling on tag header
2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f
add a people count on tag page
2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
MrZYX
e7b4d4e494
the build was failing for a reason
2011-03-16 15:40:56 +01:00
danielgrippi
20b5ca7570
added tag helper text on profile, edit on hover
2011-03-15 22:10:20 -07:00
danielgrippi
4943531013
Add stream class to side_stream
2011-03-15 15:20:02 -07:00
danielgrippi
67de069469
Inline the person partial on posts index
2011-03-15 15:13:43 -07:00
danielgrippi
be42ccfa16
Be less glib
2011-03-15 15:03:20 -07:00
MrZYX
4e4e4d763a
fixed translations
2011-03-15 21:58:15 +01:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb
a user can put tags in their profile and they show up on the person/show page.
2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d
breaking out Diaspora::Taggable wip
2011-03-15 13:21:36 -07:00
MrZYX
73f852c6c2
fixed video embedding in comments
2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a
fixed some 500 on mobile site
2011-03-15 17:02:04 +01:00
MrZYX
cf66e3aebb
fixed test in invitation email
2011-03-15 16:25:47 +01:00
Ritchie Wilson
81661d61fc
changes the 'You are not sharing with...' button to static text instead of inserting the persons name
2011-03-15 10:00:15 -04:00
maxwell
2e72fc09c6
made 3+ plus collapse in notifications index
2011-03-14 18:09:51 -07:00
Raphael Sofaer
1b0445563e
Specs passing with text
2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408
Changing message to text, partway done, deleted data conversion
2011-03-14 11:39:31 -07:00
maxwell
adbd23ec50
more tests for mailing. the bug was i think we have to restart the resque workers
2011-03-14 11:32:59 -07:00
maxwell
28fc093a01
fix bug in user edit mailer view
2011-03-14 11:32:59 -07:00
maxwell
d91fda656c
Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious"
...
This reverts commit ab997e2d21
2011-03-14 09:51:06 -07:00
MrZYX
2a5d41cc82
fixed translations for comments
2011-03-13 21:16:43 +01:00
MrZYX
ed8d4db3a8
some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones
2011-03-12 03:27:28 +01:00
maxwell
ab997e2d21
js hack to see bigger version of photo thumbnails in the stream without being abnoxious
2011-03-11 17:16:43 -08:00
maxwell
50d9d76562
update translations for email settings, and missing translation for aspect#new
2011-03-11 16:02:24 -08:00
maxwell
e9a843b095
email prefs are now saved. need more tests and use it in user#mail
2011-03-11 15:42:53 -08:00
MrZYX
e3c5e7ba05
person -> author in app/views/comments/_comment.mobile.haml
2011-03-11 16:20:05 +01:00
Michael Nutt
c7362707b3
fix js error; stream ajax success handler should expect json
2011-03-11 00:31:43 -05:00
maxwell
ffa6b9879f
added default development page so it doesnt look so terrible
2011-03-10 20:31:39 -08:00
danielgrippi
54130b49b7
Revert "fix a few invalid html tags"
...
This reverts commit 004d9b5028
2011-03-10 19:42:37 -08:00
Michael Nutt
004d9b5028
fix a few invalid html tags
2011-03-10 22:18:40 -05:00
Raphael Sofaer
b86098055e
Add tag search on public page
2011-03-10 18:37:45 -08:00
Dan Hansen
c9545920f8
title on landing page
2011-03-10 18:40:54 -06:00
danielgrippi
2cf0503310
put text below photo in stream
2011-03-10 15:28:44 -08:00
danielgrippi
1f3261b2ef
make photos larger in the stream
2011-03-10 15:17:41 -08:00
Raphael Sofaer
8f929d2b85
Show local public posts in /p
2011-03-10 14:41:03 -08:00
Michael Nutt
8837632dd9
User should be able to comment on their own photo
2011-03-10 16:42:07 -05:00
Raphael Sofaer
ddbd5febb3
Make people pages publicly accessible
2011-03-10 12:55:05 -08:00
Raphael Sofaer
584684560e
Make conversation delete clearer
2011-03-09 17:58:29 -08:00
MrZYX
dc7a672d9f
fixed some translations
2011-03-09 22:46:58 +01:00
danielgrippi
ee6932a3f7
added title to padlock on aspect edit pane
2011-03-09 12:15:23 -08:00
danielgrippi
d0569fb881
simplified functionality on aspect edit faceboxes
2011-03-09 12:00:49 -08:00
MrZYX
5631e45b6d
--amend
2011-03-09 15:49:16 +01:00
MrZYX
0d1133cd51
fixed some translations
...
do not escape html in private_message text only email
2011-03-09 15:33:46 +01:00
zhitomirskiyi
c697df4b5a
markdownafy the private message text
2011-03-08 23:12:04 -08:00
danielgrippi
dda477410d
use conversations_url() with a param in private message emails
2011-03-08 22:11:34 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
danielgrippi
ac738df8f5
added missing translation
2011-03-08 19:22:49 -08:00
zhitomirskiyi
c252cfa025
added the email notification, the notification is not persisted, fixed the receive callback spec
2011-03-08 18:24:56 -08:00
danielgrippi
d38e3a6b29
added translations to all conversation/message views. tweaked css
2011-03-08 15:51:46 -08:00
zhitomirskiyi
84198e4750
Merge branch 'private_messages' of github.com:diaspora/diaspora into private_messages
2011-03-08 11:57:49 -08:00
MrZYX
5f841b9add
do not escape html in text only emails
2011-03-08 20:45:02 +01:00
danielgrippi
78e30ff459
update unread count in conversation visibility when hitting conversationscontroller#show
2011-03-08 11:43:58 -08:00
MrZYX
7b5b980095
link to public feed of the person on the profile person show page instead of to the one of current_user
...
fixed #700
fixed #864
fixed #774
2011-03-08 20:30:48 +01:00
zhitomirskiyi
8bcf1b49c7
notifier for the messages, we're so close
2011-03-08 10:53:49 -08:00
danielgrippi
fb5e5cc341
cleaned up new message facebox
2011-03-07 20:14:22 -08:00
danielgrippi
fca5310c77
dispatch the conversation in ConversationsController
2011-03-07 17:54:25 -08:00
Raphael Sofaer
b7c3f93d25
Use delegation in PostFake, use render => :collection in stream
2011-03-07 12:20:46 -08:00
danielgrippi
97aff09140
added autocomplete on message 'to' field, minor css tweaks to inbox
2011-03-07 11:22:59 -08:00
Raphael Sofaer
a45f46828a
re-enable commenting box on show page without comments, but it looks kind of ugly
2011-03-07 10:18:50 -08:00
danielgrippi
8fafc48d32
more private message wip.
2011-03-04 18:17:49 -08:00
danielgrippi
d50863cc90
added the ability to message someone from their profile page
2011-03-04 11:28:09 -08:00
danielgrippi
5f55dfa1bc
private message inbox wip
2011-03-03 17:32:26 -08:00
Raphael Sofaer
eb9705c82d
Adjust batch invite text
2011-03-03 17:23:20 -08:00
MrZYX
f0ba62be59
replaced ▼ with ▼, this fixes #904 and shouldn't harm anything.
2011-03-03 21:32:44 +01:00
Raphael Sofaer
3d0831f2b2
Merge remote branch 'mnutt/photo_upload_status'
2011-03-03 11:43:16 -08:00
Raphael Sofaer
da12954d22
Move statusmessage create view out to partial
2011-03-03 11:10:44 -08:00
zhitomirskiyi
2522ab7ee4
refactoring the conversation views, wip
2011-03-03 10:39:32 -08:00
zhitomirskiyi
9d7611f8d8
addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling
2011-03-02 12:27:57 -08:00
Raphael Sofaer
770091e82b
Don't retrieve all the user's contacts again unnecessarily
2011-03-02 12:11:25 -08:00
Sarah Mei
ba6afa50e8
Removing extra csrf tag. Thx feanor12.
2011-03-01 22:25:05 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0
Delete statistic and data point models
2011-03-01 16:54:12 -08:00
danielvincent
11309574cf
messages are now relayable, a comment has an author as opposed to a person.
2011-03-01 12:39:42 -08:00
danielvincent
1072806d8f
PrivateMessage -> Conversation, Message.
2011-03-01 12:25:55 -08:00
danielvincent
979d9d7fb4
added delete actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
c5801ffb37
basic views / controller actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881
added PrivateMessage and PrivateMessageVisibility models and migrations
2011-03-01 12:14:31 -08:00
Michael Nutt
208a47162c
add onAllComplete event to fileupload.js; hide mention helper during upload
2011-02-27 12:44:56 -05:00
Michael Nutt
b6dc32959c
place thumbnails inside status message form and add spacing
2011-02-27 02:04:43 -05:00
zhitomirskiyi
ec93faa2c4
added the post to services icon on every page added a manage icon and moved the RSS link to the public explain
2011-02-24 17:31:54 -08:00
zhitomirskiyi
adfcc59631
can now select individual services to be added
2011-02-24 17:31:54 -08:00
zhitomirskiyi
e61cc2fd34
made the postzord take the services in individually
2011-02-24 17:31:54 -08:00
maxwell
eb9a943724
parinoid checks for admin page thx dangold
2011-02-22 15:43:10 -08:00
Dan Hansen
9ef6606f80
load jquery from google only if local copy fails
2011-02-22 13:41:05 -06:00
Dan Hansen
e04685e7ab
remove unused javascript that's in a view
2011-02-21 23:25:38 -06:00
Sarah Mei
49adf5034f
Revert javascript move
2011-02-20 20:05:40 -08:00
danielvincent
3d6d742def
move js to body bottom
2011-02-20 16:31:06 -05:00
MrZYX
da244f8438
reintroduced remember me on the login page
2011-02-20 21:49:08 +01:00
MrZYX
ab706f4127
fixed sort by css for languages different from english
2011-02-20 19:00:13 +01:00
MrZYX
77cac72ed5
fixed #306
2011-02-20 13:34:22 +01:00
MrZYX
2b625c468a
Merge branch '874-wrong-time-ago-on-notifications' of https://github.com/grzuy/diaspora
2011-02-20 13:03:33 +01:00
MrZYX
af14fa76a1
fixed #881
2011-02-20 13:00:30 +01:00
Gonzalo Rodriguez
ea3b719253
Fixed notifications time-ago calculation
2011-02-20 05:13:34 -02:00
MrZYX
aa6ac41d68
remeber sort order
2011-02-19 17:06:26 +01:00
MrZYX
11f95ee596
fixed broken css for other languages at account settings page
2011-02-19 14:27:45 +01:00
MrZYX
124ac738ea
'sort by:'translatable
2011-02-19 11:39:28 +01:00
zhitomirskiyi
199d5fbdc1
the alt text now displays the correct number of contacts in an aspect
2011-02-18 17:44:47 -08:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
maxwell
43f17b3ed8
made toggle for post time on aspects#index
2011-02-18 16:47:44 -08:00
maxwell
3c8a87783f
stream order can take created at to be sorted by origin post time
2011-02-18 16:07:22 -08:00
maxwell
0bf3cae54a
MS IZ added spec from admin page, moved it to its own controller where it belongs
2011-02-18 11:35:24 -08:00
maxwell
2540c5adb9
adding person and profile to show
2011-02-17 18:15:35 -08:00
zhitomirskiyi
23754ec3fb
added the files
2011-02-17 18:05:21 -08:00
zhitomirskiyi
16b7ec3990
pulled out share_with to be contact new and contact show
2011-02-17 18:05:21 -08:00
zhitomirskiyi
1e6bf9c80e
MS IZ the cucumber now passes
2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b
iz ms wip fixing contactController destroy
2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
2011-02-17 18:05:21 -08:00
maxwell
6858e2e543
crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging
2011-02-17 18:00:59 -08:00
danielvincent
fc9d9a4c55
make the invite friends dialog more obvious
2011-02-17 15:58:37 -05:00
Gonzalo Rodriguez
11e431f640
Add flash message above the login form
2011-02-16 23:37:28 -02:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
MrZYX
f7de3a216a
fixed a translation
2011-02-15 15:02:36 +01:00
MrZYX
fbaf9d6e84
fixed translation in request accepted mail
2011-02-14 21:50:38 +01:00
danielvincent
164fe1c1b5
adjust column width, leading, serifs, etc. in stream for better readability.
2011-02-13 15:27:14 -08:00
MrZYX
965f4e2ea5
another weired case where a photo can have a .status_message_id but no .status_message
2011-02-13 21:08:32 +01:00
David Morley
6df0a25327
fix link to facebox
2011-02-12 14:57:35 -08:00
MrZYX
a572637e4c
fix a translation
2011-02-12 18:06:56 +01:00
maxwell
2784f641ba
fix 500 when viewing a nonexsitaint status message
2011-02-11 18:13:01 -08:00
zhitomirskiyi
ea3afa6720
added the mention explanation text
2011-02-11 17:31:23 -08:00
zhitomirskiyi
9f239789b9
can remote the person from the last aspect from edit contact pane
2011-02-11 12:58:01 -08:00
Raphael Sofaer
cb73922a26
Take extra / out of view, thanks NPerry
2011-02-11 11:23:32 -08:00
Raphael Sofaer
b413513999
Merge remote branch 'rtzn/master'
2011-02-11 11:13:01 -08:00
zhitomirskiyi
6441977a7c
added the post author name to the text also commented email
2011-02-11 10:31:20 -08:00
maxwell
a27b1b2648
make the mention in html email not a link
2011-02-10 14:43:23 -08:00
zhitomirskiyi
717d2e09c9
fixed the translation in the email
2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
Raphael Sofaer
a307519e94
Put avatar on cmment form all the time, fix socketed comment form
2011-02-10 11:05:12 -08:00
zhitomirskiyi
1296dde15b
this should speed up the finder
2011-02-09 22:39:13 -08:00
zhitomirskiyi
1da965616b
added an option to remove a contact from the last aspect, after a prompt
2011-02-09 17:47:27 -08:00
Raphael Sofaer
056bebd4f4
Autocompletion contacts now change with changing aspect selection
2011-02-09 16:07:25 -08:00
Raphael Sofaer
c11ffe93c0
Actually close the publisher on and with Publisher.close()
2011-02-09 16:07:25 -08:00
Raphael Jedidiah Sofaer
150f676332
Do a bunch of work on publisher autocompletion JS
2011-02-09 16:07:23 -08:00
MrZYX
4328f72bfb
fixed piwik
2011-02-09 19:37:05 +01:00
Nicolas Berens
60b08b9b08
Merge remote branch 'upstream/master'
2011-02-09 06:56:07 +01:00
zhitomirskiyi
41d21c78ef
mend
2011-02-08 18:53:18 -08:00
zhitomirskiyi
6be63b88f0
added the pending request to the finder
2011-02-08 18:53:18 -08:00
danielvincent
80117d8ab6
added piwik and ga options to mobile layout
2011-02-08 17:39:41 -08:00
zhitomirskiyi
eecf1d5d82
fixed cucumber, localization, and css
2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
zhitomirskiyi
a398184081
WIP
2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421
translating the warning about removing the person from the last aspect
2011-02-08 15:44:12 -08:00
Nicolas Berens
024ecc1752
Fixed small layout glitch
2011-02-08 17:11:09 +01:00
danielvincent
151999c582
reference the right thing in mobile views
2011-02-06 23:49:22 -08:00
danielvincent
01cfeb65b2
fixed build
2011-02-06 23:42:01 -08:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
danielvincent
42993de739
added back to comments; avatar.
2011-02-06 09:26:24 -08:00
zhitomirskiyi
c2d26e21c3
added a mobile invitation acceptance view, skipping getting started for now
2011-02-05 20:19:47 -08:00
zhitomirskiyi
80da5917fa
gave more space to the already invited span
2011-02-05 15:56:08 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
maxwell
ce010c24ec
update jquery mobile to a3
2011-02-03 20:41:38 -08:00
maxwell
ee02a073cd
toggle mobile site, when mobile device
2011-02-03 18:43:56 -08:00
maxwell
1ed737c3b9
make aspects a link, and remove a big db query from the view
2011-02-03 16:15:51 -08:00
zhitomirskiyi
d905021252
comment emails have text
2011-02-03 13:07:26 -08:00
danielvincent
8269e4b300
touched up photo show and status message show pages
2011-02-03 13:05:25 -08:00
Sarah Mei
e7cf5fc841
Fix/expand cucumber feature for new user signup.
...
Replace "wait for aspects page"-type steps with general wait for step.
2011-02-02 17:17:00 -08:00
Raphael
cd8d9989cf
Refactor publisher JS, use hidden field for submitting
2011-02-02 14:27:14 -08:00
maxwell
34a0abe0c8
fix 500 on mobile notifications page
2011-02-02 13:14:34 -08:00
Raphael
3fb6b0e072
Fix saved state cucumber feature
2011-02-02 11:52:56 -08:00
danielvincent
693ad112ba
stream element sockets in non-mobile
2011-02-02 11:29:37 -08:00
Dan Hansen
82db655a56
make the markup between _comment and _stream_element more consistent, fix embedder in comments
2011-02-02 12:55:16 -06:00
maxwell
67ed035f21
make notifications updated_at rather than created at
2011-02-01 21:45:36 -08:00
Raphael
cfd6639f4d
Revert "Merge branch 'open-aspects'"
...
This reverts commit 181bd823c42c3ed2ab73
2011-02-01 13:15:20 -08:00
zhitomirskiyi
bc058332d3
commented on post email now includes the comment
2011-02-01 12:54:05 -08:00
zhitomirskiyi
27f1231479
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4
Merge branch 'open-aspects'
2011-02-01 12:10:12 -08:00
zhitomirskiyi
55403d9bea
the saved aspects works properly now
2011-02-01 12:07:18 -08:00
Raphael
7d18e2bcd8
Finish autocomplete
2011-02-01 11:56:56 -08:00
Raphael
518642d0d7
Move image_url defaulting logic into profile
2011-02-01 11:56:56 -08:00
Dan Hansen
cdb5cf37e7
show publisher if it was closed when you select another aspect
2011-02-01 00:40:11 -06:00
Raphael
c56eaadfa0
Make person profile a little bit aware of an incoming request
2011-01-31 15:47:01 -08:00
Raphael
e3a5102624
incoming request on person show should just link to share_with
2011-01-31 15:28:43 -08:00
Raphael
906de27922
Make notifications/read_all non-ajax, link back to index page
2011-01-31 15:28:43 -08:00
zhitomirskiyi
d6ab633e2c
Merge branch 'notification-migration'
2011-01-31 14:41:15 -08:00
MrZYX
391a9b0de5
translate contacts in _header.haml
2011-01-31 19:48:36 +01:00
zhitomirskiyi
cfef9a747e
all green
2011-01-30 20:10:34 -08:00
zhitomirskiyi
17a2c9e311
moving over some code migration successful
2011-01-29 23:34:11 -08:00
maxwell
348ae0b61d
small hack to add some feedback when links are tapped on the mobile site.
2011-01-29 18:42:50 -08:00
Dan Hansen
b89a59ca55
update timeago usages
2011-01-29 13:30:32 -08:00
Dan Hansen
0831ad6e40
move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper
2011-01-29 13:29:54 -08:00
Dan Hansen
3078156dbb
javascript i18n wip
2011-01-29 13:28:43 -08:00
danielvincent
e3f4ae1cc7
fixed button styling
2011-01-28 17:42:04 -08:00
Raphael
07850c7cb2
fix fb finder, flesh out test
2011-01-28 17:13:20 -08:00
Raphael
8151f3b540
correct partial name
2011-01-28 16:54:30 -08:00
Raphael
7339e46bfb
Moving remote friend view out to a partial
2011-01-28 16:42:43 -08:00
zhitomirskiyi
a8ac403e30
share with action for people who are already on diaspora
2011-01-28 16:37:11 -08:00
Raphael
767e58bf94
Correct email picture url
2011-01-28 11:43:15 -08:00
zhitomirskiyi
ced2c18da1
remove caching the footer due to localization issues
2011-01-27 14:17:50 -08:00
zhitomirskiyi
f5ad03f5d9
added visiblity for new aspect on getting started
2011-01-27 13:58:59 -08:00
zhitomirskiyi
897786bce4
able to send email invites if the pod is not fb connected
2011-01-27 13:53:53 -08:00
zhitomirskiyi
3ebda174fb
make aspect list visible option on new_aspect pane
2011-01-27 13:41:23 -08:00
zhitomirskiyi
dcf6469ded
visible contacts option on aspect edit pane
2011-01-27 13:41:22 -08:00
Raphael
94ae7a678b
Placeholder views for contacts_visible in aspects
2011-01-27 13:41:22 -08:00
Raphael
31e4683183
Finished contacts of contacts for local users
2011-01-27 13:41:22 -08:00
MrZYX
86ab893a63
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-27 21:04:12 +01:00
MrZYX
cbfefc8fc3
fixed some untranslatable strings, thanks to Nygu
2011-01-27 21:04:03 +01:00
zhitomirskiyi
0fa0b7e950
fixed syntax error in mobile layout. removed ipad from mobile_fu
2011-01-27 11:30:15 -08:00
MrZYX
14f4e1aa57
some fixes to the translations of the mobile site
2011-01-27 18:20:25 +01:00
MrZYX
eba99c84ba
made 'mark all as read' translatable
2011-01-27 17:13:27 +01:00
zhitomirskiyi
0ba9889025
removed bug in finder view
2011-01-26 18:50:02 -08:00
zhitomirskiyi
2b8635f0aa
hide share request button for people already on diaspora in friend finder (for now)
2011-01-26 18:44:17 -08:00
zhitomirskiyi
4fb271b3bb
removed the aspect settings
2011-01-26 18:42:57 -08:00
zhitomirskiyi
1bb5f9f983
only allow invites if invite count > 0 for current user
2011-01-26 18:08:57 -08:00
zhitomirskiyi
bc81154c46
consolidated invite/invite friends sections on aspect/index
2011-01-26 18:05:42 -08:00
zhitomirskiyi
9bd6b11ddf
made facebox wider, remove disable with, added default profile photo for those not connected to diaspora
2011-01-26 17:50:49 -08:00
zhitomirskiyi
8941448866
placed friend finder in facebox. added translations
2011-01-26 17:44:40 -08:00
zhitomirskiyi
a610618057
display resend link if already sent invitation in friend finder
2011-01-26 16:57:39 -08:00
zhitomirskiyi
9e22f4a6e6
checks if you already invited the person
2011-01-26 16:31:34 -08:00
zhitomirskiyi
1a911a8b99
translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier)
2011-01-26 16:01:57 -08:00
zhitomirskiyi
ab41a5f24a
friend finder has invite buttons and aspect dropdowns
2011-01-26 13:03:53 -08:00
zhitomirskiyi
e56ba84094
friend finder basic styling
2011-01-26 12:16:47 -08:00
zhitomirskiyi
cf45f31712
facebook friend finder is now contact-aware
2011-01-26 12:16:47 -08:00
zhitomirskiyi
d976bf0966
fixed bug in facebook service finder
2011-01-26 12:16:46 -08:00
zhitomirskiyi
f3f38cf4fd
fetch person object associated with facebook id in friend finder
2011-01-26 12:16:46 -08:00
zhitomirskiyi
8bc52cdb55
facebook friend finder gathers fb friends.
2011-01-26 12:16:46 -08:00
Raphael
f9fbb63ecb
Make 'not sharing' a button, eliminate xss in alert
2011-01-26 11:26:14 -08:00
maxwell
4e60d2b92e
update inf. scroll; fix pagniation showing/not showing in all the wrong places
2011-01-25 17:38:29 -08:00
Raphael
d1b1db25ed
That needed to be formatted differently
2011-01-25 10:09:15 -08:00
Raphael
d288160c7f
Add link to text request_accepted email
2011-01-25 10:07:45 -08:00
maxwell
cef10c1228
added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css
2011-01-24 23:18:24 -08:00
zhitomirskiyi
2314c08265
current password requirement to change password
2011-01-24 22:39:57 -08:00
maxwell
d040de541a
fix error in stream and puts in fake
2011-01-24 19:09:38 -08:00
maxwell
bc82dac61c
make the more button work in the mobile site, also, i finally fixed the timeago stuff in the scroll
2011-01-24 19:09:37 -08:00
maxwell
8b3beba93f
adding login page to mobile, and adding timeago WIP
2011-01-24 17:36:47 -08:00
maxwell
1b3c58c2c2
Use a fake to not allocate an AR model for every reference to a person
2011-01-24 15:13:52 -08:00
zhitomirskiyi
4217aa75e0
swapped back icon in mobile header for list icon
2011-01-24 12:45:30 -08:00
zhitomirskiyi
2c230fb80d
added menu notifications page aspect name header.
2011-01-24 12:23:52 -08:00
Dan Hansen
b533d31fad
make the footer not so useless
2011-01-24 12:23:51 -08:00
danielvincent
21465c8f32
various mobile tweaks. logout link actually logs out
2011-01-24 12:22:18 -08:00
danielvincent
7ac0e9eb49
wip
2011-01-24 12:22:18 -08:00
danielvincent
383876ddf4
mobile stream sass tweaks
2011-01-24 12:22:18 -08:00
danielvincent
1631452669
added in link to search page
2011-01-24 12:22:18 -08:00
danielvincent
b983746888
force all links to not be bold.
2011-01-24 12:22:17 -08:00
danielvincent
39c5189c1f
everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge.
2011-01-24 12:22:17 -08:00
Dan Hansen
0d905a7124
i18n locale fix
2011-01-24 03:14:19 -06:00
Dan Hansen
8293016348
make the footer not so useless
2011-01-23 23:53:17 -06:00
danielvincent
c96098540b
ask a question in the publisher. (not removing previous translation & method just yet).
2011-01-23 11:06:08 -08:00
danielvincent
77042f9d47
publisher always shows textarea. outline publisher textarea in blue
2011-01-22 18:49:50 -08:00
Sarah Mei
d4cb5b8dad
Don't cache authenticity tokens
2011-01-22 15:56:31 -08:00
zhitomirskiyi
5ebd10e43f
removing photo from publisher works
2011-01-22 13:48:26 -08:00
zhitomirskiyi
b7f78335e1
mousedown and fixed sass
2011-01-22 13:48:25 -08:00
zhitomirskiyi
ff375b71cb
works need a middle stage
2011-01-22 13:48:25 -08:00
danielvincent
338e17ff87
cache login form & footer
2011-01-22 13:30:31 -08:00
MrZYX
852be182f5
made 'start sharing' translatable
2011-01-22 16:29:39 +01:00
Raphael
eea5b0a748
fix hcard link in webfinger profile
2011-01-21 15:03:11 -08:00
zhitomirskiyi
01a4327c2b
use google API instead of highcharts due to licensing
2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da
use highcharts.js for stats
2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd
getting rid of gruff and it's imagemagic deps. made graphs on stats pending.
2011-01-21 11:11:58 -08:00
zhitomirskiyi
69d6de2fe7
added views and graph generation for statistics
2011-01-21 10:29:07 -08:00
danielvincent
abfd9c355c
make login seem faster.
2011-01-20 22:55:44 -08:00
maxwell
c6a3cff644
make the recover password error message slightly more informitive for people who signed up for invites but have not yet received them yet
2011-01-20 12:48:28 -08:00
danielvincent
3d89e1f203
login page cleanup. totally simple. changed link color to something less jarring
2011-01-19 23:06:54 -08:00
Raphael
2c68bb0305
Remove n-query problem from contact_list
2011-01-19 18:06:35 -08:00
Raphael
a5b4dd2604
fix js bug, add spec
2011-01-19 16:58:01 -08:00
maxwell
cd92b1dccb
put timeago in document ready, not outside
2011-01-19 16:18:10 -08:00
Raphael
3c6dd3d721
Remove XSS in profile
2011-01-19 16:08:14 -08:00
danielvincent
4b74796c07
16 pictures on aspect listings
2011-01-19 16:06:35 -08:00
maxwell
120c07ddf5
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-19 16:04:54 -08:00
maxwell
35432880b2
adding timeago when the inf. scroll is involked
2011-01-19 16:04:46 -08:00
Raphael
f35f0212dd
Show the right contacts
2011-01-19 15:54:49 -08:00
zhitomirskiyi
122f182a4c
limit to 16 in the view
2011-01-19 15:52:52 -08:00
MrZYX
7f8ee17b40
pass @contacts to partial in aspects/index.js.erb
2011-01-19 21:09:06 +01:00
maxwell
7a02a31440
fix invitations#new, and a post spec which was mongo specific
2011-01-18 22:11:58 -08:00
zhitomirskiyi
004094d66f
fixed the querying in the controllers got rid of hashes
2011-01-18 16:21:14 -08:00
zhitomirskiyi
41c83a7e19
mousedown so that new tab opening would make notification go down
2011-01-18 10:51:05 -08:00
zhitomirskiyi
0cb9f1c0d7
focus publisher on reshare
2011-01-18 10:51:05 -08:00
Raphael
36781481bb
Pulling in changes from master
2011-01-17 11:41:15 -08:00
danielvincent
e2fdad02f1
css fixes, incl. timeago style fix on stream_element
2011-01-14 22:12:31 -08:00
Raphael
738e8c65c8
Merge almost complete, 4 failures
2011-01-14 16:00:10 -08:00
zhitomirskiyi
aba03ed5b0
added the locales for timeago
2011-01-14 11:46:38 -08:00
zhitomirskiyi
2c58630995
rails autoescapes in the link_to
2011-01-13 17:16:53 -08:00
maxwell
f97a9fa017
added timeago jquery plugin. we now need to figure out a js translation scheme
2011-01-13 16:29:13 -08:00
zhitomirskiyi
1748827f0a
photos show spec passes
2011-01-13 10:19:17 -08:00
Dan Hansen
43658b4923
only show prev/next if there is more than one photo, fixes #813
2011-01-13 01:03:37 -06:00
Dan Hansen
ce4fe1938c
remove references to fancybox, we use facebox
2011-01-13 00:24:10 -06:00
zhitomirskiyi
9b6faa5644
added a notificaions read button
2011-01-12 16:24:14 -08:00
maxwell
c832201bd9
remove trailing bracket from aspects#edit pane
2011-01-12 11:00:22 -08:00
maxwell
1661158f95
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
2011-01-12 10:47:39 -08:00
MrZYX
137cde185f
unscope contacts
2011-01-12 16:03:19 +01:00
MrZYX
1319099cf3
made some strings translatable
2011-01-12 15:58:10 +01:00
danielvincent
f2f3059d72
fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl
2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab
fixed all rspec/cucumber
2011-01-08 16:53:16 -08:00
danielvincent
6ca0b0014b
fade in aspect badges on stream
2011-01-08 15:24:03 -08:00
danielvincent
55fa1646c7
swapped out delete text for 'x' on stream_elements. controls fade in on hover
2011-01-08 15:06:25 -08:00
danielvincent
9cf1f5a023
fixed reshare with filters
2011-01-08 13:11:55 -08:00
danielvincent
cadba3f2b7
fixed specs with a reload. added header gradient for firefox
2011-01-08 13:11:55 -08:00
danielvincent
c5e0c616b5
share with pane styles fixed
2011-01-08 13:11:54 -08:00
danielvincent
98ceb1ca6b
fixups on people/show. make photos scroll over header on show pages.
2011-01-08 13:11:54 -08:00
danielvincent
c74dc120df
fixed all cucumber tests
2011-01-08 13:11:54 -08:00
danielvincent
98bcad5c59
visual fixes on people/show. contact count on aspect filters. contact list searches again.
2011-01-08 13:11:54 -08:00
danielvincent
2e472ded94
new notification/request text on aspects/index
2011-01-08 13:11:54 -08:00
danielvincent
71ca93720b
contact lists functional on aspects/index. edit panes facebox in from header
2011-01-08 13:11:53 -08:00
danielvincent
c9307305b3
collapsed aspect_listing and contact_listing on aspects/index
2011-01-08 13:11:53 -08:00
danielvincent
3ff4b67ff0
touched up stream_element and comment partial
2011-01-08 13:11:53 -08:00
danielvincent
f44b3cbe3d
contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge.
2011-01-08 13:11:53 -08:00
danielvincent
422f17a648
switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials.
2011-01-08 13:11:53 -08:00
danielvincent
e1b6f4f074
aspect filters shown selected on photo and statusmessage show pages
2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a
aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder
2011-01-08 13:11:53 -08:00
danielvincent
5358ac32a1
photos can be posted to multiple aspects. header nav works from pages other than aspect/index.
2011-01-08 13:11:52 -08:00
danielvincent
0a07dd16b5
posts are properly socketed on filtered streams
2011-01-08 13:11:52 -08:00
danielvincent
b029475421
aspects now have edit pages accessible through the top nav
2011-01-08 13:11:52 -08:00
danielvincent
44d3c4bacd
fixed inf scroll on filters issue. one spec failing in AspectsController.
2011-01-08 13:11:52 -08:00
danielvincent
d0b25814b1
publisher retains text when filtering stream
2011-01-08 13:11:52 -08:00
danielvincent
e6ae5e13e2
publisher works through ajax filters
2011-01-08 13:11:52 -08:00
danielvincent
f02c13ee73
filters are now working in ajax. inf. scroll and publisher pending ajax.
2011-01-08 13:11:52 -08:00
danielvincent
c64865d32e
header touchup
2011-01-08 13:11:51 -08:00
danielvincent
f1564d068a
pass @all_aspects as opposed to @aspects in stream
2011-01-08 13:11:51 -08:00
danielvincent
a9195d7730
aspect filters now functional on aspects/index
2011-01-08 13:11:51 -08:00
zhitomirskiyi
249b62445f
added the files
2011-01-06 16:51:34 -08:00
danielvincent
8074e481a3
stream fix on aspects/show
2011-01-06 13:51:59 -08:00
maxwell
beaeac2d42
comment out debug
2011-01-05 17:52:21 -08:00
maxwell
7ea6b4dd8d
more cleanup
2011-01-05 17:43:25 -08:00
maxwell
3fe30cde12
removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out
2011-01-05 17:43:25 -08:00
zhitomirskiyi
82852db5ec
added the files this time
2011-01-05 15:04:28 -08:00
zhitomirskiyi
2f06ec1dca
don't display notificatification badge div if there is no notification count (permalink works)
2011-01-05 10:07:22 -08:00
zhitomirskiyi
c7ecab4933
the new request email links back to the pod
2011-01-05 09:35:47 -08:00
Raphael
83d6b95c46
Merge remote branch 'nickvdb/763-notifications-paginate'
2011-01-04 16:18:46 -08:00
Raphael
8d5dc5d27b
Merge remote branch 'tomk/ui-cosmetics'
2011-01-04 16:02:11 -08:00
Raphael
6102217a88
Don't display the invitations link unless the user has invitations, thanks Pasta
2011-01-04 15:59:53 -08:00
zhitomirskiyi
20efe06ad5
capturing mousedown instead of click to handle open in other tab
2011-01-01 21:14:36 -08:00
danielvincent
055fbe3e00
stream is now a div. generalized some partial extentions for mobile site.
2011-01-01 23:09:18 -05:00
Alec Leamas
3f2d48b26e
handling http/https references
...
See discussion in c92f80b2eb
2010-12-30 23:22:43 +01:00
Thomas R. Koll
869cbdf9e9
* Localizeable "Rename aspect" button
...
* Don't list emails_delivered if there are none yet
* Don't show drag_to_add button if there are no @remote_requests
2010-12-29 17:00:08 +01:00
Nick van der Burgt
e0f583d7d3
Fixed mistake of running will_paginate on @people instead of @notifications
2010-12-29 10:51:42 +01:00
Alec Leamas
c92f80b2eb
Cleaning up some paths.
...
Handling root_url if not ending w /, using http: for all cross-site
references.
2010-12-29 10:10:26 +01:00
Sarah Mei
e2804dbbcb
Replace old references to request.from with request.sender
2010-12-28 22:56:53 -08:00
zhitomirskiyi
ddf95e2750
couple more passing cucumber stories, changed the queries on request and notification
2010-12-28 19:14:47 -08:00
Nick van der Burgt
c7f3a9abfd
Pagination for the notifications
2010-12-28 21:54:41 +01:00
Nick van der Burgt
e6127c6aa9
Included ie.js into the layout
2010-12-27 17:33:50 +01:00
Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
MrZYX
74b5281a75
Merge branch '761-aspect-name-double-escaped-in-page-title' of https://github.com/Dorian/diaspora into dorian
2010-12-26 21:44:04 +01:00
Dorian
346217ea46
Bug #761 : Aspect name double escaped in page title
2010-12-26 03:59:15 +01:00
Dorian
89ce11456a
Markdownify message in photo page
2010-12-26 03:06:19 +01:00
danielvincent
7827968b52
removing <p> from statusmessage partial
2010-12-25 19:18:42 -05:00
danielvincent
0fb102a2ec
right/left arrow keys functional on photo#show
2010-12-25 19:14:24 -05:00
danielvincent
30dd11b9fa
mark notifications as read and update badge
2010-12-25 16:27:09 -05:00
danielvincent
4ff9622bfc
notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.
2010-12-25 16:07:31 -05:00
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -08:00
zhitomirskiyi
1bc168d075
focusing a publisher on reshare
2010-12-22 09:51:50 -08:00
danielvincent
9b6d40544c
fixed _comments bug on show pages
2010-12-21 17:36:14 -08:00
danielvincent
7cb9760a1e
show comments toggle like fb
2010-12-21 16:56:32 -08:00
danielvincent
dae5906b6a
ownership render bug fixed on photoshow
2010-12-21 16:56:32 -08:00
maxwell
ec826e8c05
Revert "fix for js selector"
...
This reverts commit 0da4466da2
2010-12-21 12:56:38 -08:00
maxwell
0da4466da2
fix for js selector
2010-12-21 12:55:07 -08:00
danielvincent
a0e85dfea2
added missing translations to photo#show
2010-12-21 12:49:40 -08:00
danielvincent
a6c5f420fa
giving more pixels to photos on their show pages
2010-12-21 12:39:37 -08:00
MrZYX
e10af7fc8a
made "Notifications" translatable
2010-12-21 19:18:29 +01:00
maxwell
081e85f224
Revert "Extended sub-uri support." for now....
...
This reverts commit 9cd08bac67
2010-12-20 18:12:12 -08:00
maxwell
6d4696faf0
MS DG notifications are now pretty decent
2010-12-20 18:05:31 -08:00
maxwell
152670a72b
notification badge now in header
2010-12-20 18:05:31 -08:00
Alec Leamas
9cd08bac67
Extended sub-uri support.
...
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).
Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737 , and partially
http://joindiaspora.com/issues/391 . Ports are yet to be defined and handled
in this context.
Conflicts:
app/views/layouts/application.html.haml
config/routes.rb
2010-12-21 01:13:15 +01: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
MrZYX
b52718e913
small translation fix
2010-12-19 14:41:47 +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
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
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
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
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
maxwell
b8a0abd122
updating notification views
2010-12-16 18:07:43 -08:00
Raphael
d2199fa1eb
Profile of requestor should be visible; no outgoing request instance variable needed
2010-12-16 14:09:55 -08:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -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
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
4256ea34b6
rename aspect on the aspect show page
2010-12-15 14:15:07 -08:00
Maxwell Salzberg
555542da31
remove extra slash
2010-12-15 12:01:20 -08:00
Maxwell Salzberg
f8c2f15bb1
use the full pod_url in the template
2010-12-15 11:48:13 -08:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
danielvincent
f1ee32145d
Remove pending_requests from user, just use Request.from and Request.to.
2010-12-14 19:00:03 -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
maxwell
c38fbd27e4
prevent gifs thru getting through javascript uploader
2010-12-14 13:31:06 -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
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 2ac54eeffe3a13657087
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
Raphael
02d76441e4
Merge branch 'aspect-list-on-profile'
2010-12-13 16:12:29 -08:00
Raphael
baa04ceac7
Add aspect list to contact page
2010-12-13 15:58:08 -08:00
maxwell
42c22cedf9
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-13 14:38:47 -08:00
maxwell
8eb9ab1781
making image names more generic
2010-12-13 14:02:11 -08:00
mblog
d0355fdd43
Feature #348 : Change Email
2010-12-13 22:14:52 +01:00
maxwell
4fe42044ac
removed homepage detail into a partial, which you should redefine
2010-12-13 12:52:08 -08:00
danielvincent
68a51448e5
comment link shows up again on contact pages
2010-12-13 10:19:04 -08:00
MrZYX
6cacfde6a6
two fixes to translations
2010-12-12 15:55:51 +01:00
danielvincent
2f2f8fef8a
delete/reshare only if current_user on stream_element
2010-12-12 01:41:54 -08:00
danielvincent
f7a7dff53b
allow for newlines in profile bio
2010-12-12 00:50:30 -08:00
danielvincent
52a3996ad0
textareas auto expand
2010-12-11 22:18:03 -08:00
Raphael
627561737c
Just get rid of some whitespace
2010-12-11 20:34:25 -08:00
danielvincent
b4170dc991
badges on stream elements. say 'all aspects' instead of listing out all user's aspect names
2010-12-11 20:28:40 -08:00
MrZYX
0d70f78a12
small translation fix
2010-12-11 22:03:06 +01:00
danielvincent
c9b498d59c
resolved 500 page on getting_started#step_3
2010-12-11 12:05:58 -08:00
danielvincent
fd2cbc1cf4
added invite link to search page
2010-12-10 18:28:51 -08:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -08:00
danielvincent
8de5c5babd
fixing request bar on aspects#manage
2010-12-10 10:12:30 -08:00
MrZYX
0374ee436e
fixed untranslatable strings
2010-12-10 16:52:35 +01:00
Alec Leamas
eacee54846
Replace APP_CONFIG[:terse_pod_url] with uri object.
...
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684 ,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se ;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
danielvincent
5731f32cfe
add correct page titles
2010-12-09 20:09:20 -08:00
maxwell
a4336a8e72
moar tests for services
2010-12-09 19:29:25 -08:00
Raphael
2be0666d80
Remove query from aspects manage, correct spec in User spec
2010-12-09 19:11:47 -08:00
Raphael
778c62e0b0
Use mail css partial
2010-12-09 19:11:47 -08:00
maxwell
3625a5f2f1
display a basic message for when nothing was searched for
2010-12-09 16:51:58 -08:00
maxwell
10ca0688f5
dont show get satisfaction unless you are on joindiaspora.com
2010-12-09 16:35:31 -08:00
maxwell
b54a72c240
Revert "Revert "fixed commenting bug on current user's profile page""
...
This reverts commit 166202d0b2
2010-12-09 13:57:43 -08:00
maxwell
166202d0b2
Revert "fixed commenting bug on current user's profile page"
...
This reverts commit 8264c58e3e
2010-12-09 13:53:23 -08:00
danielvincent
8264c58e3e
fixed commenting bug on current user's profile page
2010-12-09 13:42:11 -08:00
Raphael
3a4caca397
Fix photo uploading in profile photos, style photo upload button better
2010-12-09 13:06:31 -08:00
Raphael
b8589c457d
Refactor people edit page, now using form_tag
2010-12-09 13:03:30 -08:00
danielvincent
fa9caf00ca
added tooltip text to public icon
2010-12-08 19:07:08 -08:00
danielvincent
aa628c090d
highlight public posts in the stream
2010-12-08 18:59:02 -08:00
danielvincent
cdd225c076
don't show new comment form on a non-contact's post
2010-12-08 18:23:30 -08:00
danielvincent
faf27fe05a
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 17:06:39 -08:00
danielvincent
46793179db
people#show displays shows public posts for non-contacts as well
2010-12-08 16:53:24 -08:00
maxwell
10df61a504
order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page
2010-12-08 16:35:48 -08:00
maxwell
e4e3a7493c
fixed a bug where reshare text was truncated
2010-12-08 15:09:41 -08:00
maxwell
f659ba58ef
limit the new aspect form name to be less than 20 char in the form
2010-12-08 13:58:16 -08:00
Hexagon
5c1c31b2b2
Final fix, really
2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00
Putting document.ready back
2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5
Cleaning up revert of #619 pull
2010-12-07 22:20:26 +01:00
Raphael
18319f8e42
Hopefully cut down the stream rendering time by memoizing the new comment form
2010-12-07 09:28:11 -08:00
Raphael
f421f1327c
Take nested queried out of aspects manage
2010-12-07 00:21:05 -08:00
danielvincent
d3483c1cd5
forgot to remove something...
2010-12-07 00:00:34 -08:00
danielvincent
de0ecff5b7
aspects first on home contact list.
2010-12-06 23:59:16 -08:00
Raphael
9442553504
Refactor aspectscontroller and aspect_contacts.haml
2010-12-06 17:20:21 -08:00
Raphael
14a9bc02f9
Move aspect_contacts in to aspects
2010-12-06 17:20:21 -08:00
Raphael
c034113a7c
Refactor to aspect partial
2010-12-06 17:20:21 -08:00
Raphael
32a2264af5
Refactor peoplecontroller index
2010-12-06 13:36:20 -08:00
danielvincent
460081bc2f
don't condense comments on show pages
2010-12-05 17:21:57 -08:00
MrZYX
b84b6ea9e4
some fixes to translations
2010-12-05 16:02:52 +01:00
Raphael
c320dae589
Add a cuke for being invited by someone
2010-12-05 00:15:37 -08:00
maxwell
0a8af9e72b
DG MS some fixes for getting started
2010-12-04 23:05:47 -08:00
Sarah Mei
9da69a4b01
Mobile log in form is usable. Also, added mixins for sass.
2010-12-04 20:45:52 -08:00
danielvincent
03961bce7b
removed last reference to invitation fancybox
2010-12-04 20:06:24 -08:00
Sarah Mei
fea6884acc
Mobile homepage looks decent.
2010-12-04 19:30:14 -08:00
danielvincent
c4db32c253
adding jquery 1.4.4 back re sentientwaffle's fix.
2010-12-04 18:59:01 -08:00
maxwell
e47730b63f
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 17:39:19 -08:00
danielvincent
948707ea23
rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers
2010-12-04 17:22:22 -08:00
maxwell
b9ab799569
ironing out invites
2010-12-04 16:49:45 -08:00
maxwell
b300adbef5
fixed a potentially bad bug with nil invite tokens
2010-12-04 16:13:44 -08:00
maxwell
8306cfffde
add token back to invite form
2010-12-04 16:03:35 -08:00
danielvincent
34a1a35bf1
skip getting started is not ajaxy
2010-12-04 12:06:08 -08:00
danielvincent
47b6d66b83
fixed proportions in stream, etc.
2010-12-03 23:38:29 -08:00
maxwell
94c7b86a55
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-03 19:34:12 -08:00
danielvincent
5da5ee26bb
two column aspect listing on manage page. made avatars smaller.
2010-12-03 16:22:20 -08:00
maxwell
b8ece9381a
fixing up public image show
2010-12-03 15:48:27 -08:00
maxwell
85a85716c6
made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions
2010-12-03 13:57:47 -08:00
danielvincent
7fdbc9015b
swapped new invitation lightbox for a proper page.
2010-12-03 00:57:53 -08:00
danielvincent
30668bf2e6
visual touchups
2010-12-02 23:19:30 -08:00
maxwell
579a288351
public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable
2010-12-02 18:48:50 -08:00
maxwell
38d9d75162
posts now have public permalinks
2010-12-02 18:47:48 -08:00
danielvincent
756824d072
removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec.
2010-12-02 18:42:21 -08:00
maxwell
7f5dc14726
fix dup comment showing with comments with more than three, also fixed veribage
2010-12-02 15:18:54 -08:00
Sarah Mei
c7b1fcc806
Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master
2010-12-01 22:53:58 -08:00
Sarah Mei
967fcd9a52
Revert "Added genderized variants of t() to views, controllers and helpers."
...
This reverts commit 017251fef9
2010-12-01 22:29:24 -08:00
Sarah Mei
d6e8873b64
Revert "View fixed after rebase according to latest changes."
...
This reverts commit 76edca1366
2010-12-01 22:29:04 -08:00
Dan Hansen
d76ae86180
2010-12-01 22:13:15 -08:00
Dan Hansen
f3e3e0f344
2010-12-01 22:12:57 -08:00
maxwell
e18b918676
MS DG only show three comments by default
2010-12-01 18:09:41 -08:00
danielvincent
ee47a2ffda
fixed diaspora logo asset on landing page
2010-12-01 16:18:13 -08:00
Raphael
8d853a88a3
Remove some old views, clean up routes, clean up.
2010-12-01 15:38:56 -08:00
root
5cd0a60073
Moved to it's own file, added specs
2010-12-02 02:22:05 +03:00
root
9e7d7f420f
hate text editing in nano
2010-12-02 00:57:56 +03:00
root
b1c1175c67
javascript validations for username
2010-12-02 00:54:35 +03:00
danielvincent
d392239355
removed brandongrotesque from repo, logos are now assets.
2010-12-01 11:45:54 -08:00
Raphael
ef083c6770
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-01 11:21:36 -08:00
Raphael
5791ffba79
Add administrative mail method
2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations
2010-12-01 19:13:39 +01:00
Paweł Wilk
76edca1366
View fixed after rebase according to latest changes.
2010-12-01 18:23:21 +01:00
Paweł Wilk
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +01:00
Paweł Wilk
279b08ae4a
Added inflection of nouns by the grammatical gender for some languages.
...
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
2010-12-01 17:29:04 +01:00
Josh Lubaway
ecd1d2ecd6
Bug #624 Can't unset birthday
...
This change allows users to "unset" their birthday.
Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.
Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
2010-11-30 21:23:47 -08:00
danielvincent
601284a171
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
2010-11-30 15:58:26 -08:00
Raphael
4f3d031e89
Always set translations
2010-11-30 15:58:25 -08:00
Raphael
3dc3efc103
Move aspect contacts pane js to public
2010-11-30 15:57:32 -08:00
Raphael
bfcae7fd80
Always set translations
2010-11-30 15:44:27 -08:00
Raphael
366734ca5e
Take queries out of aspect contacts pane on home page
2010-11-30 15:35:32 -08:00
Raphael
57485e7093
Move aspect contacts pane js to public
2010-11-30 13:55:37 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
Raphael
a683512e6e
Take queries out of reshare
2010-11-30 13:31:48 -08:00
danielvincent
fa66162de5
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/helpers/application_helper.rb
app/views/comments/_comment.html.haml
app/views/people/_person.html.haml
app/views/shared/_stream_element.html.haml
2010-11-30 13:19:17 -08:00
Raphael
f44b02e22c
Clean up people/person
2010-11-30 13:07:02 -08:00
Raphael
93bbfd19d2
Move back to image link helper, but static
2010-11-30 13:07:02 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Maxwell Salzberg
7bce44ef28
remove brandon from author_info
2010-11-30 12:30:36 -08:00
Raphael
b5ed2ec5b0
Actually use the photos set in the controller
2010-11-30 12:25:56 -08:00
Raphael
49e8347aa3
Use static helper for aspect links
2010-11-30 12:23:43 -08:00
Raphael
b84d2bcc56
Don't use owns? in streamelement
2010-11-30 11:58:41 -08:00
Raphael
b0522535ac
Take queries out of reshare
2010-11-30 11:43:27 -08:00
Raphael
fce428826c
Try to take photos query out of views
2010-11-29 23:41:03 -08:00
maxwell
2d3f2df1fd
dont use object_path
2010-11-29 19:57:20 -08:00
Raphael
03e3c3a202
Render comment partial with collection option
2010-11-29 17:50:30 -08:00
maxwell
17a890676e
added a link in footer to this instances code. obey the agpl yo.
2010-11-29 16:46:43 -08:00
maxwell
96776f93f9
we need this for socketing... sorry
2010-11-29 16:19:36 -08:00
maxwell
e7fb70cdd1
we need this for socketing... sorry
2010-11-29 16:00:25 -08:00
maxwell
9707c5a124
remove single comment partial for speed in rendering
2010-11-29 15:47:24 -08:00
Hexagon
b0ff8f0f60
Mini refactor, removed terse_url function
2010-11-29 23:23:51 +01:00
MrZYX
8ffa5df927
Merge branch 'master' of https://github.com/masterdot/diaspora into masterdot-master
2010-11-29 22:01:13 +01:00
Raphael
760fed7016
No need for defined?
2010-11-29 12:10:41 -08:00
masterdot
09d82fd08d
fix for intendation
2010-11-29 12:46:13 +01:00
masterdot
35feccbb2c
added support for tracking via piwik.
...
if piwik_id is not set no javascript will be included. it may be both enabled, aganalytics and piwik.
2010-11-29 10:26:47 +01:00
danielvincent
2c22941e2f
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
2010-11-28 20:16:57 -05:00
Raphael
ec6f42eaf0
Take JS out of landing page
2010-11-28 16:47:41 -08:00
Raphael
812aaae63f
Simplify stream_element partial
2010-11-28 11:31:31 -05:00
danielvincent
d7c5e12d64
move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.
2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3
Fix comments ajax response
2010-11-28 01:31:05 -05:00
danielvincent
017075e480
actually include the javascript in the view...
2010-11-28 00:36:46 -05:00
danielvincent
3ada121d0b
contact-js as its own file
2010-11-28 00:29:22 -05:00
Raphael
5b29cff56a
Take out comment rendering logging
2010-11-27 23:46:13 -05:00
Raphael
6d6b07fb92
Use form_tag, not form_for, in _new_comment
2010-11-27 23:24:29 -05:00
Raphael
68c0682ed0
Take a query out
2010-11-27 22:21:15 -05:00
Raphael
d2bfffca92
Fix PeopleController, add specs
2010-11-27 21:46:07 -05:00
Raphael
7ca124c002
Refactor views to not be so dumb.
2010-11-27 21:27:27 -05:00
Raphael
7b3aac923a
Take image_tag out
2010-11-27 18:05:47 -05:00
Raphael
8e2c74bdd2
Take out link_to for real
2010-11-27 17:28:18 -05:00
danielvincent
d65ba2f291
removing contact pictures from contact list re aspects#show
2010-11-27 17:25:40 -05:00
Raphael
c46b6d80aa
Correct math, take out link_tos
2010-11-27 17:07:35 -05:00
Raphael
49f4ec1432
comment ids in the logs
2010-11-27 16:21:40 -05:00
Raphael
be463f8f7f
Logging for comment partial rendering
2010-11-27 16:17:12 -05:00
Raphael
7030ed0fed
Putting youtube titles back into status messages
2010-11-27 11:43:24 -05:00
Hexagon
702abddce3
1900 was too far back for rails, 1904 were accepted.
2010-11-27 14:13:29 +01:00
Hexagon
033eea9f50
Fixed #550 , diaspora now support seniors up to 110
2010-11-27 14:02:42 +01:00
Hexagon
894f112b75
Removing duplicate id in layout/application
2010-11-27 10:37:04 +01:00
danielvincent
06ff5923c5
fix photos#show and status_messages#show from previous commit
2010-11-27 01:35:57 -05:00
danielvincent
a932547d12
minimizing some queries in the views. only select aspect names and ids in application controller.
2010-11-27 01:05:55 -05:00
Raphael
d5d4a08f03
Start moving youtube title getting into the post/comment flow
2010-11-27 01:00:47 -05:00
maxwell
119680d209
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-26 16:10:56 -08:00
maxwell
80f8e4d29a
removing invite partial, with a switch, and updated app_config.yml.example
2010-11-26 16:10:42 -08:00
maxwell
a507927bb3
Revert "invitations are not sent from magent queue (a problem in itself)"
...
This reverts commit 9e5eb86866
2010-11-26 16:02:57 -08:00
danielvincent
ce63e13eca
aspect ids normalized to posts to minimize queries on views.
2010-11-26 18:55:06 -05:00
maxwell
9e5eb86866
invitations are not sent from magent queue (a problem in itself)
...
Revert "Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution."
This reverts commit b9cafc0579
2010-11-26 15:52:34 -08:00
Michael Sofaer and Raphael Sofaer
b9cafc0579
Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution.
...
This reverts commit 4c96e12a31
2010-11-26 17:16:11 -05:00
maxwell
4c96e12a31
removing the form for user creation thru signup
2010-11-26 09:56:30 -08:00
Paweł Wilk
7e2e95df76
Added i18n for 'make public' message in views/shared/_publisher.haml
2010-11-26 16:09:19 +01:00
MrZYX
e916e33482
pulled and merged request 509, thanks siefca
2010-11-26 15:48:08 +01:00
MrZYX
8cc57aed82
Merge branch '597-add-i18n-to-sign-up-button' of https://github.com/siefca/diaspora into siefca-597-add-i18n-to-sign-up-button
2010-11-26 15:34:46 +01:00
Raphael
690951dcd1
Take a query out of the views
2010-11-25 23:53:45 -05:00
Michael Sofaer and Raphael Sofaer
502b4dde30
Merge branch 'invitation_flow'
2010-11-25 23:18:01 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd
Make the getting_started aspects page more like the manage page
2010-11-25 23:17:27 -05:00
danielvincent
7c6d5b8d27
cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating.
2010-11-25 23:14:45 -05:00
danielvincent
b56af997cb
comment streams rendered expanded/collapsed initially by server.
2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c
touched up aspect contact manage list, removed some unused sass.
2010-11-25 20:22:59 -05:00
Paweł Wilk
c7059a58da
Added i18n for "Sign up for invite" button.
2010-11-26 01:38:08 +01:00
Paweł Wilk
8138473b91
Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly.
2010-11-26 00:47:02 +01:00
Paweł Wilk
e1a965c2fb
Added multiple plurals for translations of 'contacts' and 'requests'.
...
- Added multiple plurals handling for .contacts token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .new_requests token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .contacts token in views/aspects/show.html.haml.
2010-11-26 00:47:02 +01:00
Sarah Mei
050918a310
Added link to manage aspects page from sidebar.
...
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
2010-11-25 10:29:35 -08:00
Sarah Mei
aa4a61870c
you can click on photos in manage aspects to see profiles
2010-11-24 22:09:14 -08:00
Raphael
eeac6901b9
Revert "Change invite button text"
...
This reverts commit d443b15c97
2010-11-24 21:01:48 -05:00
maxwell
062593ee0f
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-24 14:06:17 -08:00
maxwell
bd1cbdb297
adding drag to add people above friend accept box
2010-11-24 14:03:11 -08:00
Raphael
d443b15c97
Change invite button text
2010-11-24 16:48:24 -05:00
MrZYX
849072f283
this should fix #572
2010-11-24 17:48:47 +01:00
danielvincent
d7609ef647
fixed issue with photos#index not recognizing an already sent request.
2010-11-23 21:03:35 -08:00
danielvincent
7c6bc7f7ea
removed debug info from layout
2010-11-23 12:32:39 -08:00
danielvincent
c24150eca0
socketed posts now show up on home page. delete links are back in the stream.
2010-11-23 11:47:54 -08:00
danielvincent
efab6449b3
message for closed signups on users#sign_in
2010-11-23 11:14:26 -08:00
danielvincent
9d98afb94f
took out fade on photos#index, because it only displayed all photos half the time.
2010-11-23 09:44:58 -08:00
maxwell
dab3725a9c
hotlinking image for invite
2010-11-23 09:39:53 -08:00
MrZYX
ed3dc10f79
various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit
2010-11-23 14:02:13 +01:00
danielvincent
c9c84794af
fixed build. publisher lights up on hover on aspect#index page. updated login page text.
2010-11-23 03:10:47 -08:00
maxwell
82d0e193e7
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-23 01:17:05 -08:00
maxwell
bd31bc423f
MSSM added links to github and blog in header
2010-11-23 01:16:51 -08:00
danielvincent
376d403651
made publisher semi-hidden on home page
2010-11-23 00:34:28 -08:00
maxwell
709e348457
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/fixtures/users.yaml
2010-11-23 00:15:26 -08:00
maxwell
32390933e8
PALINDROME message for multiple emails
2010-11-23 00:14:26 -08:00
maxwell
da16e3ee1e
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
2010-11-23 00:08:30 -08:00
Dan Goldenberg
bfc1fa4da0
added getting_started text and new press logos
2010-11-22 21:07:01 -08:00
danielvincent
f725641eaf
added shadow on diaspora text on landing page.
2010-11-22 20:53:20 -08:00
danielvincent
69cac02ade
landing page fix
2010-11-22 20:35:30 -08:00
maxwell
7c09117230
fixing build
2010-11-22 19:05:35 -08:00
maxwell
0965b45f23
fixing getting started 2
2010-11-22 18:28:04 -08:00
maxwell
ffedd9fa77
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-22 17:30:00 -08:00
maxwell
b283f5c579
pulling back needed partial
2010-11-22 17:29:51 -08:00
maxwell
08aaccbdf1
Revert "--amend"
...
This reverts commit 7650870502
2010-11-22 17:11:38 -08:00
maxwell
173ec5f73b
Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
...
This reverts commit c45893d07d
2010-11-22 17:11:34 -08:00
danielvincent
c63319f127
aspect#show cleanup. added 3 icons.
2010-11-22 17:03:33 -08:00
maxwell
21a90656fd
fixing translations
2010-11-22 16:55:06 -08:00
maxwell
1adf93ace1
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-22 16:40:01 -08:00
maxwell
7650870502
--amend
2010-11-22 16:38:29 -08:00
maxwell
c45893d07d
remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar
2010-11-22 16:38:10 -08:00
Sarah Mei
bedc7ca41b
Made landing page and log in views content-type agnostic.
...
Added an un-minified version of jquery-mobile for debugging.
2010-11-22 15:02:25 -08:00
danielvincent
0e7b1f5eb7
status messages and comments made by user will ajax onto the current page, and websocket everywhere else.
2010-11-22 14:52:13 -08:00
MrZYX
e72f4e1da7
translatable status is good again
...
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
danielvincent
8c6f3bddc3
added diaspora handle to home page with help text. added email address to account settings page.
2010-11-22 11:19:50 -08:00
danielvincent
857a4b5f11
photo large is now at 300px. a person's profile photo now references the larger size instead of medium.
2010-11-22 10:32:14 -08:00
danielvincent
c7ac90538a
added some spacing between photos and text on stream
2010-11-22 01:57:51 -08:00
maxwell
cdbd9df15e
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-22 01:50:23 -08:00
maxwell
ae2b3d75c2
added some copy to the landing page, and some basic styling
2010-11-22 01:50:15 -08:00
danielvincent
108ac9fd7c
resolved stray h3 tag in stream
2010-11-22 01:31:21 -08:00
danielvincent
cb837f5fd7
moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading.
2010-11-22 01:24:04 -08:00
maxwell
5c2d161146
small changes to mobile
2010-11-22 01:19:11 -08:00
danielvincent
9a18b7e6f3
photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level.
2010-11-22 00:32:46 -08:00
maxwell
3a99ec3f8c
uploader now shows current file uploading, and progress
2010-11-21 23:44:20 -08:00
maxwell
60dd2f8e60
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-21 23:03:21 -08:00
maxwell
ce1768d0d3
fixing dropdown, and removing margin on publisher
2010-11-21 22:58:01 -08:00
danielvincent
8df864dec1
everyone -> 'all contacts' on home page. removed repeated user links.
2010-11-21 22:37:22 -08:00
Sarah Mei
218aa1c0d6
MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent
2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9
editing captions on photos uses remote forms. removed photo in album from WSR.
2010-11-21 19:51:20 -08:00
maxwell
c4a270ef8b
putting mobile interface back in so we can get it cleaned up
2010-11-21 17:14:43 -08:00
danielvincent
069b372c19
photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http.
2010-11-21 16:30:47 -08:00
danielvincent
bd0c21a634
button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.
2010-11-21 16:30:46 -08:00
danielvincent
d16a4601c2
contact list on aspect#show is ajaxy
2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2
user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.
2010-11-21 16:30:45 -08:00
maxwell
4742f61925
made the rss button a link to the feed, and aligned correctly
2010-11-21 16:13:03 -08:00
danielvincent
a9a91c436a
user menu is a button. fixed remove aspect button on aspect#show
2010-11-21 16:13:03 -08:00
maxwell
4ce337bbed
display a users username in the final step
2010-11-21 16:13:02 -08:00
maxwell
9f5ba1a1ea
added finished state to sidbar for getting started
2010-11-21 16:13:02 -08:00
danielvincent
6e603bf2af
aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts.
2010-11-21 16:13:02 -08:00
maxwell
39f596462e
saying sent on requests via js
2010-11-21 16:13:01 -08:00
maxwell
ea7bdfde28
fix validation and order of status message sent
2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6
DG MS; status messages can now have photos.
2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812
MS DG form now works reasonably well. still need to limit number of photos
2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e
added photos to status messages
2010-11-21 16:13:00 -08:00
danielvincent
f6491816a3
adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing.
2010-11-21 16:13:00 -08:00
maxwell
9471f01040
making photo uploader work better
2010-11-21 16:11:55 -08:00
maxwell
6fb1479d0d
fixed publisher...whoops
2010-11-21 16:11:55 -08:00
maxwell
7fb751b00c
making photo uploader work better
2010-11-21 16:11:55 -08:00
danielvincent
52cde14221
more touchups
2010-11-21 16:11:54 -08:00
danielvincent
2b54d9a0c5
adjusting more page structure. drafting about there.
2010-11-21 16:10:54 -08:00
danielvincent
7a259d6d53
drafted a basic structure
2010-11-21 16:09:27 -08:00
Raphael
6f0d008914
Move WebSocketReceiver out to a js file
2010-11-21 16:14:36 -05:00
Raphael
bf8190dbd5
Refactoring websocket JS
2010-11-21 15:38:24 -05:00
Raphael
53d3ac92a2
Fix WS JS
2010-11-21 14:26:07 -05:00
Raphael
4ce2de55e2
Fix photo show, js on people search page
2010-11-21 13:29:50 -05:00
Raphael
7db1da935a
Stream is a class
2010-11-21 13:21:42 -05:00
MrZYX
6f5c3f3258
made recent changes translatable and cleanup up en.yml a bit
2010-11-19 17:25:45 +01:00
Jonne Hass
f426c08dcc
made shared/_contatct_list.html.haml
...
and the type after "viewing:" in shared/_author_info.html.haml translatable
2010-11-19 17:25:05 +01:00
MrZYX
7200c007e5
made file uploader translatable
2010-11-19 15:25:14 +01:00
maxwell
466120cd58
fixing extra =
2010-11-18 20:07:57 -08:00
Raphael
bad76d8cef
Use pod url in host-meta
2010-11-18 17:02:13 -08:00
Raphael
6841ffbecc
Disable_with on comment form
2010-11-18 15:41:51 -08:00
Raphael
c7b8c185bd
Disable with on publisher form
2010-11-18 15:41:51 -08:00
zhitomirskiyi
0e171e8504
added a fixed the pending request query
2010-11-18 15:22:14 -08:00
zhitomirskiyi
c8c0b5c8a2
made the service image the same size
2010-11-18 15:22:14 -08:00
maxwell
970d56a007
basic batch inviter
2010-11-18 15:17:22 -08:00
zhitomirskiyi
f95fd33ed4
typo
2010-11-18 12:22:39 -08:00
zhitomirskiyi
9a31d15c92
added icons for the connected services and to indicate the rss feed
2010-11-18 12:19:58 -08:00
Raphael
c564d2819e
Fixing no contacts link in _no_contacts. Thanks to alepane21.
2010-11-18 11:55:03 -08:00
Raphael
589c36d1ed
Merge remote branch 'hex/duplicate-ids'
2010-11-18 11:39:03 -08:00
Matt Baker
b2e6caafed
Don't show skip link if user.getting_started == false
2010-11-18 11:16:18 -08:00
maxwell
597258615b
adding star back to title
2010-11-18 11:06:17 -08:00
maxwell
9882fa183d
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3
made mailchimp form ssl
2010-11-17 23:19:12 -08:00
danielvincent
eda346e283
use google's jquery within current protocol (http/https)
2010-11-17 22:36:01 -08:00
maxwell
5e375a30d8
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 22:06:08 -08:00
maxwell
c6778b942f
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/views/layouts/application.html.haml
2010-11-17 21:57:48 -08:00
danielvincent
558c175c2b
resolved translation issue in diaspora.en in user dropdown. second login link on landing page works.
2010-11-17 21:57:27 -08:00
maxwell
31d33054ef
added jammit, now js and css compress for production
2010-11-17 21:51:59 -08:00
danielvincent
9041a81fea
cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing
2010-11-17 21:21:00 -08:00
danielvincent
1a9041a3c0
DG MS; fixed cucumber tests to work with new landing page flow
2010-11-17 19:49:01 -08:00
danielvincent
056dc7d3ba
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
2010-11-17 19:37:08 -08:00
danielvincent
a7c1733093
firefox fixes and added links to press articles on landing page
2010-11-17 19:37:08 -08:00
danielvincent
f59f6be4b0
users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.
2010-11-17 19:37:08 -08:00
maxwell
1a279de573
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 16:18:07 -08:00
maxwell
f442c6fe3e
taking out the if true
2010-11-17 16:17:52 -08:00
Raphael
2ecf1e8b71
No name fields on invitation accept
2010-11-17 15:45:40 -08:00
maxwell
045c8f1aac
updated magent, now using my fork untill bugfix gets pulled
2010-11-17 13:49:12 -08:00
maxwell
e959e529ff
ga looks like it only likes if the code is pasted...hrmpf
2010-11-17 12:29:58 -08:00
maxwell
ba620e5400
spell vendor correctly
2010-11-17 12:25:09 -08:00
maxwell
643950cf52
added google a
2010-11-17 12:16:44 -08:00
maxwell
5561ab9cec
adding get satisfaction
2010-11-17 12:08:06 -08:00
maxwell
afc3bd63fe
added button to end of getting started
2010-11-17 11:30:22 -08:00
maxwell
6a695479f7
adding updated jquery UI for compatability
2010-11-16 23:58:16 -08:00
maxwell
f55509085a
upgraded jquery, and deleted a second version of both jqueries
2010-11-16 21:41:20 -08:00
maxwell
092f0ef7a8
invite link when you get a webfinger error
2010-11-16 19:07:19 -08:00
Raphael
ece1dc2cf9
In progress invites in _manage_aspect_contacts
2010-11-16 18:10:15 -08:00
Raphael
e2412d2e43
Add error messages for friending from aspect-manage
2010-11-16 18:00:55 -08:00
Raphael
c0414b8184
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
2010-11-16 16:18:16 -08:00
Raphael
d1a56e9ef2
Fix to websocket js
2010-11-16 14:35:46 -08:00
Alec Leamas
90b86690d9
Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4
2010-11-16 16:25:32 +01:00
Raphael
248e768846
search now sockets a person
2010-11-15 19:13:45 -08:00
zhitomirskiyi
c5ae73f96d
websocket secure params in app_config
2010-11-15 17:45:52 -08:00
Raphael
1b39b79446
Make invitation view with no inviters sensible
2010-11-15 16:35:00 -08:00
Hexagon
35095f8859
Update of sv.yml to reflect latest changes + small fix to en.yml
2010-11-15 22:28:36 +01:00
Hexagon
9f8ef8ae3b
Translation fix "Invite someone"
2010-11-15 22:28:36 +01:00
Raphael
d3098cf6bc
Add option to close registration in app_config
2010-11-15 12:15:40 -08:00
danielvincent
969c668518
translation fix on _person.haml. button tweak
2010-11-13 12:10:09 -08:00
Hexagon
958be06ff1
Removed duplicate id generation in _new_comment form
2010-11-13 13:54:48 +01:00
danielvincent
988e2afe3d
resolved missing translation, tweaked button css, commented out mobile_fu in application controller
2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
Raphael
1a5aa02c77
Removing :value => on hidden_field_tag. Thanks npouillard.
2010-11-12 14:10:49 -08:00
Raphael
1e842f1a88
Render mail css as a partial, fix spec
2010-11-12 12:26:34 -08:00
Raphael
ae9f4ab969
Refactor mail views, add a spec to make sure CSS is rendered
2010-11-12 11:47:59 -08:00
Raphael
0e8b1efefd
Merge remote branch 'MrZYX/en.yml-refactor'
2010-11-12 11:28:05 -08:00
danielvincent
716a77f0cc
fixing a refactor that broke friend requesting from the ui
2010-11-11 21:26:40 -08:00
MrZYX
5ae4248b30
some more fixes I overlooked. Sorry
2010-11-12 06:07:37 +01:00
MrZYX
f55a973685
two small fixes
2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0
just found the mailer... :)
2010-11-12 06:07:37 +01:00
MrZYX
748efb1860
eliminated senseless duplicates in en.yml
2010-11-12 06:07:36 +01:00
MrZYX
6400dc244f
fixing again. it's getting anoying
2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7
fixes to be in sync with latest commits
2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68
translated getting started, fixed #508
2010-11-12 06:06:15 +01:00
MrZYX
381c53b775
found some untranslatable strings
2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36
unscoped fill_me_out
2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6
refactored en.yml
...
removed unused keys out of en.yml
replaced some ' with "
2010-11-12 06:04:05 +01:00
danielvincent
85e2316280
Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect
2010-11-11 19:41:12 -08:00
Raphael
d62a7c4ce2
Fix request views, refactor identical forms into partial.
2010-11-10 20:12:09 -08:00
Raphael
8232a92ca0
Update _person and person show, add specs for those pages
2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb
AspectsController#manage now works if you have pending friend requests.
2010-11-10 12:05:28 -07:00
Sarah Mei
ca9331970a
Renaming image_picker to image-picker since js likes dashes better than underscores
2010-11-10 10:52:33 -07:00
maxwell
71da954a76
removing deletetion
2010-11-09 15:29:43 -08:00
maxwell
f7cc01ceb2
more work done. much more to go
2010-11-09 15:29:43 -08:00
maxwell
034d7ee2b1
first commit
2010-11-09 15:29:43 -08:00
Raphael
390fffdee6
Fix new request view
2010-11-09 15:03:56 -08:00
Raphael
6dd58fe875
Specs pass again, invitations moved to Invitation model, refactor possibly complete
2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3
Remove urls from requests, invitations are broken
2010-11-09 14:07:26 -08:00
maxwell
18505bf23c
resubmmiting object path bug. not sure how it got overwritten
2010-11-09 00:24:27 -08:00
maxwell
56c152ac6a
fixed a bug in the stream partial to use object_path
2010-11-08 21:16:46 -08:00
zhitomirskiyi
77fe7a1462
Revert "IZ local comment destroy"
...
This reverts commit cb9fb0ad94
2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94
IZ local comment destroy
2010-11-08 18:19:55 -08:00
maxwell
091d98ea15
invite friends actually calls up the invite friends pane on all aspects
2010-11-08 18:00:36 -08:00
maxwell
a84f9437b0
trying another thing to get the redirect working
2010-11-08 17:43:59 -08:00
maxwell
2162a2e3f9
collapse person's photos and status message into their profile; also, made these nested on a person
2010-11-08 15:55:58 -08:00
maxwell
7e40558dc4
reverse the years as they are displyed in the birthday dropdown
2010-11-08 10:33:05 -08:00
maxwell
80c8451bf2
fixing translation text of services page
2010-11-08 10:25:11 -08:00
maxwell
0d26348e69
remove arnold from the inviter mail form
2010-11-08 10:05:34 -08:00
danielvincent
58ce81f674
Add a person to aspect contains a searchable list as opposed to a dropdown.
2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f
people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif
2010-11-07 11:07:37 -08:00
danielvincent
a4df6a8a53
bugfix in peeople#_person partial displaying relationship status
2010-11-07 10:51:33 -08:00
danielvincent
f594fa1d80
Stream is its own partial, which takes a collection of posts
2010-11-07 10:38:00 -08:00
Sarah Mei
32d953f457
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
2010-11-06 16:50:07 -07:00
maxwell
a971985884
removed private info if you are not friends
2010-11-06 16:34:41 -07:00
danielvincent
020cd90341
aspect labels on people#show view
2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e
Post a message to aspect dialog will only display if people are present.
2010-11-05 21:14:00 -07:00
danielvincent
ddb4b2b6ee
Clicking 'make public' label on everyone publisher selects respective checkbox
2010-11-05 17:49:15 -07:00
maxwell
32ed7e3b0f
forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have
2010-11-05 17:48:33 -07:00
maxwell
1a642e044a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-05 17:43:30 -07:00
danielvincent
1a481d43d2
Use _stream_element.haml as a wrapper for posts in the stream.
2010-11-05 17:40:28 -07:00
maxwell
4a39d1a516
date now has a default nil value
2010-11-05 17:38:51 -07:00
danielvincent
9a055b6cba
Photo partial now has a description and a link to view all photos by that person.
2010-11-05 17:27:36 -07:00
maxwell
4300b20c34
cleaned up profile page a bit more
2010-11-05 14:28:39 -07:00
danielvincent
bd9aa90278
User receives notification on new comment on post on any page.
2010-11-05 14:18:22 -07:00
Raphael
4233e45bc5
Adjust wording
2010-11-05 11:23:21 -07:00
maxwell
997f9ad8d0
making profile not look so bad
2010-11-05 00:54:09 -07:00
Sarah Mei
a230763879
gender is a text field
2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7
Merge remote branch 'MrZYX/untranslated-strings'
...
Conflicts:
app/views/aspects/manage.html.haml
config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
Derrick Camerino
087f7e90d4
removing aspect in ui only if ok is clicked on confirmation
2010-11-04 19:54:11 -07:00
Raphael
abebd18c98
Move getting_started self link color to a css class
2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed
Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-04 18:56:43 -07:00
danielvincent
be916384a1
collapsed remove from aspect and remove person into one function on aspects#manage
2010-11-04 17:50:48 -07:00
Raphael
20508ad37a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-04 16:45:03 -07:00
Raphael
3634658cbf
The Governator's party has lost the election.
2010-11-04 16:44:17 -07:00
danielvincent
b74dfcf5fd
comments autolink
2010-11-04 16:18:49 -07:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000
made a bunch of strings translatable
2010-11-04 20:49:50 +01:00
MrZYX
f84b14bd19
unscope are_you_sure in photos/show.html.haml
2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
danielvincent
3e001c74d6
Albums#index hidden from views. Photos must be accessed through a person.
2010-11-03 12:21:14 -07:00
danielvincent
a31c22adb3
mailer doesn't break everything anymore. attachments are also inlined.
2010-11-02 17:59:50 -07:00
Raphael
ae039442c3
Websocket now uses cookie to authenticate
2010-11-02 17:39:50 -07:00
danielvincent
a79d1f5240
tabbing on publisher to everyone focuses submit button
2010-11-02 17:35:12 -07:00
danielvincent
a995d250f1
added white text on grey asset to mailer
2010-11-02 17:19:49 -07:00
danielvincent
da8124f8a7
hcard has searchable field, and is taken in to account when building Person from webfinger
2010-11-02 16:12:43 -07:00
danielvincent
fff43bf650
profile defaults key searchable to true. search takes searchable into account.
2010-11-02 16:12:42 -07:00
Raphael
6503cefd68
Get rid of some repeated ids, fix infieldlabels on manage page
2010-11-02 15:37:06 -07:00
Raphael
bfcb2a9e18
Remove random href
2010-11-02 12:37:32 -07:00
Raphael
a9b429d163
Merge remote branch 'ed0h/helper-method-for-markdown'
2010-11-02 12:14:41 -07:00
Raphael
8778bdab3b
Merge remote branch 'ed0h/503-language-html-tag'
2010-11-02 11:43:12 -07:00
danielvincent
a3ce5f1cd7
REMOVED IMPORTER
2010-11-02 11:17:47 -07:00
Raphael
67219248b0
unscope i18n calls
2010-11-02 10:32:34 -07:00
livefromthemoon@gmail.com
aab74cf1ff
Added markdown support for status messages
2010-11-02 03:55:14 +01:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
danielvincent
3a4f100806
remove *
2010-11-01 15:01:49 -07:00
Hexagon
1acc206fa4
#475 : Fixed more untranslated strings
2010-11-01 22:22:13 +01:00
livefromthemoon@gmail.com
2b890e6ef2
Added 'lang' attribute in the html tag
2010-11-01 21:31:12 +01:00
Raphael
07e96e5a37
Merge remote branch 'jdeisenberg/492-vague-signup-wording'
2010-10-31 23:44:50 -07:00
zhitomirskiyi
c86a3eb608
moved getting started logic to the controller
2010-10-31 19:33:11 -07:00
Sarah Mei
0817409e9a
Fixed deprecation warning
2010-10-31 17:48:38 -07:00
J David Eisenberg
f54820f456
Issue #496 : Eliminate self-links in Getting Started
2010-10-31 12:16:07 -07:00
J David Eisenberg
14ccf7229b
Issue #492 : Informal, vague description when signing up as a new user
2010-10-30 22:07:37 -07:00
Hexagon
bba3aaa684
Translating a huge amount of untranslated strings
2010-10-30 15:25:42 +02:00
danielvincent
8ec49e685b
going to a non-friend's page contains a way to add them.
2010-10-29 15:43:44 -07:00
danielvincent
f2b7e4010e
edit profile link on owner's profile page.
2010-10-29 15:02:56 -07:00
danielvincent
6eb50ea934
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad
photo uploader on edit profile page.
2010-10-29 14:11:59 -07:00
Raphael
d753e31205
Merge remote branch 'ed0h/309-user-choose-language'
...
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
2010-10-29 12:06:14 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
51dd6d32b3
upload a photo button next to publisher
2010-10-29 10:38:53 -07:00
danielvincent
1d399598d3
user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show
2010-10-29 10:38:17 -07:00
danielvincent
a7df1bca68
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
2010-10-29 10:38:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
danielvincent
d02c36b53a
quickfix in add_friend_dropdown
2010-10-28 11:30:45 -07:00
danielvincent
a0d83e28a1
copy in manage page by clicking 'add a new friend' for now
2010-10-28 11:28:58 -07:00
danielvincent
bb9a6e47a4
added birthday and gender to Profile. fixed a view issue on getting_started#2
2010-10-28 11:01:16 -07:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
danielvincent
06654b13b2
posts don't socket into services#index anymore.
2010-10-27 22:55:58 -07:00
danielvincent
dc89d984f1
put remove buttons on incoming requests, allowing a user to ignore again.
2010-10-27 18:36:15 -07:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
danielvincent
db1a753add
major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working.
2010-10-27 18:08:55 -07:00
danielvincent
05c5e770ee
removed real name from signup process.
2010-10-27 16:25:22 -07:00
danielvincent
bfb1c6df28
collapsed layout views
2010-10-27 13:33:42 -07:00
danielvincent
335bd9c96a
skip getting started button sets getting_started to false via js and redirects to root_path
2010-10-27 12:53:46 -07:00
danielvincent
cd726c0ba7
users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/
2010-10-27 12:21:25 -07:00
danielvincent
4ec11691cd
user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set.
2010-10-27 10:36:13 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
danielvincent
a8086f2990
further refinements. added back buttons, more explanation text.
2010-10-26 23:27:26 -07:00
danielvincent
f1fbb68fd8
added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward.
2010-10-26 18:35:14 -07:00
danielvincent
385e1673ab
Merge branch 'master' into getting-started
...
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
danielvincent
e62afae045
deselected tabs in top nav, made user drop down a bit clearer
2010-10-26 16:12:58 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
danielvincent
ea46fa8fd8
save and continue buttons on getting_started#1 and getting_started#2. raise fields
2010-10-26 15:03:38 -07:00
danielvincent
ec141a2019
a user can add a person to an aspect from getting_started#2
2010-10-26 13:04:47 -07:00
danielvincent
0c72257c50
aspects can be created/destroyed via ajax on getting_started#2
2010-10-26 13:04:47 -07:00
danielvincent
dd4f46c8b0
repositioning layout on getting started
2010-10-26 13:04:47 -07:00
danielvincent
69b1b71a5d
removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers).
2010-10-26 13:04:47 -07:00
danielvincent
f23d199230
added slider to getting started flow
2010-10-26 13:04:46 -07:00
danielvincent
b52afdd93c
changed account and profile partials to better reflect styling changes
2010-10-26 13:04:46 -07:00
danielvincent
31713d9597
html5 placeholder text
2010-10-26 13:04:46 -07:00
danielvincent
278a74f1f9
draft
2010-10-26 13:04:46 -07:00
zhitomirskiyi
e776389d19
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-26 11:19:50 -07:00
maxwell
a992c5fbc2
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:06:53 -07:00
danielvincent
060d8f9c7b
DG MS; fixed some bugs with posting publicly.
2010-10-25 19:24:48 -07:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7
facebook and twitter both use omniauth and are saved as OmniauthServices
2010-10-25 17:41:59 -07:00
maxwell
c489f49a25
DG beginning to collapse twitter&facebook
2010-10-25 17:41:58 -07:00
maxwell
606c7a02a4
MS DG public message now post to twitter, if connected
2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
danielvincent
7b3f6f66c1
removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.
2010-10-24 14:44:43 -07:00
danielvincent
661ad20a02
added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM.
2010-10-24 14:44:43 -07:00
danielvincent
f8347a3dd4
added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show
2010-10-23 22:21:51 -07:00
danielvincent
18acdc7b55
everyone instead of all on aspect#index page. photo partial avatar now links to poster's profile.
2010-10-23 22:01:01 -07:00
danielvincent
f5a0f44c25
fixed error in posting to all albums through publisher on albums#index
2010-10-23 00:36:29 -07:00
ilya
c27f05ed42
Initial refactor done, need to stop mapping user.friends to people so much
2010-10-22 18:11:04 -07:00
maxwell
de04e717c0
made image or default to help with hcard parsing, deleted old default user picture
2010-10-22 16:57:01 -07:00
danielvincent
c0423e5e56
reverting commit manually
2010-10-22 15:57:00 -07:00
danielvincent
829ad6360a
multiple dropzones function. person image does not copy, delete is disabled.
2010-10-22 15:56:28 -07:00
danielvincent
a52870b21c
improved animations
2010-10-22 15:56:28 -07:00
danielvincent
e1f4e12b8f
style. also, made sense of aspect-edit.js
2010-10-22 15:56:28 -07:00
danielvincent
69528b95a3
removed ignore bucket. people now have x's to delete them
2010-10-22 15:56:27 -07:00
danielvincent
b5976753ea
removed unused view
2010-10-22 15:47:22 -07:00
danielvincent
f2cfa3c378
user name in breadcrumb
2010-10-22 15:38:22 -07:00
danielvincent
ed4c253ea8
show pages now identify content with content creator. publisher now takes a local
2010-10-22 15:32:41 -07:00
ilya
9a217d1fa8
MS IZ request acceptance email
2010-10-22 11:55:50 -07:00
maxwell
20a5ec863f
small bugfixes for the mailer
2010-10-22 00:49:01 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07:00
ilya
80cd4761f3
started the new invitation email
2010-10-22 00:49:01 -07:00
ilya
e677e4782e
the handle is now in the email if only one user invited the person
2010-10-21 16:07:31 -07:00
danielvincent
8e175be2ba
fixed comments not showing up through websocket on photo show page
2010-10-20 23:40:48 -07:00
ilya
84e19f833a
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 18:30:36 -07:00
ilya
30bae4f807
throws an alert if you try to remove person from the last aspect
2010-10-20 18:30:22 -07:00
danielvincent
a1830b5d40
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 18:15:19 -07:00
danielvincent
e880a5a11f
comment submit buttons show again. further changes to show pages.
2010-10-20 18:15:07 -07:00
maxwell
bc9c852e25
fixed translation showing en on person show page when the person had no posts
2010-10-20 17:52:07 -07:00
danielvincent
183ac75c6a
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 17:35:35 -07:00
danielvincent
6d8b670150
changed show layouts for album and photos. still needs work.
2010-10-20 17:35:27 -07:00
ilya
6fa82490c9
remove friend from aspect box, with js call to remove the person from the aspect
2010-10-20 17:34:52 -07:00
ilya
ae7891194e
added links to the aspects a person is in on the show page
2010-10-20 16:57:09 -07:00
ilya
6bee872039
moved the add people into a partial
2010-10-20 15:42:03 -07:00
ilya
62700387ad
MS IZ added an add to aspect form on the request partial
2010-10-20 15:30:30 -07:00
danielvincent
d3d7131c8d
stream using data-guid for messages. view fix in photo show
2010-10-20 13:47:16 -07:00
danielvincent
e9ced7b2e6
changing photo now updates all user images in page
2010-10-20 12:35:16 -07:00
danielvincent
61122b83d0
make profile button on photo show page. (removed clean hash on usercontroller)
2010-10-20 12:19:06 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c9953fef63a9a
2010-10-20 14:59:55 +02:00
danielvincent
d2945c83dc
status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.
2010-10-20 00:02:15 -07:00
maxwell
d0055cee37
changed a bit of text in the invite, also made it show on all aspects now that we have it fixed
2010-10-19 21:07:10 -07:00
maxwell
f26dc039c9
removed empty hash from invite email
2010-10-19 20:43:45 -07:00
maxwell
bfe57b13cc
added diaspora handle to user profile page
2010-10-19 20:34:10 -07:00
maxwell
da95930c9a
added a bit to test email
2010-10-19 20:23:20 -07:00
danielvincent
d200aaab52
mail has some style. couldn't figure out devise mailer templating at the time...
2010-10-19 18:26:02 -07:00
danielvincent
8751503aa4
header on public explain fancybox
2010-10-19 16:28:45 -07:00
danielvincent
f6303b8fff
reshare dropdown looks nicer. fixed user menu to drop down on click
2010-10-19 16:16:46 -07:00
Raphael
3557d66749
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 16:07:03 -07:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
danielvincent
b218a53bf7
fancyboxes have title bars now, kind of.
2010-10-19 14:06:44 -07:00
danielvincent
0621aa2f6c
fixed no friends/posts message positioning
2010-10-19 12:28:54 -07:00
danielvincent
d87345ca33
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 12:10:36 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
Raphael
d68644c358
Resolve #387
2010-10-19 11:47:43 -07:00
Raphael
296afdc871
Beat Dan at bugfixing
2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1
Fix bug 376
2010-10-19 11:39:52 -07:00
danielvincent
7e9585c5f0
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
2010-10-19 11:29:29 -07:00
Raphael
676e802fd2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-18 15:46:44 -07:00
Raphael
b681850783
Get rid of warning/error on invites/_new partial
2010-10-18 15:46:14 -07:00
ilya
a8bf082e35
The invitation now has an optional personal message
2010-10-18 14:35:41 -07:00
Raphael
8e4691b9d0
Merge remote branch 'rmaskey/269-album-link'
2010-10-18 11:27:13 -07:00
danielvincent
4b1516542d
various. fixed publisher in new layout.
2010-10-18 11:00:52 -07:00
danielvincent
54e5fb4abb
add new aspect back on manage page. changed badges
2010-10-18 11:00:52 -07:00
danielvincent
15104cf920
somewhat there
2010-10-18 11:00:52 -07:00
danielvincent
eca37e1a28
small view cleanups
2010-10-17 21:55:03 -07:00
danielvincent
1139299f42
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
2010-10-17 20:47:51 -07:00
danielvincent
7160e9f85b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-17 10:25:38 -07:00
archi
035db98367
Added HTML links to posts
2010-10-17 02:06:46 +02:00
rmaskey
569376df00
Issue #269 : the album back link updated for aspect reference
2010-10-16 19:32:02 -04:00
rmaskey
7c99b89d43
Issue #269 : the album back link updated for aspect reference
2010-10-16 19:31:47 -04:00
romanov
2787eb0c6b
Issue #269 : the album back link updated for aspect reference
2010-10-16 19:26:46 -04:00
danielvincent
5ca3570667
added prefetch rels to prev/next links in photo show. fixed shadow bug in header
2010-10-16 02:06:46 -07:00
danielvincent
72479343bc
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-15 17:37:39 -07:00
danielvincent
7611bc1c8f
user dropdown
2010-10-15 17:37:32 -07:00
ilya
d4702aefa3
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-15 17:20:19 -07:00
ilya
9727b356e1
the invitations add requests which are now correctly auto accepted
2010-10-15 17:20:04 -07:00
maxwell
adbe5f7c38
i love foaf
2010-10-15 16:54:56 -07:00
maxwell
ca604ffe5a
added public atom discovery link
2010-10-15 16:51:37 -07:00
maxwell
f83bddadc5
forgot to add the test; and cleaned up the explain partial
2010-10-15 16:19:07 -07:00
ilya
d06c6ced38
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-15 15:30:39 -07:00
danielvincent
47be7b1f0a
correct html5 search box
2010-10-15 15:29:57 -07:00
ilya
2c9c4b0e14
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/views/invitations/_new.haml
2010-10-15 14:36:49 -07:00
danielvincent
6f282e77ff
make public checkbox
2010-10-15 14:22:28 -07:00
ilya
0074aadd48
added a select tag to email invitations
2010-10-15 14:21:08 -07:00
maxwell
e8c49feca4
made the public info link in all aspects publisher
2010-10-15 14:10:10 -07:00
maxwell
7e0825e492
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-15 13:58:40 -07:00
danielvincent
12bdd1712d
share on facebook checkbox instead of broadcast button
2010-10-15 13:56:49 -07:00
maxwell
a61c126aad
manage page now uses partial
2010-10-15 11:29:23 -07:00
maxwell
20f164fd45
fixing some of the invite copy
2010-10-15 11:11:25 -07:00
maxwell
341009e20f
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
...
Conflicts:
Gemfile
Gemfile.lock
spec/models/user/invite_spec.rb
2010-10-14 23:02:06 -07:00
ilya
b4b338b3cd
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-14 18:12:34 -07:00
ilya
4a7c4e0848
requests are made on invite but perhaps they should be made on signup so that we have a person
2010-10-14 18:12:18 -07:00
Raphael
08e629668d
I18ning empty_messages
2010-10-14 16:55:00 -07:00
maxwell
a30a2666c6
merging
2010-10-14 16:32:37 -07:00
danielvincent
45d7d54c66
added an empty message for the case of an aspect with no friends
2010-10-14 16:23:29 -07:00
danielvincent
750b4b4388
empty message re-appears if all stream posts are deleted
2010-10-14 15:40:34 -07:00
danielvincent
8daf2d0fd5
add none message to aspect#index
2010-10-14 15:23:15 -07:00
danielvincent
cf2a4c25ae
DG RS; remove empty message from stream upon adding something
2010-10-14 15:19:37 -07:00
danielvincent
5722f85c85
message in aspect if stream is empty
2010-10-14 15:00:47 -07:00
danielvincent
32a0f60a2f
moved photos link to the side bar for now
2010-10-14 14:38:19 -07:00
danielvincent
2b97e8751c
include blueprint/print.css in layout
2010-10-14 10:40:39 -07:00
danielvincent
58d5fbfb3e
moved invite link to account#edit on settings page. changed text on person partial.
2010-10-14 10:26:06 -07:00
maxwell
e218ab6780
Merge branch 'master' of github.com:diaspora/diaspora into import
...
Conflicts:
app/controllers/users_controller.rb
2010-10-13 23:09:48 -07:00
ilya
d0c6f12ea8
added another attack vector spec
2010-10-13 18:43:22 -07:00
maxwell
04f6cdaacf
MS DG; basic view support; it works, but it is ugly
2010-10-13 18:42:24 -07:00
ilya
36b9f66f60
the invited user keeps track of who invited them, limit on invites,
...
removed the invites controller test
2010-10-13 16:52:33 -07:00
ilya
3b8998ab71
Invitations contains the inviters
2010-10-13 13:29:45 -07:00
ilya
d6b08de6fc
corrected link on the account page
2010-10-11 15:07:17 -07:00
ilya
bb7e2a9918
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f
close account
2010-10-11 14:58:11 -07:00
danielvincent
be017bfb0a
DG MS; invite is now a lightbox on feed and manage pages
2010-10-11 14:16:24 -07:00
danielvincent
afad554f01
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465
Merge branch 'invites' of github.com:diaspora/diaspora into invites
2010-10-11 11:52:57 -07:00
danielvincent
82f526ea23
DG MS; added tooltip
2010-10-11 10:53:00 -07:00
danielvincent
c5affa07e8
tweaked reshare button
2010-10-08 16:19:51 -07:00
danielvincent
9ac13ccb3e
fixed reshare a bit
2010-10-08 15:47:06 -07:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
danielvincent
086df28a37
removed connected to facebook text under everyone publisher
2010-10-08 15:21:27 -07:00
danielvincent
44338a9897
removed traces of :public
2010-10-08 14:44:56 -07:00
danielvincent
526fbe9a90
fixed error where publisher would cause status_message_controller to error out
2010-10-08 14:19:54 -07:00
danielvincent
7d96c95caf
fixed breaking aspect show pages
2010-10-08 14:15:35 -07:00
danielvincent
48e92c2c33
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 14:07:05 -07:00
danielvincent
154ec95717
killed the public tab. made a broadcast button in everyone tab
2010-10-08 14:06:49 -07:00
Crimer
3754b519a7
Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'.
2010-10-08 21:51:59 +00:00
danielvincent
a3aab92212
fixed photo partial
2010-10-08 12:25:42 -07:00
danielvincent
3a876770f3
minor tweaks
2010-10-08 00:36:55 -07:00
danielvincent
5b66a191cd
more stream tweaks
2010-10-07 23:25:49 -07:00
danielvincent
b314ee22ec
intermediate misc ui polish
2010-10-07 22:51:08 -07:00
danielvincent
ed1cb5a0e7
DG MS; moved change password to account page; fixed the styling on password inputs
2010-10-07 18:52:46 -07:00
danielvincent
7a56d82873
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 16:56:22 -07:00
danielvincent
4deea95057
DG MS; export photos button in users#edit
2010-10-07 16:56:10 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
danielvincent
0ebb597b72
DG MS; test for users#export
2010-10-07 15:22:03 -07:00
Raphael
ec9e180eab
Merge branch 'master' into HEAD
...
Conflicts:
public/stylesheets/application.css
2010-10-07 13:58:06 -07:00
Raphael
d7bbb66d27
Run whitespace:cleanup
2010-10-07 10:47:37 -07:00
maxwell
c68a026658
MS changed the profile edit field to be private
2010-10-06 18:19:58 -07:00
danielvincent
6b74053e06
scratch that last commit
2010-10-05 20:37:28 -07:00
danielvincent
982f51b9c7
prepend pod_url to image paths
2010-10-05 20:31:40 -07:00
danielvincent
dc88110716
img tag in hcard
2010-10-05 20:22:13 -07:00
danielvincent
d519e46f4d
webfinger edit
2010-10-05 19:01:04 -07:00
maxwell
ec4c63ada7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 17:51:10 -07:00
maxwell
d638bdb018
MS IZ password change field is now in edit profile
2010-10-05 17:49:06 -07:00
Raphael
5847e7767d
Add profile photo url to hcard parser
2010-10-05 17:24:01 -07:00
kook
85b384010e
exchange photos on adding new friend
2010-10-05 17:18:51 -07:00
Raphael
22f90086ca
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 16:58:06 -07:00
Raphael
37fb2bfd32
Don't require a facebook yml
2010-10-05 16:57:22 -07:00
UserAd
e7c153df4e
Add translation support in profile ('or' between buttons). Fix Russian locale
2010-10-06 07:56:23 +08:00
danielvincent
c284c9b07f
added public back into webfinger
2010-10-05 13:47:42 -07:00
ilya
63cb7dcbdd
Fb friends are displayed only once
2010-10-05 13:00:42 -07:00
danielvincent
f5a57a6f4a
photo partial now has labels
2010-09-28 13:05:58 -07:00
danielvincent
e0159aaaeb
small visual tweaks
2010-09-28 12:58:34 -07:00
danielvincent
4627c5338e
found placement of all aspects tab confusing; moved it to be the first tab
2010-09-28 12:29:35 -07:00
danielvincent
263615ad14
all status messages have labels
2010-09-27 23:51:20 -07:00
danielvincent
79926da3d3
removed owner image repeat
2010-09-27 23:16:19 -07:00
danielvincent
cb7c35af73
fixed thumbnail positioning
2010-09-27 23:15:48 -07:00
danielvincent
bf587be461
public indicator tag on status message partial.
2010-09-27 22:50:11 -07:00
ilya
52313b799b
added a warning, moved connected as into a partial, removed the
...
publishing box from settings page
2010-09-27 16:31:19 -07:00
ilya
d41b370630
removing the fb feed for now
2010-09-27 16:20:27 -07:00
ilya
08b9aa864a
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
2010-09-27 15:39:50 -07:00
Dorian
e792344c0e
Use improved whitespace:scrub_gratuitous_newlines
2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04:00
Chiggins
f74b0a6f2c
Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text".
2010-09-25 08:13:16 +08:00
ilya
f38bcc9eb3
tiny change in view
2010-09-24 15:54:53 -07:00
ilya
e414558f79
passing the right things to the partial
2010-09-24 15:52:29 -07:00
ilya
c7757a302c
typo
2010-09-24 15:06:48 -07:00
ilya
ac9854596f
fb_status partial rendered in public
2010-09-24 15:04:31 -07:00
danielvincent
4f17eb4e02
stray aspect name removed from publisher
2010-09-23 20:33:34 -07:00
ilya
a594c9a34f
friends in the public bucket
2010-09-23 20:19:02 -07:00
danielvincent
265753b5fe
user edit is now divided into real sections
2010-09-23 20:13:07 -07:00
ilya
eaea26e58d
the public aspect is now set in application controller
2010-09-23 19:33:33 -07:00
ilya
796f198d8c
notification only on user page
2010-09-23 17:20:55 -07:00
ilya
11dc225311
removed the old publish box
2010-09-23 17:19:43 -07:00
ilya
75e1ddf9d2
saying going to FB in public aspect
2010-09-23 17:17:18 -07:00
ilya
4d2bd52310
public aspect param on statusMessage create and in the partial
2010-09-23 16:41:05 -07:00
Raphael
d748d456b5
Revert "fix in person partial"
...
This reverts commit 8c0bc4b9e6
2010-09-23 16:21:08 -07:00
ilya
be10681945
IZ tying the publisher to fb in public aspect
2010-09-23 16:06:55 -07:00
ilya
fc2cf4fde6
typo
2010-09-23 15:21:15 -07:00
ilya
1fdbc637d1
trying profile pictures on remote
2010-09-23 15:18:29 -07:00
ilya
19c3a5ce4b
fetching friend data
2010-09-23 15:07:07 -07:00
ilya
f0999628ae
trying to get friends from fb
2010-09-23 14:43:08 -07:00
ilya
5857838a0a
adding the new files
2010-09-23 12:29:00 -07:00
ilya
48c212c1ab
made a public view, copied the fb publisher there
2010-09-23 12:18:26 -07:00
danielvincent
af91eb51b4
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-23 10:49:41 -07:00
danielvincent
8c0bc4b9e6
fix in person partial
2010-09-23 10:49:35 -07:00
maxwell
40d736d233
MS changed the session page to show APP_CONFIG[:terse_pod_url]
2010-09-23 10:39:47 -07:00
uiri
c711e85c89
adding gif support
2010-09-24 01:10:46 +08:00
Raphael
cc3819c256
Forgot a merge conflict
2010-09-22 21:39:22 -07:00
Raphael
2489f8503f
Merge branch 'master' into HEAD
...
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
2010-09-22 21:32:03 -07:00
danielvincent
7303212784
DG IZ; haml typo
2010-09-22 17:50:47 -07:00
danielvincent
fc0350e4e1
DG IZ; user can post a status update from user edit page to facebook.
2010-09-22 17:49:11 -07:00
danielvincent
bc70ebdb95
DG IZ; quick form in user edit
2010-09-22 17:33:57 -07:00
danielvincent
ddbde60e8c
another indent...
2010-09-22 17:17:24 -07:00
danielvincent
aef3c8d7bb
indent, whoops
2010-09-22 17:16:16 -07:00
danielvincent
26478403e2
DG IZ; connecting/disconnecting from fb
2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c
DG IZ; logged in as?
2010-09-22 16:56:39 -07:00
danielvincent
fcc681df71
DG IZ moved to be APP_CONFIG for host
2010-09-22 16:32:52 -07:00
danielvincent
8ed98270a6
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
config/routes.rb
2010-09-22 16:09:25 -07:00
danielvincent
81250c0e9d
Merge branch 'master' of github.com:diaspora/diaspora into reposting
2010-09-22 15:49:13 -07:00
danielvincent
b9be543ef6
DG IZ; reshare redirects to specific page
2010-09-22 15:32:11 -07:00
danielvincent
474cf77708
DG IZ; reposting now works. redirects to a template missing page, though.
2010-09-22 15:05:51 -07:00
danielvincent
5ef32b7d55
DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial
2010-09-22 12:03:25 -07:00
Raphael
7049cb3ca4
A less efficient, but simpler way of checking whether the photo is the profile photo
2010-09-22 10:31:40 -07:00
ilya
d26e7850ac
RS, IZ; removed url from user and views
2010-09-21 15:52:26 -07:00
danielvincent
0a99b82bd3
Merge branch 'master' of github.com:diaspora/diaspora into fb
2010-09-21 13:40:17 -07:00
danielvincent
9571ade89c
basic setup
2010-09-21 12:29:39 -07:00
ilya
1882509a0b
removed the auto_link seems to fix HTML injection, no more autolinking
2010-09-21 11:59:04 -07:00
danielvincent
4d200fea87
removed view all link from status_message#show
2010-09-20 20:17:18 -07:00
Raphael
441f75203a
Add autolink and sanitize to show page
2010-09-20 17:33:05 -07:00
danielvincent
9c334e24e4
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 17:26:35 -07:00
danielvincent
e588d7ab6a
DG IZ moving friends is now ajaxy
2010-09-20 17:26:20 -07:00
maxwell
24ca139241
MS remove some stray puts
2010-09-20 17:11:07 -07:00
maxwell
e2fc48c9ff
MS being slightly more proper with application helper, and fixing the person search page
2010-09-20 16:44:35 -07:00
danielvincent
40c96fc619
DG IZ; click to edit rollover text on aspect manage page
2010-09-20 15:53:56 -07:00
Arnaud Delcasse
eeb132d825
Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results.
2010-09-21 03:20:06 +08:00
danielvincent
b097f93bf5
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-20 11:39:17 -07:00
danielvincent
fe306b37ab
DG IZ; mass-assignment quick-fix in controllers
2010-09-20 11:30:27 -07:00
maxwell
64d371d9d6
MS added a warning for account
2010-09-20 11:30:08 -07:00
Ariel Zavala
db7ad16503
Added localization to comments views
2010-09-21 02:03:51 +08:00
Ariel Zavala
6501974f30
added more translations missing on views
2010-09-21 01:43:54 +08:00
danielvincent
14ad24ba7e
visual tweaks on header. moved upload a file button to header on album#show
2010-09-19 14:27:20 -07:00
danielvincent
b40b81e447
aspect manage tab now reads 'manage aspects'
2010-09-19 10:11:41 -07:00
Ariel Zavala
e9f74675e9
Merged with diaspora; fixed conflicts; only 2 red
2010-09-19 11:16:00 -04:00
danielvincent
cc4e9f8d39
description text for all boxes in manage page. search box text defaults to query on people#index.
2010-09-18 17:56:26 -07:00
danielvincent
b5a2971302
search results for people now look like the stream
2010-09-18 17:49:52 -07:00
mishudark
c46ad0d7fa
photo description with ajax request
2010-09-18 12:33:22 -05:00
mishudark
b7bc4b8615
prevent next prev when youre add writting
2010-09-18 04:14:44 -05:00
mishudark
910bd71c78
prevent photho redirect next,prev if textarea has focus
2010-09-18 03:32:37 -05:00
Ariel Zavala
58c2d0dd28
merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)
2010-09-18 02:21:45 -04:00
Don Park
2d16289e46
use photos_path to generate the correct POST destination for photo uploads
2010-09-18 07:50:12 +08:00
Ariel Zavala
f95cebcb8b
Added translations to new requests view and aspects controller
2010-09-17 16:38:50 -04:00
Ariel Zavala
271925a7f6
added photo view translations
2010-09-17 11:34:45 -04:00
Ariel Zavala
c6b34be63d
Added people views translations
2010-09-17 11:27:08 -04:00
Ariel Zavala
375f4f6808
added more translations missing on views
2010-09-17 10:43:59 -04:00
Ariel Zavala
07138041b0
Fixed album controller errors
2010-09-16 23:35:57 -04:00
Ariel Zavala
0be3314e0a
merge with diaspora and resolved a conflict
2010-09-16 20:42:45 -04:00
danielvincent
95a4120e57
DG IZ; dropzones on left back on aspect manage page.
2010-09-16 17:22:42 -07:00
danielvincent
ae83dae1ca
added git info (branch,date,author) to debug partial
2010-09-16 17:03:14 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -07:00
Ariel Zavala
be9ae343cc
Added localizations that I had missed
2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9
Added localization to status message views
2010-09-16 15:47:12 -04:00
Ariel Zavala
ec9affb849
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-16 15:14:38 -04:00
Ariel Zavala
51b6ce9dfb
Added localization to layouts and shared views
2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef
Added localization to photos views
2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29
websocket js should honor app socket port configuration
2010-09-17 03:11:11 +08:00
Ariel Zavala
5078830785
Added localization to comments views
2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383
Added localization to album views
2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce
Added localization to aspect views
2010-09-16 14:57:56 -04:00
maxwell
649839567d
MS added pagination to the search page
2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6
fixed xss bug in comment view partial.
2010-09-16 08:32:19 -07:00
Jamie Wilkinson
eb0f011236
Show the signup link
2010-09-16 10:07:58 +08:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
d2f5d3c4c1
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-15 17:05:36 -07:00
Raphael
01d26f6d0e
Using custom registrations controller
2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
3681ae62c7
remove google analytics
2010-09-15 16:43:38 -07:00
Raphael
e0ffc8bba0
First pass at having a custom registrationsController
2010-09-15 16:40:03 -07:00
maxwell
8828707c45
MS fixed the login bug, deploying to master
2010-09-15 15:15:15 -07:00
maxwell
55c1530c9f
MS DG fixing an edit profile bug
2010-09-15 14:09:05 -07:00
maxwell
84c60e5f2e
DG MS fixing webfinger, i hope to goodness
2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
57bd052c5b
user edit bug
2010-09-15 12:22:03 -07:00
Daniel Vincent Grippi
deac53f178
see yourself in aspect sidebar, because you're going to post to yourself anyway
2010-09-15 11:59:39 -07:00
Daniel Vincent Grippi
fe35d60b13
hack on aspect nav for ff & chrome compatability
2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ea3e372474
fixed 500 error with @photos
2010-09-15 11:24:23 -07:00
Raphael
d9eb3abd9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-15 10:59:00 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
a38a354065
moving things around for consistency. consistency isn't pretty right now.
2010-09-15 10:26:57 -07:00
Daniel Vincent Grippi
73dab4b3ef
fixed stream elements
2010-09-15 10:17:37 -07:00
Daniel Vincent Grippi
4a86632cf3
show default user photos for requests
2010-09-14 20:47:21 -07:00
Daniel Vincent Grippi
f2c6e7b820
made group manage a little nicer
2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
d0c8f9ccd6
silent comments on views
2010-09-14 19:54:48 -07:00
Daniel Vincent Grippi
fc3fb817c8
profile photo doesn't change to null if not changed on profile update
2010-09-14 19:48:11 -07:00
ilya
8aa39c5f08
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-14 11:58:55 -07:00
ilya
0560b46080
MS IZ added friend redirect, and moved the webfinger responces to fixture directory
2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
be7c3f28a9
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-14 11:43:03 -07:00
Daniel Vincent Grippi
71ef54dbcc
spelling mistake, broken links on search page
2010-09-14 11:42:47 -07:00
ilya
cb12e497f6
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-14 11:14:10 -07:00
ilya
2311c33626
MS IZ mocked all the webrequest tests
2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
24cd518f11
DG, RS; Album creation no longer ejects you from context
2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
da8ec589b7
RS, DG; display the correct tab on manage, change edit to manage
2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01
DG RS; passing around params[:aspect]. querying in application controller for current aspect.
2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
01b14a66e8
fixed photo show header
2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
b49eaa1ceb
minor visual tweaks
2010-09-13 20:51:27 -07:00
Daniel Vincent Grippi
0782e0b199
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 19:54:56 -07:00
Daniel Vincent Grippi
fe57a698d3
minor cleanup on album flow
2010-09-13 19:54:30 -07:00
Daniel Vincent Grippi
aa5447f553
Albums are now created within a context
2010-09-13 19:39:51 -07:00
maxwell
15651a7bb6
IZ MS group manage page can now add friends to groups
2010-09-13 18:10:07 -07:00
Daniel Vincent Grippi
5ecbb28dc7
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi
c059069144
albums don't show publisher, refactored css
2010-09-13 17:57:30 -07:00
Daniel Vincent Grippi
1b92bcd17c
Add albums_by_aspect method to user
2010-09-13 17:26:24 -07:00
maxwell
650a502404
MS IZ removed a bunch of unused request stuff
2010-09-13 16:58:23 -07:00
maxwell
63b3513a12
MS IZ removed the links to the requests index
2010-09-13 16:53:33 -07:00
maxwell
3b1223c9dd
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:48:50 -07:00
maxwell
6f75a81a9d
IZ MS trying again on fixing remote profile images
2010-09-13 15:48:30 -07:00
Daniel Vincent Grippi
48403996f0
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:11:38 -07:00
Daniel Vincent Grippi
2fae1049d9
silent comments in all views except the layout and session wall
2010-09-13 15:11:14 -07:00
maxwell
a7231d041e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 15:09:20 -07:00
maxwell
c098be99bc
MS IZ attempt one to fix remote profile images
2010-09-13 15:08:39 -07:00
Daniel Vincent Grippi
a87925b359
missing license on layout
2010-09-13 14:39:18 -07:00
Daniel Vincent Grippi
40ecf176e8
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
maxwell
0b33e6b3eb
MS IZ album page is now not completely wonky, but still kind of pointless...
2010-09-13 14:23:38 -07:00
maxwell
24d957cb32
MS IZ removed the views and redirected the edit route
2010-09-13 12:20:47 -07:00
maxwell
27f1b29581
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 11:54:50 -07:00
maxwell
812f2550aa
removed status message webfinger link
2010-09-13 11:52:47 -07:00
Daniel Vincent Grippi
6aeaea1b7d
removed some things. also, comment buttons are now css-ified when they come through the socket
2010-09-13 11:42:41 -07:00
Raphael
1312728b88
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
2010-09-13 11:16:45 -07:00
Raphael
aa0a00d9cb
Finish moving to aspects, DB reset required
2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi
7579c0ec50
more cleanup
2010-09-13 11:05:10 -07:00
Raphael
9837340eb2
Rename files from group to aspect
2010-09-13 10:43:15 -07:00
Daniel Vincent Grippi
a74e00c159
removed hover user menu
2010-09-13 10:40:09 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
ilya
a738807cf4
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 22:56:29 -07:00
ilya
0896efa5d6
now requests are called requested people, same css but less hacky selection
2010-09-12 22:54:53 -07:00
Daniel Vincent Grippi
897074c869
replace in comment websocket action replaces one or more number instead of just the first
2010-09-12 22:33:51 -07:00
ilya
370e2ef688
not displaying requests in the remove
2010-09-12 21:31:03 -07:00
ilya
1e74acd9b0
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-12 19:56:47 -07:00
ilya
6b7f0888d0
Testing ignore friend request on remote
2010-09-12 19:56:23 -07:00
Daniel Vincent Grippi
31df3cea11
friend pictures on group edit page should now display the default person image if friend's picture isn't present
2010-09-12 18:11:05 -07:00
Daniel Vincent Grippi
db5d000757
made a sticky request link on the bottom of every page
2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi
1092c7b8d1
moved manage to be its own tab on right
2010-09-11 07:53:45 -07:00
Daniel Vincent Grippi
266a896bde
mtweaking comments in stream
2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
9c7e0e3bcb
minor sass tweaks
2010-09-10 23:16:46 -07:00
Raphael
b704704334
People index now works when there is a non-friend on the page
2010-09-10 16:49:09 -07:00
Raphael
c170726f6c
Merge branch 'master' of github.com:diaspora/diaspora into salmon
2010-09-10 16:04:30 -07:00
Daniel Vincent Grippi
d3a8e27833
DG IZ; selector fix
2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi
b4e3ea3937
another little fix
2010-09-10 15:33:16 -07:00
Daniel Vincent Grippi
9fd8cfcc99
DG IZ added the same structure as groups
2010-09-10 15:31:00 -07:00
Daniel Vincent Grippi
8afb590128
small fix
2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
4770616a26
DG IZ; small fix
2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi
82a31228fa
DG IZ; requests bar added to group/edit
2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi
136eb61b02
DG IZ; groups = relations. now you can rename groups in the manage relation page
2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
f70ade6705
DG IZ; moved info on the person show page
2010-09-10 13:52:12 -07:00
Raphael
522450c9d3
RS IZ added a logger statement and a guid in the webfinger profile
2010-09-09 16:19:34 -07:00
Raphael
d0de8b4988
Merge branch 'master' of github.com:diaspora/diaspora into salmon
2010-09-09 15:43:20 -07:00
Raphael
67f9d9dab5
Add hcard, add id for pod_location
2010-09-09 15:34:20 -07:00
Raphael
59006e657f
Hcard done manually
2010-09-09 15:15:37 -07:00
Raphael
c6aff4a562
making the hcard work
2010-09-09 13:02:59 -07:00
Daniel Vincent Grippi
1c2bfa64a1
cleaned login page resources
2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
bb30b69685
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi
134bdab49d
group header now has a page_title field.
2010-09-08 20:52:35 -07:00
maxwell
2ce4fb27fa
MS; removing some dumb user stuff
2010-09-08 20:39:05 -07:00
maxwell
c3a1b36282
MS fixing this to be request host on the login page
2010-09-08 19:49:09 -07:00
Daniel Vincent Grippi
7072c633ec
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 19:39:42 -07:00
Raphael
061f9de668
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 17:35:39 -07:00
Raphael
91f2e2e6ae
Add public key to webfinger profile
2010-09-08 17:35:18 -07:00
Daniel Vincent Grippi
ca780f3560
DG MS; hide debug info by default. also, made the text lighter.
2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi
1e6b309163
DG MS; tweaking top nav and publisher.
2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi
20d5043e81
DG MS; moved tabs around up top
2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi
f7dd0b10b9
DG MS; changed the gear on top nav to not be a tab
2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
5fd105c1dc
DG MS; search now links user names if you're friends with them
2010-09-08 12:04:05 -07:00
Daniel Vincent Grippi
edae8f1e66
DG MS; fixed a view bug in user edit page. page also displays diaspora username .
2010-09-08 11:58:03 -07:00
Daniel Vincent Grippi
36730978ca
login page is more elegant
2010-09-08 11:37:54 -07:00
Raphael
d25327d32d
Add example to request partial
2010-09-08 11:07:49 -07:00
Raphael
91667c1990
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-08 10:59:17 -07:00
Raphael
960d40278c
Add username, login with username or email
2010-09-08 10:59:08 -07:00
Daniel Vincent Grippi
1749a9c52d
no console
2010-09-08 10:51:18 -07:00
Raphael
5fd1602731
Group batch edit is for all groups
2010-09-08 10:00:31 -07:00
Daniel Vincent Grippi
20d9334ce1
DG IZ; changed the photo uploader to drag and drop. now works in firefox.
2010-09-07 17:20:48 -07:00
Daniel Vincent Grippi
41afd86fe7
DG IZ; fixed photos.
2010-09-07 12:03:43 -07:00
maxwell
6c33c2a463
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-07 00:55:02 -07:00
Daniel Vincent Grippi
39c366e2e9
group edit button up top.
2010-09-06 17:22:57 -07:00
Daniel Vincent Grippi
48415b4de8
cleaned up group edit a little
2010-09-06 13:01:24 -07:00
maxwell
919d7d23c0
MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays
2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi
7e909d4034
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-31 16:38:52 -07:00
Daniel Vincent Grippi
f9c2e0e76d
moved publisher down.wn. header is now a dark grey instead of black.
2010-08-31 13:07:11 -07:00
ilya
12f7d16c0b
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-31 10:48:29 -07:00
ilya
98db03d36e
the group edit resets the data started to reset the from id attr
2010-08-31 10:46:49 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7
controller cleanup: using respond_to and respond_with.
2010-08-29 22:49:13 -07:00
Daniel Grippi & Raphael Sofaer
cf161cb8cf
publisher box back up top
2010-08-27 16:09:10 -07:00
Raphael
7b36ae7009
Move back link out of big_text
2010-08-27 12:28:39 -07:00
Raphael
7223d21721
Add singular move friend route, it must be eliminated later
2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90
Groups can now be batch edited
2010-08-27 12:23:20 -07:00
Raphael
f309299e22
Take out remove friend button on stranger, there should be an add friend
2010-08-27 10:26:03 -07:00
Raphael
e1d6c9ce03
fixing person show on stranger
2010-08-27 10:24:42 -07:00
Raphael
39380c3c06
check if you are friends before displaying group list
2010-08-27 10:22:58 -07:00
danielvincent
390bf24e14
Don't try to put yourself in any groups
2010-08-26 17:34:06 -07:00
danielvincent
81438678cd
Refactored more photo js out to photos.js. That should be it for that refactor
2010-08-26 17:10:19 -07:00
danielvincent
81edef9b8a
Fading out every form tag on photo upload was a bad idea
2010-08-26 17:00:45 -07:00
danielvincent
1d515e7b7e
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 15:02:29 -07:00
danielvincent
239ae048cc
group names are now editable
2010-08-26 15:02:13 -07:00
ilya
915144e08b
size 30 by 30
2010-08-26 12:32:14 -07:00
ilya
df74020a16
small thumbnail
2010-08-26 12:27:10 -07:00
ilya
3554de48d8
trying image url
2010-08-26 12:24:53 -07:00
danielvincent
d2b471a58d
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-26 11:09:07 -07:00
danielvincent
39551a0162
fixed comments not showing for photos in stream
2010-08-26 11:08:03 -07:00
Raphael
19e8aa5c35
Refactored view js
2010-08-26 11:06:35 -07:00
maxwell
9b690b863a
droping things
2010-08-25 21:53:04 -07:00
Raphael
6d3d37b7c6
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 18:20:37 -07:00
Raphael
ad67798004
User to_id on groups_with_post
2010-08-25 18:15:38 -07:00
maxwell
a26229223c
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 18:07:49 -07:00
maxwell
b4174c664e
you can now reassign a peson's group
2010-08-25 18:07:31 -07:00
Raphael
e714e0d457
Comment sets now pop open on receiving a new comment
2010-08-25 18:00:53 -07:00
maxwell
22f63a4c44
MS IZ added the move friend method
2010-08-25 16:58:07 -07:00
Raphael
3a91858bcf
Don't alert
2010-08-25 16:47:11 -07:00
Raphael
55c94c385c
fixed photos going through the websocket. added a spec to SocketsController
2010-08-25 16:08:44 -07:00
maxwell
c9e64ae209
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 13:54:27 -07:00
maxwell
6a613c3304
addded the draggable javascript
2010-08-25 13:53:53 -07:00
Raphael
17636f4fd2
View modifications, refactored stream javascript to another file
2010-08-25 13:51:16 -07:00
Raphael
3121cf57d3
Refactored top nav haml, added non-functional gear link next to group
2010-08-25 11:35:50 -07:00
danielvincent
8497586547
linked group titles on group pages
2010-08-25 10:09:39 -07:00
danielvincent
f4b3a2eb3a
more cleaning up of comment box. javascript stuff.
2010-08-24 20:49:32 -07:00
danielvincent
d87f330369
added titles for columns in layout
2010-08-24 19:46:57 -07:00
Raphael
174dbc069b
Fix publisher checkboxes on index
2010-08-24 19:25:38 -07:00
Raphael
5ac5f58679
Tabs on the top aren't all selected on group select, some other view tweaks
2010-08-24 19:22:43 -07:00
Raphael
d3c10f8777
made left column in layout a little wider
2010-08-24 19:02:00 -07:00
Raphael
008c450f66
Add friend button resized
2010-08-24 18:52:50 -07:00
Raphael
5779610659
messed with the views
2010-08-24 18:31:16 -07:00
Raphael
c102e81b03
put the visible back in
2010-08-24 16:56:04 -07:00
Raphael
de3044fa0a
Remove publisher selection remnants, fix posting
2010-08-24 15:55:35 -07:00
maxwell
204c910f66
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
2010-08-24 15:47:44 -07:00
maxwell
92a2df5c77
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 15:23:02 -07:00
maxwell
2a28607bc6
Moved some prod changes into master
2010-08-24 15:22:48 -07:00
Raphael
03abd1ac21
Remove statuS MESsages new page. TaKE New OUt OF ROutes
2010-08-24 14:44:32 -07:00
Raphael
ef9cf8fc52
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 14:41:04 -07:00
maxwell
de335e7366
MS messed with the temporary group picker thing: whatever, it is less annoying
2010-08-24 14:37:47 -07:00
Raphael
db33d94f07
Render nothing on status_messages create, Websockets now honestly
...
support multiple groups.
2010-08-24 14:36:03 -07:00
maxwell
cc1f1e2f24
removed the plus button from the all people add a friend page
2010-08-24 14:16:54 -07:00
danielvincent
c3cf135a3f
tabs on top
2010-08-24 11:33:20 -07:00
danielvincent
85c268b5eb
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 11:12:04 -07:00
Raphael
fb33d955c9
Fix group show controller/view and haml error in nav
2010-08-24 11:11:25 -07:00
danielvincent
4ffb8e7fa3
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-24 11:07:56 -07:00
danielvincent
86146d195f
moving stuff around to the header
2010-08-24 11:07:39 -07:00
Raphael
7ca9d1e791
Changed group_nav a little, deleted people_sidebar
2010-08-24 11:02:30 -07:00
danielvincent
562656e96a
added edit link for group
2010-08-23 18:42:30 -07:00
danielvincent
2b125fdc66
fixed left friends bar a bit
2010-08-23 17:00:40 -07:00
danielvincent
f9a19e679f
made header shorter
2010-08-23 15:27:34 -07:00
Raphael
48959b3ded
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 14:45:20 -07:00
Raphael
76f2aa98ac
Push to multiple groups
2010-08-23 14:45:13 -07:00
danielvincent
fb7e945fc2
removed useless if/else
2010-08-23 14:19:16 -07:00
danielvincent
60b7c30a8a
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 14:17:26 -07:00
danielvincent
d874ba3b38
dropdown menu for user
2010-08-23 14:17:05 -07:00
Raphael
5a02f92448
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51
new photo form now loads through ajax
2010-08-23 13:58:33 -07:00
danielvincent
d9c091d3f8
search box in top nav
2010-08-23 12:43:12 -07:00
Raphael
0092069372
Take signed in check out of websocket js
2010-08-23 11:57:29 -07:00
Raphael
01dac4d173
Take tinymce out of layout
2010-08-23 11:56:06 -07:00
danielvincent
37a67b29a4
left/right arrow keys on photo show page go to prev/next
2010-08-23 11:22:55 -07:00
danielvincent
2355947d8e
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 11:05:36 -07:00
danielvincent
2d21ac0460
moving things around
2010-08-23 11:05:28 -07:00
Raphael
dc1dd07720
Don't crash on requesting a non-existent email address
2010-08-23 11:04:57 -07:00
maxwell
361adda6cd
added group picker. sends the right params, but posts only have one group right now so thats a bummer
2010-08-22 22:20:34 -07:00
danielvincent
36b2445a11
added title to search page
2010-08-19 13:41:48 -07:00
maxwell
35f6856380
MS search and index works
2010-08-19 12:40:50 -07:00
maxwell
756278f498
MS added friend search, and allow for autodiscover
2010-08-19 12:37:34 -07:00
maxwell
c98c52ad14
MS IZ renamed the array
2010-08-19 12:17:29 -07:00
maxwell
df435dc319
MS IZ made a reques form in the user index page
2010-08-19 11:59:58 -07:00
maxwell
af8448dd51
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
2010-08-19 10:20:43 -07:00
maxwell
84cc598017
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
2010-08-18 22:58:57 -07:00
Raphael
7ce8f94d58
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 21:10:48 -07:00
Raphael
a23df47dbc
Trying to merge in the pivots changes that we want in master
2010-08-18 21:10:42 -07:00
ilya
36c06349c5
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 20:59:18 -07:00
ilya
284601c6b1
got moved photo.image.stuff to photo.url[:stuff]
2010-08-18 20:59:01 -07:00
Raphael
0459631d47
Show debug
2010-08-18 20:49:06 -07:00
ilya
3243435015
the album create doesn't crash the app
2010-08-18 20:14:31 -07:00
ilya
5cae2b21b1
RS, IZ fixed the url for the image
2010-08-18 18:06:13 -07:00
Raphael
5a2b42e4e5
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a
Moving to file store
2010-08-18 16:37:05 -07:00
ilya
d0b2a23fcb
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 16:17:00 -07:00
ilya
21f70c643d
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
2010-08-18 16:15:10 -07:00
Raphael
ac694eda8c
A bunch of dumb checks to make the group index publisher pass tests
2010-08-18 15:42:06 -07:00
ilya
f5811df5b7
DG IZ; added info text to add new friend button
2010-08-18 11:59:20 -07:00
ilya
055c222fc2
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
2010-08-18 10:53:43 -07:00
danielvincent
2409fd3f20
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
2010-08-18 02:40:53 -07:00
Raphael
20bc88c0bf
Merge branch 'socket-group' of github.com:diaspora/diaspora_rails
2010-08-17 20:19:29 -07:00
Raphael
2b8e637934
no names in publisher
2010-08-17 19:03:47 -07:00
Raphael
f75ff0b680
Remove links from publisher
2010-08-17 18:57:26 -07:00
Raphael
86afa7a987
Remove bookmarks and blogs
2010-08-17 18:56:42 -07:00
Raphael
d554b3ef1a
flashsocket
2010-08-17 18:49:23 -07:00
ilya
daf08cd9f9
DG IZ posts by the user get websocketed on the group page and albums
...
get signed?
2010-08-17 18:06:35 -07:00
ilya
f15b3c46b2
DG IZ; reverted to before removing latest message methods
2010-08-17 17:40:48 -07:00
Raphael
08de5caf97
make signup page look better
2010-08-17 17:20:29 -07:00
ilya
054dafdf99
couple more
2010-08-17 17:16:11 -07:00
ilya
c1ff8544d3
removed a couple of js lines
2010-08-17 17:04:37 -07:00
ilya
e5036862f6
DG IZ removed the latest message javascript as well as the hash
2010-08-17 16:49:58 -07:00
ilya
d211abb1bc
DG IZ on page for group js method now returns true
2010-08-17 16:32:14 -07:00
ilya
d5d1a2d00f
DG IZ; javascript variable misnamed
2010-08-17 16:29:51 -07:00
ilya
7d68089c8b
DG IZ using group_id when passing the id around the app
2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d
DG IZ added group id to the action hash
2010-08-17 15:27:12 -07:00
ilya
fc7f59bdfc
DG IZ stream for the current user's posts
2010-08-17 10:13:23 -07:00
ilya
33ed838b79
DG IZ added an error message on request delete
2010-08-16 15:08:05 -07:00
ilya
4a36df29e5
DG IZ now the links are of button style
2010-08-16 14:59:23 -07:00
ilya
92aa72447f
DG IZ fixed the css in selector
2010-08-16 14:57:30 -07:00
ilya
b1c29083df
changed the link data-method
2010-08-16 14:34:16 -07:00
ilya
2bc9d0156d
2 arguments in the hidden field
2010-08-16 11:59:13 -07:00
ilya
0ee03afe1d
DG IZ selector box on request page
2010-08-16 11:39:33 -07:00
danielvincent
18cd4b858a
broke out group index and show
2010-08-14 00:27:43 -07:00
danielvincent
c81ea5a632
minor changes
2010-08-14 00:21:10 -07:00
danielvincent
a7eab9e50c
minor section header tweaks (album stuff)
2010-08-13 23:20:39 -07:00
danielvincent
f7e43ee3d0
photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now...
2010-08-12 00:27:26 -07:00
danielvincent
013a6d0849
add photo is now in a fancy-pancy box
2010-08-11 20:45:57 -07:00
danielvincent
97b04fc0d7
nevermind
2010-08-11 20:12:10 -07:00
danielvincent
3e1081acaa
commented out tinyMCE js for the time being
2010-08-11 20:09:16 -07:00
Raphael
eb36190188
DG, RS; Albums create failure prettier
2010-08-11 18:13:23 -07:00
Raphael
144d673dac
DG, RS; album button looks better
2010-08-11 17:16:20 -07:00
Raphael
599d1da620
Moved socket code out to lib, unsocketing from view should now work again
2010-08-11 12:03:26 -07:00
Raphael
355aba75df
RS, DG; removing the last link_to_person
2010-08-11 10:02:45 -07:00
Raphael
cc070ba168
RS, DG; Removed fancybox gone mad from photo adder
2010-08-10 18:08:27 -07:00
Raphael
a201390123
DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken
2010-08-10 17:59:22 -07:00
Raphael
bd7ce5250f
renamed the route for signup. also, removed the link from the login page: get_to_the_choppa
2010-08-10 17:14:58 -07:00
Raphael
37bf5b45f1
RS, DG; You now can't open the photo upload form while photos are uploading
2010-08-10 16:56:19 -07:00
Raphael
3104eeebc9
RS, DG; Photo websocket margins fixed
2010-08-10 16:40:25 -07:00
Raphael
a9ebe44b1d
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 16:03:54 -07:00
Raphael
0fb55be7a0
RS, DG; You can now sign up to be a user on a seed
2010-08-10 16:03:38 -07:00
maxwell
016c8fa471
MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up
2010-08-10 14:11:41 -07:00
maxwell
b5f962c725
trying root path in host meta
2010-08-10 13:58:17 -07:00
maxwell
0ffe893f8a
MS IZ merging diffs
2010-08-10 12:37:04 -07:00
maxwell
71612ba33d
changing some webfinger resources
2010-08-10 12:36:00 -07:00
Raphael
9947a2abb8
RS, DG; latest_status thing now works, started putting signup back in
2010-08-10 12:26:43 -07:00
Raphael
a48fbaaf59
RS, DG; DashboardsController has been eliminated.
2010-08-10 11:36:00 -07:00
Raphael
4308f35b4b
Changed partial on request index
2010-08-10 10:18:16 -07:00
Raphael
d1bedeb993
RS, DG; don't show the group-specific nav if there is no group
2010-08-10 10:11:13 -07:00
danielvincent
4e062c143b
new album partial has a title. album title is in italics in new photo partial
2010-08-09 21:29:19 -07:00
danielvincent
d207c8b955
fixed way too high z-index in album div
2010-08-09 21:27:17 -07:00
danielvincent
988eea4215
fixed comment view bug
2010-08-09 21:21:35 -07:00
danielvincent
96fa34ea60
changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error.
2010-08-09 21:10:11 -07:00
danielvincent
fd8d92a095
moved next/prev links in photo show to be inline with full size link.
2010-08-09 20:23:01 -07:00
danielvincent
d712218a14
removed commented out stuff on photo_new partial. also, fixed the delete button in photo show.
2010-08-09 20:18:20 -07:00
danielvincent
acd00c2a59
fixed top right buttons on album page, etc. also, made the image loader simpler.
2010-08-09 20:14:03 -07:00
Raphael
91b42ac0e2
Specs now mostly pass again, one is failing
2010-08-09 18:06:09 -07:00
Raphael
744693e7fb
RS, DG; There is now a add friend box on the front page that passes group idto the app
2010-08-09 17:33:54 -07:00
Raphael
838fec4921
RS, DG; Working on group nav, fixed some stuff in photo
2010-08-09 16:34:06 -07:00
Raphael
aebe7b97c0
DG RS; added groups. can't delete, but can make new ones
2010-08-09 15:58:53 -07:00
Raphael
d71966476b
Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
...
Conflicts:
app/views/albums/show.html.haml
app/views/authors/show.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
2010-08-09 15:09:05 -07:00
Raphael
33a827c33a
RS, DG; Websocket is now working again, users have a channel
2010-08-09 13:02:08 -07:00
ilya
890f927492
removed references of mine? method in all views
2010-08-08 22:53:23 -07:00
ilya
8e6dfe7166
DG IZ having an email key makes devise work, ring to deploy
2010-08-08 17:00:39 -07:00
danielvincent
a6f5603dc9
added email field to login screen. strange error won't let me log in?
2010-08-06 23:55:05 -07:00
danielvincent
6f1a596dff
small color changes
2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b
updated button style
2010-08-06 00:15:22 -07:00
Raphael
e2c0ae2cee
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c
Merging ostatus deletion with selenium start
2010-08-04 16:01:19 -07:00
danielvincent
75663b2447
DG MS; user can edit photo caption. also, photos have captions.
2010-08-04 16:00:59 -07:00
Raphael
58addca8dd
RS, IZ; extracted and murdered ostatus.
2010-08-04 16:00:01 -07:00
danielvincent
09958bc207
DG MS; removed delete friend button from current user's show page
2010-08-04 15:43:24 -07:00
danielvincent
3d5f27fe5a
javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing
2010-08-02 17:27:45 -07:00
danielvincent
102b912878
moved group nav to its own partial
2010-08-02 16:20:30 -07:00
danielvincent
3e5cecd532
Merge branch 'master' into group-top
...
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
2010-08-02 16:09:13 -07:00
Raphael
d503c6541f
RS; posted statuses now use the websocket to update latest, time is now styled right
2010-08-02 11:13:21 -07:00
danielvincent
5974bf3571
group nav is now links to nothing
2010-08-01 23:26:24 -07:00
danielvincent
19b633d3a3
top nav for groups partially there.
2010-08-01 22:26:56 -07:00
Raphael
6fe00982f2
RS, IZ, fixing another error on person show
2010-07-30 10:32:36 -07:00
Raphael
0fd35709b1
RS, IZ, fixing error on person show with no posts
2010-07-30 10:26:00 -07:00
Raphael
e7ef3c06ed
Websocketed photos now fade in
2010-07-30 10:20:50 -07:00
ilya
27bf29119d
restoring display inline
2010-07-29 18:03:18 -07:00
ilya
085ea0a665
RS, IZ, DG Removing display inline
2010-07-29 17:59:44 -07:00
ilya
f6495e2bec
RS IZ photos now fade in on the album upload page
2010-07-29 17:26:05 -07:00
Raphael
a636d97837
Removed crash if there was no latest status message
2010-07-29 14:38:46 -07:00
danielvincent
fd4475370d
added profile url to author show page
2010-07-29 10:30:24 -07:00
maxwell
cb3d6db9b0
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-29 10:06:11 -07:00
maxwell
7a0db375ab
MS added rails 3rc
2010-07-29 09:59:03 -07:00
ilya
c8b40001e5
IZ album edit page was not added
2010-07-28 21:10:35 -07:00
ilya
96a9c9455d
DG IZ; make photos in stream larger, because they need love too
2010-07-28 17:46:43 -07:00
ilya
6f3e7bc78b
DG IZ; minor tweaks
2010-07-28 17:31:05 -07:00
