MrZYX
4328f72bfb
fixed piwik
2011-02-09 19:37:05 +01:00
zhitomirskiyi
41d21c78ef
mend
2011-02-08 18:53:18 -08:00
zhitomirskiyi
6be63b88f0
added the pending request to the finder
2011-02-08 18:53:18 -08:00
danielvincent
80117d8ab6
added piwik and ga options to mobile layout
2011-02-08 17:39:41 -08:00
zhitomirskiyi
eecf1d5d82
fixed cucumber, localization, and css
2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
zhitomirskiyi
a398184081
WIP
2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421
translating the warning about removing the person from the last aspect
2011-02-08 15:44:12 -08:00
danielvincent
151999c582
reference the right thing in mobile views
2011-02-06 23:49:22 -08:00
danielvincent
01cfeb65b2
fixed build
2011-02-06 23:42:01 -08:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
danielvincent
42993de739
added back to comments; avatar.
2011-02-06 09:26:24 -08:00
zhitomirskiyi
c2d26e21c3
added a mobile invitation acceptance view, skipping getting started for now
2011-02-05 20:19:47 -08:00
zhitomirskiyi
80da5917fa
gave more space to the already invited span
2011-02-05 15:56:08 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01: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
maxwell
1ed737c3b9
make aspects a link, and remove a big db query from the view
2011-02-03 16:15:51 -08:00
zhitomirskiyi
d905021252
comment emails have text
2011-02-03 13:07:26 -08:00
danielvincent
8269e4b300
touched up photo show and status message show pages
2011-02-03 13:05:25 -08:00
Sarah Mei
e7cf5fc841
Fix/expand cucumber feature for new user signup.
...
Replace "wait for aspects page"-type steps with general wait for step.
2011-02-02 17:17:00 -08:00
Raphael
cd8d9989cf
Refactor publisher JS, use hidden field for submitting
2011-02-02 14:27:14 -08:00
maxwell
34a0abe0c8
fix 500 on mobile notifications page
2011-02-02 13:14:34 -08:00
Raphael
3fb6b0e072
Fix saved state cucumber feature
2011-02-02 11:52:56 -08:00
danielvincent
693ad112ba
stream element sockets in non-mobile
2011-02-02 11:29:37 -08:00
Dan Hansen
82db655a56
make the markup between _comment and _stream_element more consistent, fix embedder in comments
2011-02-02 12:55:16 -06:00
maxwell
67ed035f21
make notifications updated_at rather than created at
2011-02-01 21:45:36 -08:00
Raphael
cfd6639f4d
Revert "Merge branch 'open-aspects'"
...
This reverts commit 181bd823c42c3ed2ab73
2011-02-01 13:15:20 -08:00
zhitomirskiyi
bc058332d3
commented on post email now includes the comment
2011-02-01 12:54:05 -08:00
zhitomirskiyi
27f1231479
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4
Merge branch 'open-aspects'
2011-02-01 12:10:12 -08:00
zhitomirskiyi
55403d9bea
the saved aspects works properly now
2011-02-01 12:07:18 -08:00
Raphael
7d18e2bcd8
Finish autocomplete
2011-02-01 11:56:56 -08:00
Raphael
518642d0d7
Move image_url defaulting logic into profile
2011-02-01 11:56:56 -08:00
Dan Hansen
cdb5cf37e7
show publisher if it was closed when you select another aspect
2011-02-01 00:40:11 -06:00
Raphael
c56eaadfa0
Make person profile a little bit aware of an incoming request
2011-01-31 15:47:01 -08:00
Raphael
e3a5102624
incoming request on person show should just link to share_with
2011-01-31 15:28:43 -08:00
Raphael
906de27922
Make notifications/read_all non-ajax, link back to index page
2011-01-31 15:28:43 -08:00
zhitomirskiyi
d6ab633e2c
Merge branch 'notification-migration'
2011-01-31 14:41:15 -08:00
MrZYX
391a9b0de5
translate contacts in _header.haml
2011-01-31 19:48:36 +01:00
zhitomirskiyi
cfef9a747e
all green
2011-01-30 20:10:34 -08:00
zhitomirskiyi
17a2c9e311
moving over some code migration successful
2011-01-29 23:34:11 -08:00
maxwell
348ae0b61d
small hack to add some feedback when links are tapped on the mobile site.
2011-01-29 18:42:50 -08: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
Dan Hansen
3078156dbb
javascript i18n wip
2011-01-29 13:28:43 -08:00
danielvincent
e3f4ae1cc7
fixed button styling
2011-01-28 17:42:04 -08:00
Raphael
07850c7cb2
fix fb finder, flesh out test
2011-01-28 17:13:20 -08:00
