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
|
69cac02ade
|
landing page fix
|
2010-11-22 20:35:30 -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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|