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 |
|