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

7469 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jordi Mallach
6a39dec635 Updated Catalan javascript to 331aa1f. 2011-06-01 11:50:13 +02:00
Jordi Mallach
191b5f1a28 Update Catalan translation to 05aa73e. 2011-06-01 11:47:16 +02:00
Raphael Sofaer
0770d6e8fd Most of the stream.js stuff needs to be live, unfortunately. 2011-05-31 16:00:57 -07:00
Raphael Sofaer
62977e1d15 Don't initialize the stream if there is no stream. 2011-05-31 15:18:59 -07:00
Raphael Sofaer
203e05bf3a Remove console.logs 2011-05-31 14:32:07 -07:00
Dan Hansen
b1bbfbac32 Merge branch 'master' of github.com:diaspora/diaspora 2011-05-31 15:52:59 -05:00
Dan Hansen
0edc160007 Clean up stream.js, make the comments step selector more sane 2011-05-31 15:52:17 -05:00
MrZYX
ed33c0b47a updated locales 2011-05-31 22:16:16 +02:00
MrZYX
7dd20a5e8b this hopefully fixes catalan and maybe even malayalam (#1110) 2011-05-31 22:13:47 +02:00
Raphael Sofaer
537de1ce4c build_like and build_comment now take only an options hash, and call build_relayable 2011-05-31 12:27:58 -07:00
Raphael Sofaer
71c3a29aa6 Move YoutubeTitles callback into module 2011-05-31 12:27:57 -07:00
Jonne Hass
1be2845687 Merge pull request #650 from yolk/1104-wrong-profile-picture-size 
fixed #1104 wrong profile picture size
 2011-05-31 10:33:26 -07:00
Jonne Hass
ecfb75cecb Merge pull request #649 from yolk/1018_aspects_width 
fixed #1018 - aspects width on /aspects/manage
 2011-05-31 10:28:38 -07:00
Sebastian
d4d0eacf49 fixed #1104 wrong profile picture size 2011-05-31 19:06:35 +02:00
Sebastian
d9f23b5e2a fixed #1018 - aspects width on /aspects/manage 2011-05-31 18:29:24 +02:00
Jonne Hass
35a0a13b5e Merge pull request #648 from rtznprmpftl/optimizedimages 
optimized images (safes a few bits and makes pagespeed shut the fuck up )
 2011-05-31 08:47:18 -07:00
Nicolas Berens
c9417ec93f optimized images (safes a few bits and makes pagespeed shut the fuck up ) 2011-05-31 17:34:22 +02:00
MrZYX
05aa73e93c made everything in the sidebar translatable 2011-05-30 18:06:05 +02:00
MrZYX
61fd8b55af updated locales 2011-05-29 23:28:55 +02:00
MrZYX
3db4772652 ignore searchable if one searches by handle in people#index 2011-05-29 22:58:33 +02:00
MrZYX
502f467012 fix youtu.be links 2011-05-29 22:13:42 +02:00
MrZYX
42f5f7fc32 fixed find person by handle 2011-05-29 21:27:20 +02:00
MrZYX
c937f76433 specs for new methods in user model 2011-05-29 18:46:30 +02:00
MrZYX
cd887e9373 fixed unlike the right way 2011-05-29 18:15:46 +02:00
MrZYX
7b864dd208 Rails, welcome to 2011. Fyi: string concatenation is bad 2011-05-29 18:14:54 +02:00
MrZYX
d66fc9d99f fix validation message if text is too long 2011-05-29 16:45:41 +02:00
MrZYX
a89b072d61 I always forget that space… 2011-05-29 16:19:20 +02:00
MrZYX
dd607fb47d user can now disable thin and use ./script/server to fire up resque and websocket only 2011-05-29 16:11:29 +02:00
MrZYX
0febee6fbb fix unlike 2011-05-29 13:43:56 +02:00
Sarah Mei
32d3219bf6 Fix that one freaking exporter example that was apparently failing spuriously. Actually, we had bad xpath that grabbed the wrong created_at, and it only passed when the created_at times were the same. 2011-05-29 00:08:11 -07:00
Sarah Mei
5b6eca893b Put jasmine.Clock.tick back down to 200 (bumped to 400 during debugging & accidentally checked in) 2011-05-28 22:23:07 -07:00
Sarah Mei
8de71d41e4 Don't need to export the selenium server port anymore on CI. Yay! 2011-05-28 22:22:06 -07:00
Sarah Mei
6d6445b00a Fix locale loading in stream spec 2011-05-28 21:22:35 -07:00
Sarah Mei
f732d20f0c Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt. 2011-05-28 21:03:39 -07:00
Raphael Sofaer
cfd077a90d Fix the thing that I broke in the build, fix syntax error in the build that disabled stream-spec 2011-05-28 20:37:12 -07:00
Sarah Mei
5676fdc73e fix jasmine specs 2011-05-28 20:18:40 -07:00
Sarah Mei
f16cf223eb This test was not testing how person objects are actually built. Fixed. 2011-05-28 20:14:18 -07:00
Sarah Mei
828cbab792 Keep pod_url and pod_uri settings in sync. 2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
MrZYX
4e5c6f0c97 updated locales 2011-05-29 04:14:25 +02:00
Raphael Sofaer
503de3efe1 Fix facebox close button and loading gif 2011-05-28 18:18:22 -07:00
MrZYX
787a5ae749 don't update timestamps in the migration 2011-05-27 19:57:51 +02:00
MrZYX
54f1effdf8 Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora 2011-05-27 19:35:39 +02:00
MrZYX
f5488bd032 made migration more failure tolerant 2011-05-27 19:26:47 +02:00
Jakob Kramer
0efaa77c46 fixes bug #1092 2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2 Photo association on GUID 2/2: replace status_message_id with status_message_guid 2011-05-27 18:56:24 +02:00
MrZYX
fba69bd8a5 Photo association on GUID 1/2: Migration 2011-05-27 17:32:09 +02:00
MrZYX
307b69c7cf Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-05-27 15:34:58 +02:00
MrZYX
0bfb6f01c6 updated locales 2011-05-27 15:34:50 +02:00
Jonne Hass
fcf3334cf7 Merge pull request #645 from cyberkov/994-fix-typos-in-appyml-example 
fixed typos as mentioned in bug 994
 2011-05-27 06:10:22 -07:00