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

451 commits

Author SHA1 Message Date
Raphael Sofaer
b8d9610877 added translation to the likes popup, made the notification models a little clearer 2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
MrZYX
73c96ea8f0 Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec" 
This reverts commit bd74ab4acc.

This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
 2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec 2011-05-10 23:19:36 -05: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
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07: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
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07: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
Raphael Sofaer
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
maxwell
62c164e1a4 fixed displays of the days based on locale 2011-04-18 18:29:55 -07:00
Raphael Sofaer
efe79eb351 Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -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
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07: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
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -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
5b0da52e0a fixed comment socketing bug, post ordering on own profile page. 2011-03-29 19:40:44 -07: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
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
b6d5165f2d scroll to post on page if you can see it (via notification popup) 2011-03-23 17:16:30 -07: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
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
c3612ee66d Remove empty helper and spec files. 2011-03-19 22:39:21 -07:00
MrZYX
7cd1789669 allwow https youtube links 2011-03-19 22:19:31 +01:00
maxwell
eed32f70be add a missing space for notifications with less than 4 people 2011-03-17 10:50:11 -07: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
maxwell
2e72fc09c6 made 3+ plus collapse in notifications index 2011-03-14 18:09:51 -07:00
Raphael Sofaer
1b0445563e Specs passing with text 2011-03-14 11:39:31 -07:00
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01: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
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
d38e3a6b29 added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -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
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
danielvincent
11309574cf messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
danielvincent
9fe0320881 added PrivateMessage and PrivateMessageVisibility models and migrations 2011-03-01 12:14:31 -08:00
Raphael Sofaer
a7f149e399 Possible performance gain from not hitting posts relation 2011-03-01 11:42:57 -08:00
Raphael Sofaer
00cca370ad Add translation key method, should be replaced with separate partials. 2011-03-01 11:03:58 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
736783abd7 You can't call post.person when post is nil. We should probably just reject and delete the invalid notifications in the controller, keeping them in the view is aggravating 2011-02-24 11:13:25 -08:00
zhitomirskiyi
e106ec6a79 added post author to the subject of the also commented email as well as the notification 2011-02-23 13:03:11 -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
43f17b3ed8 made toggle for post time on aspects#index 2011-02-18 16:47:44 -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
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -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
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
Raphael Sofaer
a307519e94 Put avatar on cmment form all the time, fix socketed comment form 2011-02-10 11:05:12 -08:00
MrZYX
6e0e46435e localize dates 2011-02-08 16:26:56 +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
zhitomirskiyi
d6ab633e2c Merge branch 'notification-migration' 2011-01-31 14:41:15 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
maxwell
5267365b4f move js strings to application helper 2011-01-29 13:54:28 -08:00
Dan Hansen
0831ad6e40 move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper 2011-01-29 13:29:54 -08:00
Dan Hansen
3078156dbb javascript i18n wip 2011-01-29 13:28:43 -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
danielvincent
77042f9d47 publisher always shows textarea. outline publisher textarea in blue 2011-01-22 18:49:50 -08:00
Dan Hansen
90f5192055 refactor process_youtube, escape vimeo titles 2011-01-22 16:26:45 -06:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
Raphael
2c68bb0305 Remove n-query problem from contact_list 2011-01-19 18:06:35 -08:00
maxwell
e7a065a521 make jobs have a base class, which will verify the activerecord connection before trying the job 2011-01-19 14:10:42 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
bd4efe8c2d Escape youtube titles 2011-01-17 15:39:46 -08:00
zhitomirskiyi
be92f3866c IZ MS fix 500 on commnet notificaions 2011-01-17 14:46:38 -08:00
zhitomirskiyi
79b613b0e5 MS IZ notifications now contain helpful test 2011-01-17 14:07:21 -08:00