Commit graph

4352 commits

Author SHA1 Message Date
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
Raphael
fb85ffe406 Adding specs for log_overrider 2010-11-26 18:38:08 -05:00
Alexandre DE DOMMELIN
b0a123b270 Fix hidden fields issue in Iceweasel 2010-11-26 23:23:32 +01:00
Michael Sofaer and Raphael Sofaer
b9cafc0579 Revert "removing the form for user creation thru signup". Shutting down magent is a less annoying solution.
This reverts commit 4c96e12a31.
2010-11-26 17:16:11 -05:00
Raphael
77d46b2d66 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 17:09:38 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
MrZYX
a0f9fb35f3 made pagination translatable 2010-11-26 21:20:28 +01:00
Sarah Mei
f8229d07e8 Adding copyright to js files 2010-11-26 12:16:10 -08:00
Hexagon
a16f35325c Changing default smtp auth to plain 2010-11-26 20:15:02 +01:00
Hexagon
36415b0c73 Its now possible to use smtp-servers with no authentication 2010-11-26 20:00:22 +01:00
danielvincent
bf66be9ea4 fixed template error on statusmessage controller 2010-11-26 13:29:49 -05:00
MrZYX
d6f95445c5 made em-webfinger errors translatable 2010-11-26 19:14:07 +01:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
maxwell
e83271ef22 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 09:57:18 -08:00
maxwell
4c96e12a31 removing the form for user creation thru signup 2010-11-26 09:56:30 -08:00
MrZYX
6e5b097f81 try at fixing a translation 2010-11-26 18:33:52 +01:00
Michael Sofaer and Raphael Sofaer
8636f5d1d9 Maybe don't disable proxy buffering 2010-11-26 12:19:26 -05:00
Hexagon
63a7496c8b Removing sprinkle 2010-11-26 18:13:53 +01:00
Michael Sofaer and Raphael Sofaer
b54164cef8 Don't do expensive things on invalid users 2010-11-26 11:55:54 -05:00
Hexagon
a4f1614fb2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 17:28:15 +01:00
Hexagon
f87ac4cb0b Adjusting YT-video size for posts 2010-11-26 17:28:08 +01:00
MrZYX
bb49c227cd updated locales, thank you all 2010-11-26 16:56:51 +01:00
MrZYX
16df4e5d94 Merge branch '602-add-i18n-to-make_public-in-publisher' of https://github.com/siefca/diaspora into siefca-602-add-i18n-to-make_public-in-publisher 2010-11-26 16:41:38 +01:00
Hexagon
3f8383cfd8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 16:27:54 +01:00
Hexagon
2efb99adf5 Merge branch 'OhaiBBQ-master-fix' 2010-11-26 16:27:24 +01:00
MrZYX
57a7a0fe23 fixed some missing translations 2010-11-26 16:26:52 +01:00
Hexagon
bd204c554e Fixing errors in application.sass 2010-11-26 16:20:12 +01:00
Hexagon
a520b371e1 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix 2010-11-26 16:18:41 +01:00
Paweł Wilk
7e2e95df76 Added i18n for 'make public' message in views/shared/_publisher.haml 2010-11-26 16:09:19 +01:00
Michael Sofaer and Raphael Sofaer
6eb1e461fb nginx logs for splunk 2010-11-26 10:03:59 -05:00
MrZYX
4f67b72801 fixed build 2010-11-26 15:52:39 +01:00
MrZYX
e916e33482 pulled and merged request 509, thanks siefca 2010-11-26 15:48:08 +01:00
MrZYX
8cc57aed82 Merge branch '597-add-i18n-to-sign-up-button' of https://github.com/siefca/diaspora into siefca-597-add-i18n-to-sign-up-button 2010-11-26 15:34:46 +01:00
Dan Hansen & Sarah Mei
257d6f414a Top-level Diaspora object for js widget management 2010-11-25 22:24:25 -08:00
Raphael
78fb5fec73 Absolute logpath for magent 2010-11-26 00:57:19 -05:00
danielvincent
417301088f fixed build 2010-11-26 00:56:53 -05:00
Dan Hansen & Sarah Mei
84face159d Removing unused js 2010-11-25 21:44:57 -08:00
Raphael
9a828f5215 Remove nginx logs unless we get a license for splunk 2010-11-26 00:37:29 -05:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
Dan Hansen & Sarah Mei
5075a7384b allow hyphens in YouTube video IDs 2010-11-25 21:05:54 -08:00
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -05:00
Raphael
33ba00377e Add performance spec 2010-11-25 23:53:45 -05:00
Dan Hansen
37c2e52be9 Fixed styling for a video in a comment 2010-11-25 20:53:05 -08:00
danielvincent
e56df5c159 fixed issue rendering partial for a comment in comments#create 2010-11-25 23:34:59 -05:00
Michael Sofaer and Raphael Sofaer
502b4dde30 Merge branch 'invitation_flow' 2010-11-25 23:18:01 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd Make the getting_started aspects page more like the manage page 2010-11-25 23:17:27 -05:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
Dan Hansen
21fa3fff8c Styling for the youtube iframe 2010-11-25 19:54:09 -08:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00