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

2471 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielvincent
588de2f6a9 added link to exploits@joindiaspora.com 2010-09-16 12:14:16 -07:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29 websocket js should honor app socket port configuration 2010-09-17 03:11:11 +08:00
Hylke Bons
e18b8f0698 fix typo in COPYRIGHT 2010-09-17 03:09:28 +08:00
Ariel Zavala
5078830785 Added localization to comments views 2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383 Added localization to album views 2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04:00
Ariel Zavala
a0a207d0b8 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 14:55:08 -04:00
ilya
b880602497 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 11:48:59 -07:00
ilya
41f46c47b1 removed the deploy key, not needed now that the repo is public, thx for the heads up Juha @ Enemy & Sons Ltd 2010-09-16 11:48:24 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Felix Gruber
61ab7726b5 change 'en' to 'de' in devise.de.yml 2010-09-16 19:15:36 +02:00
Felix Gruber
c940955261 initial german translation 2010-09-16 19:05:14 +02:00
Ariel Zavala
53b05e7fb3 Added devise spanish locale 2010-09-16 11:47:54 -04:00
Ariel Zavala
46c3d83634 Merge branch 'master' of http://github.com/diaspora/diaspora into spanish-translation 2010-09-16 11:46:57 -04:00
Ariel Zavala
ab5e7319ee Added I18n initializer 2010-09-16 11:46:34 -04:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Michael Nutt
aa6b242563 websocket js should honor app socket port configuration 2010-09-16 03:08:33 -04:00
Michael Nutt
46a83324ab Warn if can't attach to websocket port 2010-09-16 03:08:33 -04:00
Michael Nutt
ef2e393ac8 Add bin directory to gitignore 2010-09-16 03:08:33 -04:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
Raphael
32fc6212ab Put only the hostname in diaspora_handle 2010-09-15 23:49:55 -07:00
Michael Fellinger
35c9922c61 And fix some more requires 2010-09-16 15:24:26 +09:00
Raphael
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00
Raphael
da51d35001 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 23:01:25 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
ilya
81793d236c get_to_the_choppa is back 2010-09-15 22:54:51 -07:00
Michael Fellinger
ba058a39a8 Replace require_relative with compatible version 2010-09-16 14:50:30 +09:00
Michael Fellinger
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Raphael Sofaer
7334501f2b Bring Gemfile.lock back 2010-09-15 22:27:15 -07:00
Jamie Wilkinson
295ae7fa93 'rake whitespace:clean' => 'rake whitespace:cleanup' 2010-09-16 13:19:03 +08:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Stephen Caudill
3d939a1119 Add task for retabbing all files in project 
Replace hard tabs with two character soft tabs.
 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
45c4bf5fa7 Checking in the bundler lockfile is proper behavior 2010-09-16 13:13:08 +08:00
Steve 'Ashcrow' Milner
3945e199eb added Fedora install information to README.md as well as a script for setting up a usable environment. 2010-09-16 13:08:30 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
0c6c4af277 'rake whitespace:cleanup' task 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
42aa6dcff3 I needed to roll factory_girl_rails into both :dev and :test bundle groups to get it to fly 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Patrick Aljord
a38655bd33 ignore Gemfile.lock 2010-09-16 09:59:55 +08:00
Paul Rosania
1e7c6c1867 Ignore .rvmrc 2010-09-16 09:50:26 +08:00
Paul Rosania
cdc009d701 Updated Gemfile.lock - no more mongo_ext 2010-09-16 09:49:57 +08:00
patcito
f6d8d68c25 Added doc for logging in. 2010-09-16 09:47:58 +08:00
patcito
10da8eebb1 MongoDB doesn't need to be started manually if installed using the Ubuntu package. 2010-09-16 09:47:57 +08:00
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08:00