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
