nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5219 commits 4 branches 0 tags 121 MiB
Commit graph

1417 commits

Author SHA1 Message Date
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
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
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
danielvincent
9b6d40544c fixed _comments bug on show pages 2010-12-21 17:36:14 -08:00
danielvincent
7cb9760a1e show comments toggle like fb 2010-12-21 16:56:32 -08:00
danielvincent
dae5906b6a ownership render bug fixed on photoshow 2010-12-21 16:56:32 -08:00
maxwell
ec826e8c05 Revert "fix for js selector" 
This reverts commit 0da4466da2.
 2010-12-21 12:56:38 -08:00
maxwell
0da4466da2 fix for js selector 2010-12-21 12:55:07 -08:00
danielvincent
a0e85dfea2 added missing translations to photo#show 2010-12-21 12:49:40 -08:00
danielvincent
a6c5f420fa giving more pixels to photos on their show pages 2010-12-21 12:39:37 -08:00
MrZYX
e10af7fc8a made "Notifications" translatable 2010-12-21 19:18:29 +01:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
maxwell
6d4696faf0 MS DG notifications are now pretty decent 2010-12-20 18:05:31 -08:00
maxwell
152670a72b notification badge now in header 2010-12-20 18:05:31 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01:00
danielvincent
6c12a4c562 photo show page shows more photo. 2010-12-19 21:53:57 -08:00
MrZYX
b52718e913 small translation fix 2010-12-19 14:41:47 +01:00
danielvincent
bb0375d2f8 uploaded photos show in the publisher textarea instead of outside and above. fixed comment textarea on show pages. 2010-12-18 22:40:42 -08:00
zhitomirskiyi
4425c3df83 reshare now works as expected opens the publisher and has the share button 2010-12-18 22:30:12 -08:00
danielvincent
01e557ba7a put ajax:success for publisher where it belongs 2010-12-18 20:31:02 -08:00
danielvincent
d5916c9287 removed comment button from sight 2010-12-18 20:26:27 -08:00
danielvincent
a42a773d3d dim service icons when not public. remove 'make public' label, now checkbox title. 2010-12-18 20:00:13 -08:00
danielvincent
ee9e187e5c fixed build, add photos has a solid border 2010-12-18 19:45:50 -08:00
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
Raphael
36b622c998 Fix build 2010-12-18 15:22:56 -08:00
MrZYX
c3a79f7298 some fixes to translations 2010-12-18 15:25:21 +01:00
maxwell
f1ae312e75 changes for person show page 2010-12-18 02:10:00 -08:00
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
Raphael
a64fa0839f Hide notifications link until we take out queries from it 2010-12-17 20:19:02 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
maxwell
b3c63a3cc0 you can now unset the year of your birthday" 2010-12-17 18:05:13 -08:00
maxwell
96b907122b only show profile fields if they are filled out. 2010-12-17 17:40:08 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
maxwell
c749d81fe9 putting a link to notifications, make them unread in the controller when you view the index 2010-12-17 17:06:48 -08:00
maxwell
807187ded9 /notifications is now pretty cool 2010-12-17 17:06:48 -08:00
Raphael
b8648f631a Use ree in the chef scripts, might revert later 2010-12-17 12:49:44 -08:00
maxwell
3c3e03993a make the two links on comment notifications clearer 2010-12-17 11:48:08 -08:00
maxwell
5763b441be fixing order of Notification.for 2010-12-17 11:37:33 -08:00
maxwell
39deac62fb in words is not a helper 2010-12-17 11:05:58 -08:00
maxwell
0bdb6aaab5 more notification stuff 2010-12-16 19:00:32 -08:00
maxwell
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
danielvincent
a41f45b846 contact count on home page 2010-12-16 18:21:06 -08:00
maxwell
b8a0abd122 updating notification views 2010-12-16 18:07:43 -08:00
Raphael
d2199fa1eb Profile of requestor should be visible; no outgoing request instance variable needed 2010-12-16 14:09:55 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
danielvincent
43810907f5 show all contacts in edit aspect pane 2010-12-16 10:00:18 -08:00
maxwell
d5ba34f245 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 18:05:54 -08:00
Raphael
e881edab96 Fix missing partials on last commit, you can now accept a request from the requestor's profile page 2010-12-15 18:05:18 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12 basic notifications 2010-12-15 17:31:36 -08:00
Raphael
b22398951e Send requests from the aspect list on the person show page 2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
zhitomirskiyi
4256ea34b6 rename aspect on the aspect show page 2010-12-15 14:15:07 -08:00
Maxwell Salzberg
555542da31 remove extra slash 2010-12-15 12:01:20 -08:00
Maxwell Salzberg
f8c2f15bb1 use the full pod_url in the template 2010-12-15 11:48:13 -08:00
Raphael
bd31ff3ee3 Fix request validations, build. 2010-12-15 10:48:29 -08:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
danielvincent
aef5abf631 Correct some queries, look at incoming requests in search, explicit pending false in activate_contact 2010-12-14 17:33:07 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
maxwell
c38fbd27e4 prevent gifs thru getting through javascript uploader 2010-12-14 13:31:06 -08:00
Raphael
e63a8a4bfa Take contact.person query out of the views, only query people once in hashes_for_aspects 2010-12-14 12:11:36 -08:00
maxwell
2bc849fa90 only show permalink if the post is infact public. also, make destroy delete 2010-12-13 18:45:54 -08:00
maxwell
e3e3fd13e5 no trailing slash on pod url on login page. it just looks weird 2010-12-13 18:21:50 -08:00
zhitomirskiyi
7e3b2c6afd removed the query from the contact list partial 2010-12-13 17:53:27 -08:00
maxwell
8ba619029e adding about text on invite accept page 2010-12-13 17:24:33 -08:00
danielvincent
d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" 
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
 2010-12-13 17:16:56 -08:00
maxwell
c2ad170506 re add 'remember me' button 2010-12-13 17:05:35 -08:00
Raphael
d44df7e977 put remove contact link under aspect membership 2010-12-13 16:40:05 -08:00
Raphael
02d76441e4 Merge branch 'aspect-list-on-profile' 2010-12-13 16:12:29 -08:00
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00
maxwell
42c22cedf9 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-13 14:38:47 -08:00
maxwell
8eb9ab1781 making image names more generic 2010-12-13 14:02:11 -08:00
mblog
d0355fdd43 Feature #348: Change Email 2010-12-13 22:14:52 +01:00
maxwell
4fe42044ac removed homepage detail into a partial, which you should redefine 2010-12-13 12:52:08 -08:00
danielvincent
68a51448e5 comment link shows up again on contact pages 2010-12-13 10:19:04 -08:00
MrZYX
6cacfde6a6 two fixes to translations 2010-12-12 15:55:51 +01:00
danielvincent
2f2f8fef8a delete/reshare only if current_user on stream_element 2010-12-12 01:41:54 -08:00
danielvincent
f7a7dff53b allow for newlines in profile bio 2010-12-12 00:50:30 -08:00
danielvincent
52a3996ad0 textareas auto expand 2010-12-11 22:18:03 -08:00
Raphael
627561737c Just get rid of some whitespace 2010-12-11 20:34:25 -08:00
danielvincent
b4170dc991 badges on stream elements. say 'all aspects' instead of listing out all user's aspect names 2010-12-11 20:28:40 -08:00
MrZYX
0d70f78a12 small translation fix 2010-12-11 22:03:06 +01:00
danielvincent
c9b498d59c resolved 500 page on getting_started#step_3 2010-12-11 12:05:58 -08:00
danielvincent
fd2cbc1cf4 added invite link to search page 2010-12-10 18:28:51 -08:00
danielvincent
2c5d5d9328 show already invited users on invitation#new 2010-12-10 18:05:08 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
danielvincent
8de5c5babd fixing request bar on aspects#manage 2010-12-10 10:12:30 -08:00
MrZYX
0374ee436e fixed untranslatable strings 2010-12-10 16:52:35 +01:00