Raphael
|
8e4691b9d0
|
Merge remote branch 'rmaskey/269-album-link'
|
2010-10-18 11:27:13 -07:00 |
|
danielvincent
|
4b1516542d
|
various. fixed publisher in new layout.
|
2010-10-18 11:00:52 -07:00 |
|
danielvincent
|
54e5fb4abb
|
add new aspect back on manage page. changed badges
|
2010-10-18 11:00:52 -07:00 |
|
danielvincent
|
15104cf920
|
somewhat there
|
2010-10-18 11:00:52 -07:00 |
|
danielvincent
|
eca37e1a28
|
small view cleanups
|
2010-10-17 21:55:03 -07:00 |
|
danielvincent
|
1139299f42
|
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
|
2010-10-17 20:47:51 -07:00 |
|
danielvincent
|
7160e9f85b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-17 10:25:38 -07:00 |
|
archi
|
035db98367
|
Added HTML links to posts
|
2010-10-17 02:06:46 +02:00 |
|
rmaskey
|
569376df00
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:32:02 -04:00 |
|
rmaskey
|
7c99b89d43
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:31:47 -04:00 |
|
romanov
|
2787eb0c6b
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:26:46 -04:00 |
|
danielvincent
|
5ca3570667
|
added prefetch rels to prev/next links in photo show. fixed shadow bug in header
|
2010-10-16 02:06:46 -07:00 |
|
danielvincent
|
72479343bc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:37:39 -07:00 |
|
danielvincent
|
7611bc1c8f
|
user dropdown
|
2010-10-15 17:37:32 -07:00 |
|
ilya
|
d4702aefa3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:20:19 -07:00 |
|
ilya
|
9727b356e1
|
the invitations add requests which are now correctly auto accepted
|
2010-10-15 17:20:04 -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 |
|
maxwell
|
f83bddadc5
|
forgot to add the test; and cleaned up the explain partial
|
2010-10-15 16:19:07 -07:00 |
|
ilya
|
d06c6ced38
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 15:30:39 -07:00 |
|
danielvincent
|
47be7b1f0a
|
correct html5 search box
|
2010-10-15 15:29:57 -07:00 |
|
ilya
|
2c9c4b0e14
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/invitations/_new.haml
|
2010-10-15 14:36:49 -07:00 |
|
danielvincent
|
6f282e77ff
|
make public checkbox
|
2010-10-15 14:22:28 -07:00 |
|
ilya
|
0074aadd48
|
added a select tag to email invitations
|
2010-10-15 14:21:08 -07:00 |
|
maxwell
|
e8c49feca4
|
made the public info link in all aspects publisher
|
2010-10-15 14:10:10 -07:00 |
|
maxwell
|
7e0825e492
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 13:58:40 -07:00 |
|
danielvincent
|
12bdd1712d
|
share on facebook checkbox instead of broadcast button
|
2010-10-15 13:56:49 -07:00 |
|
maxwell
|
a61c126aad
|
manage page now uses partial
|
2010-10-15 11:29:23 -07:00 |
|
maxwell
|
20f164fd45
|
fixing some of the invite copy
|
2010-10-15 11:11:25 -07:00 |
|
ilya
|
b4b338b3cd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-14 18:12:34 -07:00 |
|
ilya
|
4a7c4e0848
|
requests are made on invite but perhaps they should be made on signup so that we have a person
|
2010-10-14 18:12:18 -07:00 |
|
Raphael
|
08e629668d
|
I18ning empty_messages
|
2010-10-14 16:55:00 -07:00 |
|
danielvincent
|
45d7d54c66
|
added an empty message for the case of an aspect with no friends
|
2010-10-14 16:23:29 -07:00 |
|
danielvincent
|
750b4b4388
|
empty message re-appears if all stream posts are deleted
|
2010-10-14 15:40:34 -07:00 |
|
danielvincent
|
8daf2d0fd5
|
add none message to aspect#index
|
2010-10-14 15:23:15 -07:00 |
|
danielvincent
|
cf2a4c25ae
|
DG RS; remove empty message from stream upon adding something
|
2010-10-14 15:19:37 -07:00 |
|
danielvincent
|
5722f85c85
|
message in aspect if stream is empty
|
2010-10-14 15:00:47 -07:00 |
|
danielvincent
|
32a0f60a2f
|
moved photos link to the side bar for now
|
2010-10-14 14:38:19 -07:00 |
|
danielvincent
|
2b97e8751c
|
include blueprint/print.css in layout
|
2010-10-14 10:40:39 -07:00 |
|
danielvincent
|
58d5fbfb3e
|
moved invite link to account#edit on settings page. changed text on person partial.
|
2010-10-14 10:26:06 -07:00 |
|
ilya
|
d0c6f12ea8
|
added another attack vector spec
|
2010-10-13 18:43:22 -07:00 |
|
ilya
|
36b9f66f60
|
the invited user keeps track of who invited them, limit on invites,
removed the invites controller test
|
2010-10-13 16:52:33 -07:00 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -07:00 |
|
ilya
|
d6b08de6fc
|
corrected link on the account page
|
2010-10-11 15:07:17 -07:00 |
|
ilya
|
bb7e2a9918
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 14:58:22 -07:00 |
|
ilya
|
007f6cfb6f
|
close account
|
2010-10-11 14:58:11 -07:00 |
|
danielvincent
|
be017bfb0a
|
DG MS; invite is now a lightbox on feed and manage pages
|
2010-10-11 14:16:24 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
danielvincent
|
82f526ea23
|
DG MS; added tooltip
|
2010-10-11 10:53:00 -07:00 |
|