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

219 commits

Author SHA1 Message Date
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
Ilya Zhitomirskiy
ee74948863 wip welcome post, publisher object 2011-10-24 14:11:35 -07:00
danielgrippi
44c9fcf65f log in to the stream 2011-10-23 18:21:07 -07:00
Maxwell Salzberg
2dda160990 tag stream wip 2011-10-15 18:57:35 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Ilya Zhitomirskiy
2185df3f52 chaged the default order to created_at 2011-10-05 15:17:45 -07:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -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
164b395f06 derp. remove puts-es 2011-10-02 09:37:55 -07:00
Maxwell Salzberg
647bc585cc always remember me on the mobile. make previous helpers shorter 2011-10-02 09:30:05 -07: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
danielgrippi
4bd1f0997d fix build 2011-09-25 13:14:09 -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
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
danielgrippi
b11c1a899f add invitations partial back, removed set_invites (yay) 2011-08-03 18:47:06 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
Raphael Sofaer
af6547815e Some view helper cleanup 2011-07-04 07:36:01 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Maxwell Salzberg
3c4c62abd5 moved auth token to admins page, and added a link in the dropdown 2011-05-19 14:23:04 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -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
Raphael Sofaer
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07: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
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -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
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
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
Raphael Sofaer
bbf1bf00cb Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would. 2011-04-06 12:11:49 -07:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
MrZYX
58796dcde2 uhm, --amend 2011-03-10 15:35:40 +01:00
MrZYX
7bf256ecfa we need @all_aspects not only in html views 2011-03-10 15:29:49 +01:00
Raphael Sofaer
e6836c46a7 Remove unnecessary includes, finish renaming set_header_data, only run set_header_data on html requests 2011-03-09 17:50:46 -08: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
Raphael Sofaer
f8c0906db7 Instrumenting activerecord object instantiation to do some profiling 2011-03-09 13:54:28 -08:00
Raphael Sofaer
c259fc65f0 You can now pass hashes to the logger 2011-03-09 11:48:29 -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
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
Raphael Sofaer
a7f149e399 Possible performance gain from not hitting posts relation 2011-03-01 11:42:57 -08:00
MrZYX
00ebf6469b it can happen that the http referer is nil when we expect it to be set (for example if the user has a privacy extension enabled 2011-03-01 18:38:40 +01:00
MrZYX
98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
 2011-02-24 00:33:34 +01:00
MrZYX
feb47df97e total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit 2011-02-21 17:13:11 +01:00
Sarah Mei
77adc02cbd Fix spec failure related to presence of app config settings. Also, you can't test application controller directly. 2011-02-19 22:17:22 -08:00
zhitomirskiyi
61dd5a835a default scope on contact 2011-02-18 17:38:02 -08:00
maxwell
0bf3cae54a MS IZ added spec from admin page, moved it to its own controller where it belongs 2011-02-18 11:35:24 -08:00
zhitomirskiyi
936a51578a renamed log line 2011-02-11 23:42:50 -08:00
zhitomirskiyi
971a319764 contacts size 2011-02-11 23:41:21 -08:00
Raphael Sofaer
bb58544a70 Add logging for GC (slight slowdown, but worth it for the data) 2011-02-10 15:52:00 -08:00
Raphael Sofaer
25aa4255dc Add unix timestamp to request log 2011-02-10 13:57:16 -08:00
Raphael Sofaer
f1fe913527 Change up logging a little bit 2011-02-10 11:52:00 -08:00
zhitomirskiyi
e75c285049 added created_at 2011-02-09 15:07:47 -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
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
danielvincent
ae8686ef25 add which_action_and_user to application_controller 2011-01-28 16:15:50 -08:00
Raphael
31e4683183 Finished contacts of contacts for local users 2011-01-27 13:41:22 -08:00
zhitomirskiyi
0fa0b7e950 fixed syntax error in mobile layout. removed ipad from mobile_fu 2011-01-27 11:30:15 -08:00
zhitomirskiyi
ab41a5f24a friend finder has invite buttons and aspect dropdowns 2011-01-26 13:03:53 -08:00
danielvincent
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
Raphael
3935d978ac Take some queries out of views 2011-01-18 19:11:01 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Paweł Wilk
ee59f36b77 Added grammatical inflection support using I18n Inflector with Rails plug-in 2011-01-14 18:33:15 +01:00
danielvincent
98bcad5c59 visual fixes on people/show. contact count on aspect filters. contact list searches again. 2011-01-08 13:11:54 -08:00
danielvincent
e1b6f4f074 aspect filters shown selected on photo and statusmessage show pages 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
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -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
5763b441be fixing order of Notification.for 2010-12-17 11:37:33 -08:00
danielvincent
f3ced6d96c randomize collections of similar contacts on people#show 2010-12-16 16:37:13 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
maxwell
20ca2e2e93 make Notification.for return a query, not evaluate.. also limit notifications pulled back to 25 2010-12-16 11:16:09 -08:00
maxwell
1451db6cd8 fixed rspec build 2010-12-16 10:15:16 -08:00
maxwell
8ec85d3b12 basic notifications 2010-12-15 17:31:36 -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
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
Raphael
d3850292d5 Don't query current_user.contacts on every action 2010-12-14 12:38:48 -08:00
danielvincent
5731f32cfe add correct page titles 2010-12-09 20:09:20 -08:00
Sarah Mei
fea6884acc Mobile homepage looks decent. 2010-12-04 19:30:14 -08:00
danielvincent
a932547d12 minimizing some queries in the views. only select aspect names and ids in application controller. 2010-11-27 01:05:55 -05:00
maxwell
f4ff48f5c0 commenting out mobile for now. photos now post from only a users photos 2010-11-22 10:26:00 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
maxwell
c4a270ef8b putting mobile interface back in so we can get it cleaned up 2010-11-21 17:14:43 -08:00
danielvincent
988e2afe3d resolved missing translation, tweaked button css, commented out mobile_fu in application controller 2010-11-13 00:26:55 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00