Commit graph

217 commits

Author SHA1 Message Date
Ariel Zavala
db41bcc144 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 21:09:11 -04:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
cryptix
c80a79dea5 Unified require quotes 2010-09-17 07:44:47 +08:00
Steve Klabnik
22edec5776 Adding Haml html escaping.
Haml's HTML escaping option was not on, leaving the site open for xss
attacks. This would seem to fix it.
2010-09-17 07:44:23 +08:00
Claudius Coenen
5197c1b3ec adding localisation for controller's flash messages' 2010-09-17 00:23:35 +02:00
Claudius Coenen
aeedf2fc22 adding german translation 2010-09-16 23:55:57 +02:00
Claudius Coenen
80f2880329 Merge branch 'locale-de' of http://github.com/felgru/diaspora 2010-09-16 23:43:22 +02:00
Ariel Zavala
8f56178bd2 added diaspora site specific localization files 2010-09-16 17:29:25 -04:00
Ariel Zavala
d7ca279fa9 Revert "Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml"
This reverts commit b7cfbd6fd7.
2010-09-16 17:27:26 -04:00
Ariel Zavala
b7cfbd6fd7 Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml 2010-09-16 17:05:11 -04:00
Ariel Zavala
060ba12376 Started Spanish Locale 2010-09-16 16:30:17 -04:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04: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
ab5e7319ee Added I18n initializer 2010-09-16 11:46:34 -04:00
ilya
81793d236c get_to_the_choppa is back 2010-09-15 22:54:51 -07:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +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
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08:00
Jesse Kriss
30e655fd6c adding heroku-friendly mongo config 2010-09-16 09:46:09 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Raphael
6dff249c73 Check for the presence of a password in the deploy config 2010-09-15 09:43:59 -07:00
Raphael
1d94039684 put in deploy configs 2010-09-14 22:28:13 -07:00
Daniel Vincent Grippi
da8ec589b7 RS, DG; display the correct tab on manage, change edit to manage 2010-09-14 10:05:59 -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
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
maxwell
baa048c579 MS changed some bundler stuff 2010-09-07 17:17:57 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -07:00
Raphael
fad32c12c3 Move routes around for clarity 2010-08-28 13:08:10 -07:00
maxwell
34cb15c423 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-27 13:33:39 -07:00
maxwell
d1bac3e078 MS added a log route for easy access 2010-08-27 13:33:28 -07:00
Raphael
7223d21721 Add singular move friend route, it must be eliminated later 2010-08-27 12:27:16 -07:00
Raphael
5ff1bdae90 Groups can now be batch edited 2010-08-27 12:23:20 -07:00
maxwell
a26229223c Merge branch 'master' of github.com:diaspora/diaspora 2010-08-25 18:07:49 -07:00
maxwell
b4174c664e you can now reassign a peson's group 2010-08-25 18:07:31 -07:00
Raphael
00f8a3e628 removed ensure_bson in user. added to_id method to String and ObjectID classes 2010-08-25 17:11:57 -07:00
ilya
45f3eb2a9a trying yet again 2010-08-24 15:37:55 -07:00
Raphael
143db96d7e No more socket debug 2010-08-24 14:45:50 -07:00
Raphael
03abd1ac21 Remove statuS MESsages new page. TaKE New OUt OF ROutes 2010-08-24 14:44:32 -07:00
Raphael
db33d94f07 Render nothing on status_messages create, Websockets now honestly
support multiple groups.
2010-08-24 14:36:03 -07:00
Raphael
6ab6dc1c3a Removing some unused routes 2010-08-24 11:06:56 -07:00