nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11097 commits 4 branches 0 tags 121 MiB
Commit graph

516 commits

Author SHA1 Message Date
danielgrippi
9e3ff7338e ditch unused css rules; move js to body bottom 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Sarah Mei
b60101b9ad Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new. 
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
 2011-08-28 16:08:57 -07:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ecf38305b4 added a visible style for missing translations in development and production modes 2011-08-19 11:05:48 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3f1e8f0b6e added the check for open invitations 2011-08-14 16:06:25 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ba11bb6d89 you are now able to invite friends from the mobile site 2011-08-14 15:40:07 -07:00
danielgrippi
7e901d0220 remove shapado 2011-08-12 11:12:30 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
Raphael Sofaer
902edb6745 Make the tag autocomplete on the getting started page less broken 2011-08-09 18:55:34 -07:00
Maxwell Salzberg
7b1ff4cd7b more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form 2011-08-09 18:02:50 -07:00
Raphael Sofaer
3c4f6527ec Don't render the back-to-top link on the landing page 2011-08-09 16:55:22 -07:00
Maxwell Salzberg
72b734e3e8 scroll to top like a boss 2011-08-09 01:04:54 -07:00
danielgrippi
134e8a1b20 limit RSS rel link in layout to person pages 2011-08-03 18:30:25 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Maxwell Salzberg
773f207b17 fix the viewport for real this time. sorry about all of the emails 2011-07-31 21:57:26 -07:00
Maxwell Salzberg
2fb2cd0a80 fix mobile viewport for mobile site 2011-07-31 21:33:43 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
danielgrippi
e09ddef361 DH DG; lightboxin wip 2011-07-10 21:08:34 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -07:00
Dan Hansen & Daniel Grippi
b48b182c73 STYLIN' 2011-07-02 00:04:14 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -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
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
Michael Sofaer
d6ba3c970c proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
Raphael Sofaer
d9d66a5c31 WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
danielgrippi
b8a6bf9f51 trying something different on app show page. worth a shot. 2011-06-06 22:59:31 -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
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
danielgrippi
b89dd900cc misc visual cleanup on mobile 2011-05-13 23:33:16 -07:00
danielgrippi
0e72a91d1b update login page 2011-05-13 22:05:35 -07:00
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -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
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
danielgrippi
d34774f4e5 png favicon 2011-05-09 16:24:24 -07:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05: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
MrZYX
e7d48a16ee moved + to the left for rtl languages 2011-04-05 19:33:51 +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
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
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
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
zhitomirskiyi
18c7c467c7 made the manage email prefs work 2011-03-23 16:36:16 -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
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
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
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -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
d38e3a6b29 added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -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
danielgrippi
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
danielgrippi
97aff09140 added autocomplete on message 'to' field, minor css tweaks to inbox 2011-03-07 11:22:59 -08:00
MrZYX
f0ba62be59 replaced ▼ with ▼, this fixes #904 and shouldn't harm anything. 2011-03-03 21:32:44 +01:00
Sarah Mei
ba6afa50e8 Removing extra csrf tag. Thx feanor12. 2011-03-01 22:25:05 -08:00
Dan Hansen
9ef6606f80 load jquery from google only if local copy fails 2011-02-22 13:41:05 -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
zhitomirskiyi
199d5fbdc1 the alt text now displays the correct number of contacts in an aspect 2011-02-18 17:44:47 -08:00
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17: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
danielvincent
80117d8ab6 added piwik and ga options to mobile layout 2011-02-08 17:39:41 -08:00
danielvincent
bf20e5a9e8 remove some js assets from mobile 2011-02-06 23:09: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
Raphael
3fb6b0e072 Fix saved state cucumber feature 2011-02-02 11:52:56 -08:00
Raphael
cfd6639f4d Revert "Merge branch 'open-aspects'" 
This reverts commit 181bd823c4, reversing
changes made to 2c3ed2ab73.
 2011-02-01 13:15:20 -08:00
zhitomirskiyi
55403d9bea the saved aspects works properly now 2011-02-01 12:07:18 -08:00
MrZYX
391a9b0de5 translate contacts in _header.haml 2011-01-31 19:48:36 +01: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
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
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
maxwell
8b3beba93f adding login page to mobile, and adding timeago WIP 2011-01-24 17:36:47 -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
danielvincent
7ac0e9eb49 wip 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
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
danielvincent
338e17ff87 cache login form & footer 2011-01-22 13:30:31 -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
zhitomirskiyi
aba03ed5b0 added the locales for timeago 2011-01-14 11:46:38 -08:00
Dan Hansen
ce4fe1938c remove references to fancybox, we use facebox 2011-01-13 00:24:10 -06: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
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
71ca93720b contact lists functional on aspects/index. edit panes facebox in from header 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
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
b029475421 aspects now have edit pages accessible through the top nav 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
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -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
zhitomirskiyi
2f06ec1dca don't display notificatification badge div if there is no notification count (permalink works) 2011-01-05 10:07:22 -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
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
Nick van der Burgt
e6127c6aa9 Included ie.js into the layout 2010-12-27 17:33:50 +01: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
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -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
a64fa0839f Hide notifications link until we take out queries from it 2010-12-17 20:19:02 -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
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
maxwell
8eb9ab1781 making image names more generic 2010-12-13 14:02:11 -08:00
Raphael
627561737c Just get rid of some whitespace 2010-12-11 20:34:25 -08:00
danielvincent
5731f32cfe add correct page titles 2010-12-09 20:09:20 -08:00
maxwell
10ca0688f5 dont show get satisfaction unless you are on joindiaspora.com 2010-12-09 16:35:31 -08:00
Sarah Mei
9da69a4b01 Mobile log in form is usable. Also, added mixins for sass. 2010-12-04 20:45:52 -08:00
Sarah Mei
fea6884acc Mobile homepage looks decent. 2010-12-04 19:30:14 -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
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