Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
31d7904701
Remove unused blueprint invitations view
2015-03-09 17:57:49 +01:00
Steffen van Bergerem
c1d714d2c7
Remove unused files, fix syntax in jasmine tests
2015-02-07 21:17:51 +01:00
Steffen van Bergerem
f6fbbbb5f6
Move tag prefill to Backbone, add tests
2014-11-30 17:14:05 +01:00
Jonne Haß
0a70a125be
Remove deprecation warning in blueprint view
2014-08-24 01:02:35 +02:00
Jonne Haß
76c6d95a0e
replace deprecated disable_with option
2014-08-23 16:34:01 +02:00
Steffen van Bergerem
f615ad3115
Port people search to Bootstrap
2014-07-20 18:21:13 +02:00
Fábián Tamás László
6e178af551
Disable invite button after sending invite
2013-07-01 10:19:56 +02:00
Juan Manuel Azambuja
1115e10536
Merge branch 'develop' into diaspora_with_sprites
...
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/application.css.sass
app/assets/templates/comment_tpl.jst.hbs
app/assets/templates/stream-element_tpl.jst.hbs
app/helpers/aspects_helper.rb
app/helpers/contacts_helper.rb
app/views/aspects/_aspect_listings.haml
app/views/aspects/toggle_contact_visibility.js.erb
app/views/contacts/_aspect_listings.haml
app/views/layouts/_header.html.haml
app/views/shared/_footer.html.haml
app/views/tags/_followed_tags_listings.haml
2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
f429cacd7a
[Sprites] add sprites for icon images
2013-03-11 19:26:11 -03:00
rschaden
49d4079065
add email validation to invitations
2012-11-25 14:25:20 +01:00
Fabián Rodríguez
1961ab3326
remove app/views/invitations/edit
2012-11-06 21:39:36 -02:00
Fabián Rodríguez
cf48d384a8
remove app/views/invitations/token_not_found
2012-11-06 21:39:36 -02:00
Benjamin Neff
e15aff46a6
delete message input field
2012-05-15 00:23:54 +02:00
Benjamin Neff
ea90c6caf0
remove "message" from invite-form (not used in email)
2012-05-13 02:51:54 +02:00
Jordi Mallach
4d92653874
Fix typo in key name: seperated → separated.
2012-04-15 19:07:59 +02:00
Maxwell Salzberg
aee17798c1
rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form
2012-03-17 17:10:08 -07:00
Jonne Haß
7e7de439f8
fix untranslatable stuff from the invite refactor
2012-03-17 13:52:46 +01:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
aa449f3a2d
a couple of additions to the branch
2012-01-19 13:33:05 +01:00
Maxwell Salzberg
b09e76a0ce
introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger
2012-01-17 17:34:42 -08:00
Sarah Mei & Tim Frazer
e38cb41f85
Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button.
...
Get rid of 500 error on the "view this invitation in your browser" link
2011-11-14 17:02:13 -08:00
Lennart Prelle
f2123d942d
make language for email-invitation available
2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
62e12f248c
fixed missing translation on the signup and invitation accept pages
2011-10-24 15:07:29 -07:00
danielgrippi
1bc637d83f
new getting started works, needs more love
2011-10-24 14:11:35 -07:00
Maxwell Salzberg
6cce4f0872
small typo on invites#edit
2011-10-20 11:27:21 -07:00
danielgrippi
ed473e0f46
touch up welcome page
2011-10-19 18:44:09 -07:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695
added back the tooltip explaining username constatrains on the accept invite flow
2011-08-24 17:35:27 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ba11bb6d89
you are now able to invite friends from the mobile site
2011-08-14 15:40:07 -07:00
Maxwell Salzberg
7b1ff4cd7b
more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form
2011-08-09 18:02:50 -07:00
Maxwell Salzberg
da51259f32
update dates on some views, give the accept invite form some padding
2011-08-09 18:02:50 -07:00
Maxwell Salzberg
43bd8b6860
typo in the settings
2011-08-08 19:07:38 -07:00
Maxwell Salzberg
ee08d3cd5c
fix inviter a touch
2011-08-08 18:50:59 -07:00
danielgrippi
75c3107035
made signing up and accepting an invitation look a little nicer
2011-08-05 12:36:53 -07:00
Raphael Sofaer
e30b82dd45
Fix resend links in inviter
2011-07-12 15:08:03 -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
MrZYX
cf61bb756d
added dir attribute to html element; made tipsy gravity dependant on that
2011-04-11 18:00:28 +02:00
MrZYX
f7de3a216a
fixed a translation
2011-02-15 15:02:36 +01: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
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
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
maxwell
7a02a31440
fix invitations#new, and a post spec which was mongo specific
2011-01-18 22:11:58 -08: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
maxwell
8ba619029e
adding about text on invite accept page
2010-12-13 17:24:33 -08:00
MrZYX
0d70f78a12
small translation fix
2010-12-11 22:03:06 +01:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00