Commit graph

6505 commits

Author SHA1 Message Date
maxwell
d91fda656c Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious"
This reverts commit ab997e2d21.
2011-03-14 09:51:06 -07:00
MrZYX
e8bb4c2d66 added preload='none' to the audio tag (#928) 2011-03-14 13:07:27 +01:00
Sarah Mei
03f90a999d refactor aspects controller spec 2011-03-13 21:32:59 -07:00
Sarah Mei
1d6a69ea82 refactor photos controller spec 2011-03-13 20:54:47 -07:00
Sarah Mei
1702081af7 refactor querying spec a bit 2011-03-13 20:08:53 -07:00
MrZYX
a544a189ff updated locales 2011-03-13 21:21:27 +01:00
MrZYX
2a5d41cc82 fixed translations for comments 2011-03-13 21:16:43 +01:00
MrZYX
5cae971ba1 added some languages 2011-03-13 13:20:20 +01:00
MrZYX
6ba0083337 updated locales 2011-03-13 13:19:12 +01:00
MrZYX
6af21e00ca Merge branch '913-new-bug' of https://github.com/kiranh/diaspora into pull 2011-03-12 13:03:40 +01:00
MrZYX
fb6e32e3bf Merge branch 'master' of https://github.com/williamtheaker/diaspora into pull 2011-03-12 13:02:00 +01:00
MrZYX
63caff1f40 updated locales 2011-03-12 12:55:37 +01:00
William Theaker
67affa2f5f wrench 2011-03-12 02:57:15 -05:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
maxwell
e52d14f1e9 attempting to fix bug #913 2011-03-11 17:43:55 -08:00
maxwell
ab997e2d21 js hack to see bigger version of photo thumbnails in the stream without being abnoxious 2011-03-11 17:16:43 -08:00
Jordi Mallach
59820d1994 Update Catalan translation to fd6545b. 2011-03-12 01:37:13 +01:00
Jordi Mallach
fd6545b609 Fix typos. 2011-03-12 01:30:07 +01:00
Jordi Mallach
2d5dc81854 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-12 01:07:58 +01:00
Jordi Mallach
0745a5ed7c Catalan translation update. 2011-03-12 01:07:31 +01:00
maxwell
50d9d76562 update translations for email settings, and missing translation for aspect#new 2011-03-11 16:02:24 -08:00
MrZYX
1c94600b66 Merge branch 'master' of github.com:diaspora/diaspora 2011-03-12 01:00:49 +01:00
maxwell
b7eec2e843 update schema.rb 2011-03-11 15:54:05 -08:00
Jordi Mallach
00b0edcd39 Fix typo. 2011-03-12 00:53:44 +01:00
maxwell
d825eeaaa0 updated to listen to disable mail 2011-03-11 15:43:40 -08:00
maxwell
580f0576c8 added test for edit 2011-03-11 15:43:29 -08:00
maxwell
52b970098b add specs for updating email settings in the controller, and user#mail 2011-03-11 15:43:29 -08:00
maxwell
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -08:00
maxwell
155290fb51 updating Gemfile.lock 2011-03-11 15:41:28 -08:00
Angjoo
5582c2b5f3 revert max width commit 2011-03-11 15:20:12 -08:00
Raphael Sofaer
0c31cc4259 quote string in migration! 2011-03-11 15:00:15 -08:00
Raphael Sofaer
98633658f4 delete from in migration 2011-03-11 14:59:01 -08:00
Raphael Sofaer
70e4a671a2 tags as array in migration 2011-03-11 14:57:46 -08:00
Raphael Sofaer
20d40b7440 fix execute command in migration 2011-03-11 14:56:25 -08:00
Raphael Sofaer
c256533a2f class, not instance method 2011-03-11 14:52:23 -08:00
Angjoo
2ff4af6800 fixed tab to spaces 2011-03-11 14:36:07 -08:00
Raphael Sofaer
7ac3692a92 Fix specs, migrate to downcase tags, still testing migration 2011-03-11 14:23:03 -08:00
Raphael Sofaer
8f1a6f502e Change equals to sort-of-equals 2011-03-11 14:23:03 -08:00
Angjoo
6e78d6f6c5 ajk ms css fix for header .container width 100% 2011-03-11 14:02:49 -08:00
Raphael Sofaer
9f368bf82f Change person show page to created_at ordering, since you're looking at that person's content 2011-03-11 10:15:17 -08:00
Raphael Sofaer
fbfd46a506 change peoplecontroller order, fix grammar in public default 2011-03-11 10:12:37 -08:00
MrZYX
879672576f fixed #919 2011-03-11 19:11:03 +01:00
MrZYX
b93084e04f updated locales 2011-03-11 17:28:14 +01:00
MrZYX
e3c5e7ba05 person -> author in app/views/comments/_comment.mobile.haml 2011-03-11 16:20:05 +01:00
MrZYX
c502e4591a do not confuse the terminology again, link #diaspora, not #diaspora-dev channel, link user mailing list 2011-03-11 15:46:12 +01:00
MrZYX
e4be5db881 there can be no reason to not set the locale 2011-03-11 15:37:33 +01:00
Maxwell Salzberg
14033e7b5f ajk ms or is a single pipe 2011-03-11 00:16:17 -08:00
Maxwell Salzberg
e2903a1251 get rid of the period, it might be screwing stuff up 2011-03-11 00:12:48 -08:00
Maxwell Salzberg
189b7fb5ac ajk ms only grab stream links 2011-03-11 00:01:01 -08:00