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

250 commits

Author SHA1 Message Date
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Maxwell Salzberg
0b6c5421c3 use deep merge. since we now have nested js, we need to do the merge recursively; fixes #2660 2012-01-14 02:49:34 -08:00
Ricky Elrod
5626948b3f Fix #2598 by having jQuery force the browser to not cache JSON responses. 2012-01-11 13:10:10 -05:00
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -08:00
Maxwell Salzberg
2422bdab46 MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes 2012-01-07 12:55:46 -08:00
Maxwell Salzberg
cf2c12d98b converting to string makes this not an htmlsafe buffer 2012-01-04 12:03:15 -08:00
Ilya Zhitomirskiy
15e7a0cc6e pop-over close buttons, wip 2011-11-07 21:59:29 -08:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Gonzalo Rodriguez
1a6ee84ed5 Refactor aspect listings partial. Splited in two, one for index and 
other for contacts.
 2011-09-07 00:09:39 -03:00
Maxwell Salzberg
86e374b8ce add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible 2011-08-09 16:54:24 -07:00
Maxwell Salzberg
b4d4499299 adding invite email 2011-08-05 18:32:25 -07:00
danielgrippi
6a56e3298c only show connect to services if all services not already connected 2011-08-03 19:02:54 -07:00
danielgrippi
303b23883d added featured users, left nav, and search boxes into getting started 2011-08-03 18:02:56 -07:00
Raphael Sofaer
0fff54e074 We pass in nil as a size to person_image_tag, so we need to default it more forcibly. 2011-08-03 13:45:45 -07:00
Raphael Sofaer
674ca883e5 Put class back into remote person_links 2011-08-01 18:25:31 -07:00
Raphael Sofaer
a469f09c01 Fix hovercard conflict with vanity urls 2011-08-01 18:22:29 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
danielgrippi
91461ab2ad fix tag duplication; photo sizes 2011-07-29 19:31:06 -07:00
Maxwell Salzberg
315ec29af2 typo in my link 2011-07-29 19:30:12 -07:00
Maxwell Salzberg
d55a21c458 just kidding. totally going to namespace users 2011-07-29 18:53:46 -07:00
Maxwell Salzberg
d407be036e i am not a number! include username in the main url of a local user! 2011-07-29 18:53:46 -07:00
MrZYX
99751af5a8 let the direction_for helper return ltr instead of nothing for ltr text, this should fix #1668 2011-07-27 22:34:41 +02:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
danielgrippi
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
danielgrippi
d51e9431a6 fixed some styling/positioning. don't display a hovercard for the current user's person links 2011-07-06 12:45:16 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f Move some DB logic from helper to controller 2011-06-27 19:51:35 -07:00
Raphael Sofaer
c01641b619 Avoid words in person_image_tag 2011-06-24 11:09:10 -07:00
Dis McCarthy
d56cac1639 List diaspora id on profile pics, courtesy diasporg 2011-06-23 09:08:07 -04:00
danielgrippi
83756c5713 actually add the views. fix object_path 2011-05-19 15:34:39 -07:00
danielgrippi
d7899d10e3 Fix various links in to cubbi.es objects 2011-05-19 15:17:42 -07:00
Raphael Sofaer
71e77d59b3 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500 slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
MrZYX
9f070593ff check if we can all cleaned_is_rtl? before doing it in direction_for helper 2011-05-12 11:05:32 +02:00
Raphael Sofaer
160e01f7bd Fix broken sorting by activity 2011-05-07 00:50:26 -04:00
Arzumy MD
6ba2b00fb8 cleaned up formatting in application_helper, removed unnecessary return 2011-05-06 00:18:58 +08:00
Arzumy MD
2c4954bac8 spec for application_helper#page_title, with default text 2011-05-06 00:14:18 +08:00
Arzumy MD
5da6305b10 #1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor 2011-05-05 00:05:59 +08:00
MrZYX
77bae90d0e moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
MrZYX
a92b28b4bf general search and replace in markdownify (#1042) 2011-05-03 17:46:29 +02:00
MrZYX
6623dbb1f1 fixed #1039 2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
Raphael Sofaer
28a997c2cd Fix pagination on tags, specs are red, need to take all helpers out of applicationController 2011-04-28 09:28:59 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
Raphael Sofaer
a05b141366 Add tagged posts to db seed, make people#show and tags#show infinite scroll 2011-04-07 16:36:14 -07:00
MrZYX
e7d48a16ee moved + to the left for rtl languages 2011-04-05 19:33:51 +02:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
danielgrippi
8816bd7f91 8 failures left. wip. 2011-03-29 17:31:56 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
Raphael Sofaer
349aa13c05 Revert "reduce db quries on aspects#index" 
This reverts commit 3af5e24ac6.

Conflicts:

	app/controllers/aspects_controller.rb
 2011-03-28 14:59:16 -07:00
MrZYX
3af5e24ac6 reduce db quries on aspects#index 2011-03-27 17:22:35 +02:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
b9b9d7e07d renamed home to all aspects in header, made clicking aspect names on right trigger filtering 2011-03-23 10:29:34 -07:00
MrZYX
7cd1789669 allwow https youtube links 2011-03-19 22:19:31 +01:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
Dan Hansen
490a2c6a9e remove extra protocol in the link 2011-03-10 21:16:45 -06:00
Dan Hansen
214c677169 process videos last so there aren't conflicts with other markdownify methods 2011-03-10 18:29:08 -06:00
Dan Hansen
d7c7775b6c fallback gracefully, break build if videos can't embed 2011-03-10 18:26:55 -06:00
Dan Hansen
93bdf1e91e add space before link 2011-03-10 18:01:08 -06:00
Raphael Sofaer
f2cc51dd0d Take current user id out of avatar 2011-03-09 17:50:46 -08:00
Raphael Sofaer
eafa965504 Try explicitly querying rather than getting postvisibilities 2011-03-09 16:17:48 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
zhitomirskiyi
2522ab7ee4 refactoring the conversation views, wip 2011-03-03 10:39:32 -08:00
Raphael Sofaer
a7f149e399 Possible performance gain from not hitting posts relation 2011-03-01 11:42:57 -08:00
Dan Hansen
e4ba498d70 whoops 2011-02-22 23:21:50 -06:00
Dan Hansen
f41bc0c14d <3z 2011-02-22 23:19:57 -06:00
Raphael Sofaer
74b8921c09 make video urls have correct href 2011-02-22 18:51:40 -08:00
maxwell
e3b298c5d4 this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in" 
This reverts commit dfa5d875c5.
 2011-02-17 19:01:42 -08:00
MrZYX
dfa5d875c5 I18n: Workaround for a weired caching issue when multiple users are logged in 2011-02-16 22:40:18 +01:00
Dan Hansen
e2ec4c0424 possibly fix the problem with js i18n that occurs on joindiaspora 2011-02-15 22:43:06 -06:00
MrZYX
20e1316491 it can somehow happen that a person has no profile. somehow. idk why. 2011-02-13 19:29:04 +01: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
zhitomirskiyi
34e5ba99bc removed the image or default 2011-02-01 18:11:02 -08:00
zhitomirskiyi
21e3c2ae73 Merge branch 'open-aspects' 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/home_controller.rb
	app/helpers/application_helper.rb
	db/migrate/20110201013408_add_open_aspects_to_user.rb
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/home_controller_spec.rb
 2011-02-01 17:32:08 -08:00
zhitomirskiyi
7f026e8271 now updating the open aspects in js 2011-02-01 16:58:33 -08:00
MrZYX
7ca8391739 Javascript I18n: fallback to DEFAULT_LANGUAGE for missing keys 2011-02-01 22:45:02 +01:00
Raphael
518642d0d7 Move image_url defaulting logic into profile 2011-02-01 11:56:56 -08:00
maxwell
5267365b4f move js strings to application helper 2011-01-29 13:54:28 -08:00
maxwell
1b3c58c2c2 Use a fake to not allocate an AR model for every reference to a person 2011-01-24 15:13:52 -08:00
Dan Hansen
90f5192055 refactor process_youtube, escape vimeo titles 2011-01-22 16:26:45 -06:00
Raphael
bd4efe8c2d Escape youtube titles 2011-01-17 15:39:46 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
600e67d5d1 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-13 16:31:35 -08:00
danielvincent
9cf1f5a023 fixed reshare with filters 2011-01-08 13:11:55 -08:00
danielvincent
f44b3cbe3d contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge. 2011-01-08 13:11:53 -08:00
danielvincent
422f17a648 switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials. 2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder 2011-01-08 13:11:53 -08:00
danielvincent
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Dorian
d6e72cd2bb Escape person.name in comment 2010-12-26 02:16:53 +01:00
Dorian
293445225a Don't let user put HTML in alt and title image attribute of avatar 2010-12-24 15:33:04 +01:00
zhitomirskiyi
7796776135 vimeo works, does not yet fetch the title 2010-12-23 15:36:29 -08:00
danielvincent
2150cb505e fixed person_photo_path 2010-12-21 12:44:33 -08:00
MrZYX
1b6f341348 made linking more robust, this fixes #732 2010-12-19 13:49:46 +01:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa added vimeo method, still needs support from lib/youtube_titles.rb. updated locales 2010-12-15 01:20:53 -05:00