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

222 commits

Author SHA1 Message Date
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
livefromthemoon@gmail.com
cf82a0a9c8 Better to set the default locale in an initializer than in a before_filter 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
52522c102e add some basic verification when loading the languages config file 2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587 remove two useless lines of code 2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
livefromthemoon@gmail.com
6e1121179d guess locale from browser settings 2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
bfb1c6df28 collapsed layout views 2010-10-27 13:33:42 -07:00
zhitomirskiyi
fa484e95e4 MS IZ refactored querying 2010-10-26 17:05:38 -07:00
zhitomirskiyi
e776389d19 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-26 11:19:50 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
maxwell
c489f49a25 DG beginning to collapse twitter&facebook 2010-10-25 17:41:58 -07:00
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
ilya
d4702aefa3 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-15 17:20:19 -07:00
ilya
9727b356e1 the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
maxwell
a0ce9630b1 added test for facebook posting 2010-10-15 16:03:02 -07:00
ilya
0074aadd48 added a select tag to email invitations 2010-10-15 14:21:08 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
danielvincent
44338a9897 removed traces of :public 2010-10-08 14:44:56 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
6e407572c4 removed unused repost method, going through the warden object 2010-09-27 17:27:49 -07:00
ilya
7b29e6ec26 checking that a user is logged in before doing fb checking 2010-09-27 15:50:52 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
ilya
82b99decbb putting the token in the warden session 2010-09-24 10:45:27 -07:00
ilya
eaea26e58d the public aspect is now set in application controller 2010-09-23 19:33:33 -07:00
danielvincent
26478403e2 DG IZ; connecting/disconnecting from fb 2010-09-22 17:14:58 -07:00
danielvincent
159d72c04c DG IZ; logged in as? 2010-09-22 16:56:39 -07:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
maxwell
0d37f065dc MS RS fixed a small group adding bug 2010-09-14 15:13:55 -07:00
Daniel Vincent Grippi
24cd518f11 DG, RS; Album creation no longer ejects you from context 2010-09-14 11:00:16 -07:00
Daniel Vincent Grippi
a7c6e22e01 DG RS; passing around params[:aspect]. querying in application controller for current aspect. 2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
danielvincent
90ce31173a fixed errors on album/photo pages 2010-08-25 09:59:18 -07:00
Raphael
f9dd462957 Check for current user again 2010-08-24 19:32:38 -07:00
Raphael
5ac5f58679 Tabs on the top aren't all selected on group select, some other view tweaks 2010-08-24 19:22:43 -07:00
maxwell
b4ab91043a MS added check for current user 2010-08-24 13:45:38 -07:00
Raphael
d1c540439e Moved friending out to a lib file, specs all pass 2010-08-24 12:13:10 -07:00
Raphael
7ca9d1e791 Changed group_nav a little, deleted people_sidebar 2010-08-24 11:02:30 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
ilya
516a667ce4 going back to showing the first group on the index page 2010-08-18 16:35:11 -07:00
ilya
5de9362933 DG IZ setting group id to nil and changing the deploy script for renaming of the repo 2010-08-18 16:27:08 -07:00
ilya
b0088c73d8 DG IZ; user's own post gets referenced in group model 2010-08-18 10:37:33 -07:00
Raphael
d7a9c3c087 Take out another couple friends.first and replace with friend_by_id 2010-08-16 12:18:36 -07:00
Raphael
9947a2abb8 RS, DG; latest_status thing now works, started putting signup back in 2010-08-10 12:26:43 -07:00
Raphael
aa4d428ab7 RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in => 2010-08-10 11:02:04 -07:00
maxwell
d7d9c8aac5 MS put some current users checks into a single one 2010-08-09 21:30:56 -07:00
Raphael
744693e7fb RS, DG; There is now a add friend box on the front page that passes group idto the app 2010-08-09 17:33:54 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
maxwell
48adc9ebc1 DG MS; person object now properly stored with request object save 2010-07-09 14:07:35 -07:00
maxwell
b49f198c4f DG MS cleaned up some of the request stuff 2010-07-09 11:14:00 -07:00
maxwell
1fa2dfd6eb DG MS cleaning up friend request 2010-07-08 12:05:06 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
maxwell
dc5b321b62 sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up. 2010-06-30 00:27:11 -07:00
danielvincent
08d6a46bd8 login page 2010-06-28 22:18:05 -07:00
maxwell
4d65cfab09 MS^2 Added the friends panel to application layout 2010-06-25 19:22:05 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
maxwell
63866a8128 playing 2010-06-18 23:47:42 -07:00
danielvincent
02137b9fb9 DG MS; receive hook working. 2010-06-17 18:29:56 -07:00
danielvincent
3371b87fff DG MS; queue works. just need to move some tests over. 2010-06-17 11:32:13 -07:00
danielvincent
43207aeb41 pending: resolving post action in queue 2010-06-16 23:12:23 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00