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

2604 commits

Author SHA1 Message Date
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
danielgrippi
547d7e4f8c bootstrapped getting started page 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
e7584261c7 removeing the tooltips after submit 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
1ccf965194 publisher lib, prefill, open, still need to do public first message for new users 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
bfd2d440d1 ajax form on the getting started 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
511bd3ab03 added a save button, moved stuff around 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
Dennis Schubert
2fcc783787 Add mobile registration site to fix ugly 500 2011-10-24 22:50:25 +02:00
Maxwell Salzberg
4022ff5163 small possible fix for conversations 2011-10-24 13:06:32 -07:00
Maxwell Salzberg
aa2fd8abcf make stream link to home icon 2011-10-24 11:34:17 -07:00
Gonzalo Rodriguez
63f0dac922 Don't allow to reshare someone else's rehare of your post. Fixes #2214. 2011-10-23 05:06:09 -02:00
Gonzalo Rodriguez
4331e74673 Associate lables to checkboxes 2011-10-23 02:22:40 -02:00
Gonzalo Rodriguez
0a081b051c Fix more 'communtiy' typos 2011-10-23 01:39:23 -02:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
1256b6f3fc DG MS; changed coloring of indicators; changed indicator precidence; added soup link 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
defaba504a functional 'show me where this post came from' in soup 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
484f46d70f add validation which prevent user for signing up with dead username. fix cucumber features 2011-10-20 16:32:09 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
6cce4f0872 small typo on invites#edit 2011-10-20 11:27:21 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Gonzalo Rodriguez
66f79b13ed Minor aspect_listings cleanup 2011-10-19 00:02:37 -02:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Sarah Mei
c2c152ee4b Change tag serializer to use tagged_people_count instead of people_count. Fixed typo (was tagge_people_count) 2011-10-16 15:55:22 -07:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Manuel Schölling
6e325f8fd5 Introduced Commentable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
3179ebabc9 fix tag stream 2011-10-15 22:37:53 -07:00
Maxwell Salzberg
ea700716ab SM MS remove instance var from mobile post view 2011-10-15 21:18:58 -07:00
Maxwell Salzberg
ea0240d6f8 fix broken mobile tag view 2011-10-15 21:08:22 -07:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Maxwell Salzberg
2dda160990 tag stream wip 2011-10-15 18:57:35 -07:00
Pistos
fae9aee425 Fix specs. 2011-10-15 14:47:09 -04:00
Jonne Hass
517e37b56a fix another missing translation and a cucumber feature 2011-10-15 12:59:50 +02:00
Jonne Hass
6606bd01b1 fix missing translation 2011-10-15 12:28:18 +02:00
Pistos
35a0c56346 This fixes issue #2032. Anyone can now view all comments on a public post without needing to log in. 2011-10-15 00:18:17 -04:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Daniel Grippi
b7f4f81d28 Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql 
Explicitly specify order of comments, since we cannot assume MySQL orderi
 2011-10-12 16:09:18 -07:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Maxwell Salzberg
cfb28db00f wip, but the refactored code works 2011-10-11 16:12:32 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Pistos
15b3cce6ee Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code). 
Leaving the #order call in #last_three_comments caused the generated SQL to
have two conflicting ORDER BY components, which caused the query to return
invalid results.  I removed the problem by removing #last_three_comments which
I consider a premature optimization.
 2011-10-11 16:06:24 -04:00
Ilya Zhitomirskiy
7fb26c4390 dg iz limiting to one month, added contacts sharing with count 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
288d20b6e8 correlations on the admins page 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
Daniel Grippi
eb19bc9a78 Merge pull request #2111 from vcuculo/fix-mobile-select 
Fix #2091 - Aspects selection on mobile
 2011-10-11 09:29:45 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
danielgrippi
2ef56224be DG MS; added more feedback to photo uploader 2011-10-10 16:35:18 -07:00
danielgrippi
882c0c2170 DG MS; fixed tags autocomplete styling and js 2011-10-10 15:59:13 -07:00
Dan Hansen
814eb7b426 RFC2822 specifies that you use parentheses to denote a mailbox list. Use the addr-name spec to specify a display name and the from address. 
Check against the raw headers of the mail as @mail.from excludes the display name
Extract shared logic between notifier methods
 2011-10-09 22:19:50 -05:00
Pistos
cd3e824bc1 Explicitly specify order of comments, since we cannot assume MySQL ordering (which is by id). 2011-10-08 22:59:44 -04:00
Gonzalo Rodriguez
583dd20249 Refactor selected aspects ui setup 2011-10-08 23:14:04 -02:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Maxwell Salzberg
1bf51f678c move featured users sidebar down 2011-10-07 11:17:18 -07:00
Your Name
bdc7c85b7e make tags links on featured users 2011-10-06 17:30:21 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
04b51cced8 Merge branch '1584-aspects-list' 2011-10-06 01:52:53 -02:00
Gonzalo Rodriguez
4563632afe Avoid checkmark on 'All contacts' link 2011-10-06 01:07:28 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Ilya Zhitomirskiy
3e2b30ec61 passing the server time to help intiate the infinite scrolling 2011-10-05 15:12:30 -07:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Vittorio Cuculo
c47579cfd8 Fix #2091 - Mobile select aspect 2011-10-05 09:30:45 +02:00
Dan Hansen
8c15ca2a4b PMs and comments contain author name in "From" header 
refactor notifier
 2011-10-04 23:48:28 -05:00
Maxwell Salzberg
a3eeb9f3c1 comment on tagged posts wip 2011-10-04 18:20:15 -07:00
maxwell
eef054dc5e wip 2011-10-04 18:20:14 -07:00
Maxwell Salzberg
fca0ee7c7b make remember me hidden on mobile 2011-10-04 15:43:38 -07:00
Gonzalo Rodriguez
80a494f9ba Use haml instead of content_tag 2011-10-04 00:22:33 -02:00
danielgrippi
543bf458a2 extracted methods to helpers 2011-10-03 18:53:25 -07:00
Gonzalo Rodriguez
97e1775938 Adding alt text for header icons. Related to #2089. 2011-10-03 23:33:32 -02:00
Maxwell Salzberg
81e04a11fe fix tag stream, no comments for now, but coming soon 2011-10-03 17:30:22 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Maxwell Salzberg
56f5efc373 yeah that didnt work 2011-10-03 16:14:27 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
412fe1b027 rebased and consolidated logic" 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
0f073387ac IZ MS refactor commenting disabled 2011-10-03 15:20:43 -07:00
Lennart Prelle
0c42903d2c delete dash in comments 2011-10-03 23:42:30 +02:00
Gonzalo Rodriguez
ae1fedc73b Preserve search term on search input. Related to #1983. 2011-10-02 23:02:48 -02:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
danielgrippi
f9d88e122f limit contacts to 15 on aspects pages for faster network times 2011-10-02 13:11:30 -07:00
danielgrippi
9672c27232 using two less delegates in mobilejs; made some partials for mobile stream elements for sanity's sake 2011-10-02 12:27:14 -07:00
Maxwell Salzberg
647bc585cc always remember me on the mobile. make previous helpers shorter 2011-10-02 09:30:05 -07:00
Maxwell Salzberg
7c9eb065ba make some shared devise logic into a helper 2011-10-02 09:15:02 -07:00
danielgrippi
b881d7b3de default sort order to created_at instead of commented_on on desktop site 2011-10-01 16:24:28 -07:00
Dan Hansen
d0fe59af69 add cucumber feature for photo lightbox 
change step to reflect element visibility
 2011-10-01 15:52:48 -05:00
Maxwell Salzberg
00873cdc6a small fix for mobile tag show pages 2011-10-01 09:47:57 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
danielgrippi
eaa191515e remove logging statement in a before filter that performed a query 2011-09-30 21:11:00 -07:00
Maxwell Salzberg
63c7634f6a Revert "header data as helper methods" 
This reverts commit 607013bc83.
 2011-09-30 14:43:52 -07:00
danielgrippi
607013bc83 header data as helper methods 2011-09-30 13:22:12 -07:00
Ilya Zhitomirskiy
27dcdf9a11 added an index to root_id 2011-09-30 11:35:07 -07:00
Maxwell Salzberg
621075d4e1 fix mentioning from profile page spec, add some tests for the ajax_stream? method 2011-09-30 10:54:13 -07:00
Maxwell Salzberg
6ac0a46120 green jasmine by stubbing ajax_stream? in aspects controller 2011-09-29 18:04:21 -07:00
Maxwell Salzberg
aa5d5b560d fix incorrect status_message#new view 2011-09-29 15:17:25 -07:00
Maxwell Salzberg
b27a8dd330 fix up info sidebar" 2011-09-29 12:51:00 -07:00
danielgrippi
70b175479c format all on including stylesheet for WP7 2011-09-29 00:39:12 -07:00
danielgrippi
e3bf03636b pass in mobile as provider_display_name on posts if posting from mobile 2011-09-28 22:15:32 -07:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Maxwell Salzberg
5ae9edc72e fix comment bug 2011-09-28 13:44:58 -07:00
danielgrippi
38624afd9c fix reshare cubbies bug on mobile 2011-09-28 11:29:36 -07:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
42fcf3e394 reshares up top 2011-09-27 21:32:11 -07:00
danielgrippi
7d662fcc92 move share button to top right corner 2011-09-27 21:09:28 -07:00
danielgrippi
f34f0ce5fb expand/collapse comments with animation; added collapse link on bottom 2011-09-27 21:09:27 -07:00
danielgrippi
2b2443b6b9 aspect dropdown takes public and all aspects option 2011-09-27 21:09:27 -07:00
danielgrippi
9b057bdf16 added placeholder; force autofill off on comment fields; touched up mobile reshare view 2011-09-27 21:09:27 -07:00
danielgrippi
744ab579bd adding comments work for one of two comment add buttons; added info on 
posts; post show page.
 2011-09-27 21:09:27 -07:00
danielgrippi
3b08fc8406 wip 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
9d72247e9e mobile tags page 2011-09-27 21:09:27 -07:00
danielgrippi
d972802142 comment ajax on mobile. 2011-09-27 21:09:26 -07:00
danielgrippi
91c9fffb81 touched up login page wip 2011-09-27 21:09:26 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
6deb924c32 fixed header; compose message on top right 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
9e3ff7338e ditch unused css rules; move js to body bottom 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
danielgrippi
49bee9bf19 fix the build 2011-09-26 20:53:06 -07:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
d36da2a266 ms iz made the aspect stream ajax in 2011-09-26 19:34:35 -07:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Ilya Zhitomirskiy
2cebfa54cc fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher) 2011-09-19 15:52:25 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Ilya Zhitomirskiy
41abb5790e changed the to proc syntax to explicit block syntax 2011-09-19 14:16:26 -07:00
Ilya Zhitomirskiy
ed4b91249d added a publisher to the tag page 2011-09-19 11:38:55 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
e865dfc269 fix a bug with emailing in posts going to tumblr 2011-09-16 13:57:38 -07:00
danielgrippi
36f5e45c25 change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00