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

704 commits

Author SHA1 Message Date
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
danielvincent
d392239355 removed brandongrotesque from repo, logos are now assets. 2010-12-01 11:45:54 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -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
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
Raphael
ec6f42eaf0 Take JS out of landing page 2010-11-28 16:47:41 -08:00
Hexagon
894f112b75 Removing duplicate id in layout/application 2010-11-27 10:37:04 +01: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
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05: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
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
maxwell
bd31bc423f MSSM added links to github and blog in header 2010-11-23 01:16:51 -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
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
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -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
maxwell
c4a270ef8b putting mobile interface back in so we can get it cleaned up 2010-11-21 17:14:43 -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
a9a91c436a user menu is a button. fixed remove aspect button on aspect#show 2010-11-21 16:13:03 -08:00
maxwell
ea7bdfde28 fix validation and order of status message sent 2010-11-21 16:13:01 -08:00
Raphael
6f0d008914 Move WebSocketReceiver out to a js file 2010-11-21 16:14:36 -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
zhitomirskiyi
9a31d15c92 added icons for the connected services and to indicate the rss feed 2010-11-18 12:19:58 -08:00
maxwell
597258615b adding star back to title 2010-11-18 11:06:17 -08:00
danielvincent
eda346e283 use google's jquery within current protocol (http/https) 2010-11-17 22:36:01 -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
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
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
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
f442c6fe3e taking out the if true 2010-11-17 16:17:52 -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
f55509085a upgraded jquery, and deleted a second version of both jqueries 2010-11-16 21:41:20 -08:00
Raphael
ae9f4ab969 Refactor mail views, add a spec to make sure CSS is rendered 2010-11-12 11:47:59 -08:00
MrZYX
5ae4248b30 some more fixes I overlooked. Sorry 2010-11-12 06:07:37 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +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
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
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
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
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
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -07:00
Raphael
bfcb2a9e18 Remove random href 2010-11-02 12:37:32 -07:00
Raphael
8778bdab3b Merge remote branch 'ed0h/503-language-html-tag' 2010-11-02 11:43:12 -07:00
danielvincent
3a4f100806 remove * 2010-11-01 15:01:49 -07:00
livefromthemoon@gmail.com
2b890e6ef2 Added 'lang' attribute in the html tag 2010-11-01 21:31:12 +01:00
Hexagon
bba3aaa684 Translating a huge amount of untranslated strings 2010-10-30 15:25:42 +02:00
danielvincent
bfb1c6df28 collapsed layout views 2010-10-27 13:33:42 -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
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
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
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
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
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
danielvincent
15104cf920 somewhat there 2010-10-18 11:00:52 -07:00
danielvincent
7611bc1c8f user dropdown 2010-10-15 17:37:32 -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
danielvincent
47be7b1f0a correct html5 search box 2010-10-15 15:29:57 -07:00
danielvincent
2b97e8751c include blueprint/print.css in layout 2010-10-14 10:40:39 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
danielvincent
b314ee22ec intermediate misc ui polish 2010-10-07 22:51:08 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -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
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Daniel Vincent Grippi
3681ae62c7 remove google analytics 2010-09-15 16:43:38 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
d0c8f9ccd6 silent comments on views 2010-09-14 19:54:48 -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
01b14a66e8 fixed photo show header 2010-09-13 22:51:51 -07:00
Daniel Vincent Grippi
fe57a698d3 minor cleanup on album flow 2010-09-13 19:54:30 -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
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -07:00
Daniel Vincent Grippi
a87925b359 missing license on layout 2010-09-13 14:39:18 -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
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
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
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
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -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
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
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
36730978ca login page is more elegant 2010-09-08 11:37:54 -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
f9c2e0e76d moved publisher down.wn. header is now a dark grey instead of black. 2010-08-31 13:07:11 -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
19e8aa5c35 Refactored view js 2010-08-26 11:06:35 -07:00
Raphael
ad67798004 User to_id on groups_with_post 2010-08-25 18:15:38 -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
d87f330369 added titles for columns in layout 2010-08-24 19:46:57 -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
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
danielvincent
c3cf135a3f tabs on top 2010-08-24 11:33:20 -07:00
danielvincent
86146d195f moving stuff around to the header 2010-08-24 11:07:39 -07:00
danielvincent
f9a19e679f made header shorter 2010-08-23 15:27:34 -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
danielvincent
d9c091d3f8 search box in top nav 2010-08-23 12:43:12 -07:00
Raphael
01dac4d173 Take tinymce out of layout 2010-08-23 11:56:06 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -07:00
maxwell
756278f498 MS added friend search, and allow for autodiscover 2010-08-19 12:37:34 -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
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
danielvincent
c81ea5a632 minor changes 2010-08-14 00:21:10 -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
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
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -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
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
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -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
a636d97837 Removed crash if there was no latest status message 2010-07-29 14:38:46 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
ilya
6f3e7bc78b DG IZ; minor tweaks 2010-07-28 17:31:05 -07:00
ilya
03cf61bd7c new user top bar 2010-07-28 17:04:56 -07:00
maxwell
eb4262dfc7 MS merged master 2010-07-28 11:13:17 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
maxwell
3cecbf1511 MS profile page fixes 2010-07-27 15:52:42 -07:00
maxwell
9dd5c08296 fixed two small UI bugs 2010-07-27 14:45:04 -07:00
danielvincent
dbc8f0112e some misc design cleanup. album page toggle pending. 2010-07-27 12:12:25 -07:00
danielvincent
36abb19e2c added the uploading photo wjava script 2010-07-26 15:50:41 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
danielvincent
03e06cb279 person sidebar has a view all; displays user images with names in tooltips instead of text 2010-07-24 10:24:43 -07:00
danielvincent
4c3a51833f user name is bigger 2010-07-23 22:35:12 -07:00
danielvincent
4d2b11310b nudged layout 2010-07-23 21:34:47 -07:00
danielvincent
e5d298040d little things 2010-07-23 21:11:21 -07:00
danielvincent
f6fd6bc9e6 added breadcrumb to albums 2010-07-23 20:28:10 -07:00
danielvincent
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
danielvincent
ad61c290fb took current user's name out of the layout 2010-07-23 19:44:34 -07:00
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
danielvincent
c01e9846cf began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere 2010-07-21 00:24:11 -07:00
ilya
7901791ee3 DG IZ; added simple image picker for edit profile page. currently displays all images uploaded. 2010-07-20 11:50:36 -07:00
danielvincent
55710ffbdb image uploader does two thumbnails 2010-07-17 21:10:21 -07:00
danielvincent
04eb66b2e6 user has a image url field for user picture 2010-07-16 23:02:24 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
Raphael
501620e9fb DG RS; fixed some visual bugs. request link now turns red on new request 2010-07-15 18:40:55 -07:00
maxwell
902a8cb349 MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change 2010-07-10 10:34:46 -07:00
danielvincent
aa916d0604 moved User.first out of the application view 2010-07-09 18:50:39 -07:00
maxwell
b49f198c4f DG MS cleaned up some of the request stuff 2010-07-09 11:14:00 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
maxwell
900f1080a2 DG MS; fixed destroy links for status messages, added link for requests on top nav 2010-07-08 14:38:26 -07:00
maxwell
1fa2dfd6eb DG MS cleaning up friend request 2010-07-08 12:05:06 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
danielvincent
20b056586d warming up the page. colors were too cold and non-human before. 2010-07-05 00:02:16 -07:00
danielvincent
0001797850 moved user's name to the right of their picture 2010-07-03 23:39:05 -07:00
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
Raphael
737614e04b google analytics for real 2010-07-01 22:20:57 -07:00
Raphael
418635aa72 Added google to session wall layout 2010-07-01 22:13:55 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
danielvincent
88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:22:30 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
maxwell
8d1ec57fa4 beefed it up to ie 7 2010-07-01 17:07:36 -07:00
maxwell
8e94fc5b4f added mean message 2010-07-01 17:05:14 -07:00
maxwell
86c6cdcafa Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:38:51 -07:00
maxwell
ba984009f8 added chrome frame 2010-07-01 16:38:32 -07:00
danielvincent
b25880f04a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
maxwell
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
danielvincent
c0a744b2ce owner picture selector in application helper 2010-07-01 15:34:35 -07:00
maxwell
428284abeb sorry about that, removed tiny mce, but we still had things which inited it 2010-07-01 09:15:27 -07:00
maxwell
01132e3dc0 pushing js changes 2010-07-01 09:02:38 -07:00
maxwell
9631977597 RS MS comments propagate, and show up IN REAL TIME 2010-06-30 17:29:32 -07:00
maxwell
dc5b321b62 sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up. 2010-06-30 00:27:11 -07:00
danielvincent
e159b8f7f4 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/friends/show.html.haml
 2010-06-29 20:56:44 -07:00
danielvincent
19c41fb6be DG IZ; comments show and hide 2010-06-29 20:53:49 -07:00
maxwell
448fcf8f89 MS RS fixed real name, now profiles are created with a new friend 2010-06-29 20:33:55 -07:00
danielvincent
8ff241cdde DG IZ; all comments hidden by default. linking anchor issue. 2010-06-29 19:00:54 -07:00
danielvincent
0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-06-29 17:30:29 -07:00
danielvincent
acc782d5b2 DG IZ; cool labels fade in 2010-06-29 17:27:09 -07:00
maxwell
7961d11669 uncommenting get satisfaction 2010-06-29 17:09:07 -07:00
maxwell
eebed9d457 fixed publisher in chrome and broke it out to a seperate js file 2010-06-29 17:04:46 -07:00
maxwell
ee9acc5c82 thanks to dan, GS works great now MS RS 2010-06-29 15:00:30 -07:00
danielvincent
67123c664a Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
 2010-06-29 14:36:46 -07:00
danielvincent
5193a20458 DG IZ; getting there. 2010-06-29 14:34:33 -07:00