danielgrippi
|
c8e31825c5
|
Bookmark -> ActivitiyStreams::Photo
|
2011-05-19 11:57:06 -07:00 |
|
danielgrippi
|
dd31f37fd0
|
only generate new token if admin
|
2011-05-19 11:57:06 -07:00 |
|
danielgrippi
|
41e1d0dd86
|
show photos from cubbies in the streams
|
2011-05-19 11:57:06 -07:00 |
|
danielgrippi
|
9b941e6520
|
Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.
|
2011-05-19 11:57:06 -07:00 |
|
danielgrippi
|
be662a65c6
|
added token authenticatable to user model
|
2011-05-19 11:57:06 -07:00 |
|
Jonne Hass
|
01796fb7be
|
Merge pull request #641 from aneesh/malayalam-localization
Malayalam localization
|
2011-05-19 11:13:19 -07:00 |
|
MrZYX
|
331aa1ff60
|
you know the facepalm smiley? Here it is: m(
|
2011-05-19 20:10:35 +02:00 |
|
Anish A
|
174c5772af
|
Malayalam translation, final touchups
|
2011-05-19 23:25:58 +05:30 |
|
Anish A
|
626733b9f9
|
Malayalam translation, updated translations from me and siddique pk
|
2011-05-19 23:22:04 +05:30 |
|
Anish A
|
15fc0dd3ae
|
Malayalam translation, updated translations suggested from diaspora
|
2011-05-19 23:22:04 +05:30 |
|
MrZYX
|
e592e1b06e
|
updated locales
|
2011-05-18 23:33:21 +02:00 |
|
MrZYX
|
443b66ba32
|
one more important app_config
|
2011-05-18 20:56:22 +02:00 |
|
MrZYX
|
60870cab37
|
one more app_config
|
2011-05-18 20:53:45 +02:00 |
|
Shane Becker
|
910cc52387
|
rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011
|
2011-05-18 11:46:45 -07:00 |
|
Ilya Zhitomirskiy
|
6cda0bf9ea
|
Revert "added a podwide email preference"
This reverts commit 60c0a9839b.
|
2011-05-18 10:38:45 -07:00 |
|
MrZYX
|
d3fe903622
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-05-18 19:22:27 +02:00 |
|
MrZYX
|
1a78c8fca1
|
whoops lets do a deep merge
|
2011-05-18 19:22:15 +02:00 |
|
danielgrippi
|
d516d0a0f8
|
migration
|
2011-05-18 10:19:08 -07:00 |
|
MrZYX
|
2a449aa8c4
|
uncomment the new s3_region setting so that nobody needs to update his app_config.yml when he's using S3
|
2011-05-18 16:21:54 +02:00 |
|
Jonne Hass
|
ee1c394aa2
|
Merge pull request #639 from cyberkov/add-region-selection-for-s3
Added region config to carrierwave to select other regions than US
|
2011-05-18 07:20:16 -07:00 |
|
MrZYX
|
e79a6597e6
|
eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something
|
2011-05-18 16:11:20 +02:00 |
|
cyberkov
|
eb615c3e7e
|
Added region config to carrierwave to select other regions than US
|
2011-05-18 15:57:02 +02:00 |
|
MrZYX
|
a3c287ca9a
|
fixed #1023 (again)
|
2011-05-18 14:26:08 +02:00 |
|
MrZYX
|
66380fd33f
|
fixed some translations
|
2011-05-18 13:55:50 +02:00 |
|
MrZYX
|
b0e9f5388b
|
fixed a translation; added that missing </li> for you, fixed #1078
|
2011-05-18 13:22:05 +02:00 |
|
Jonne Hass
|
4bd266e9f0
|
Merge pull request #638 from aneesh/malayalam-localization
Malayalam localization
|
2011-05-18 02:18:53 -07:00 |
|
Anish A
|
ddfb1f00f4
|
Malayalam translation, completed devise and javascript directory
|
2011-05-18 07:55:13 +05:30 |
|
Anish A
|
3837d3b1f8
|
Malayalam translation, nearing completion
|
2011-05-18 07:27:40 +05:30 |
|
Ilya Zhitomirskiy
|
60c0a9839b
|
added a podwide email preference
|
2011-05-17 18:19:47 -07:00 |
|
Raphael Sofaer
|
0bb349ff08
|
Merge branch 'evant_log_post_merge'
|
2011-05-17 18:17:14 -07:00 |
|
Raphael Sofaer
|
c942f76d29
|
Turn off user collapse and turn up status messages to over 9000
|
2011-05-17 18:14:35 -07:00 |
|
Raphael Sofaer
|
f409ace067
|
Merge remote branch 'evant/354-long-post' into evant_log_post_merge
Conflicts:
config/assets.yml
|
2011-05-17 18:02:36 -07:00 |
|
MrZYX
|
2edec3c6ae
|
updated locales
|
2011-05-18 02:58:58 +02:00 |
|
MrZYX
|
f752b5a71b
|
change infinitescroll in mobile too, thanks @dmorley
|
2011-05-18 01:01:36 +02:00 |
|
MrZYX
|
c47c9ef069
|
fix untranslated string; fix two translations; don't mess routes.rb again
|
2011-05-18 00:53:48 +02:00 |
|
Raphael Sofaer
|
2953cc8497
|
Move infinite scroll out of vendor, because it has been edited
|
2011-05-17 15:06:21 -07:00 |
|
danielgrippi
|
0405b72477
|
removed some unused defs
|
2011-05-17 15:00:49 -07:00 |
|
Maxwell Salzberg
|
e95288e074
|
notifications by created at date so they stop jumping when you make them read
|
2011-05-17 14:44:42 -07:00 |
|
danielgrippi
|
0c62277961
|
add add to aspect dropdown on notifications page
|
2011-05-17 14:41:15 -07:00 |
|
Raphael Sofaer
|
d7980978fa
|
Render collection in services finder
|
2011-05-17 14:04:42 -07:00 |
|
MrZYX
|
79a684d072
|
copy crossdomain.xml to public
|
2011-05-17 22:59:40 +02:00 |
|
danielgrippi
|
26ac8b8285
|
fix 500 on people index
|
2011-05-17 12:24:07 -07:00 |
|
danielgrippi
|
57a2a8fa71
|
remove button to add yourself to an asepct on your profile page:
|
2011-05-17 12:14:05 -07:00 |
|
danielgrippi
|
9f3637de1b
|
Merge branch 'follow'
|
2011-05-17 11:34:34 -07:00 |
|
danielgrippi
|
775e7b6b2b
|
Merge branch 'master' into follow
Conflicts:
features/step_definitions/user_steps.rb
|
2011-05-17 11:33:35 -07:00 |
|
Raphael Sofaer
|
2aa9b33c0e
|
Update wording for contributor agreement
|
2011-05-17 11:15:02 -07:00 |
|
Raphael Sofaer
|
524e4ba1dd
|
Update contributor agreement link
|
2011-05-17 11:09:10 -07:00 |
|
danielgrippi
|
38e75d47f1
|
remove request notifications migration
|
2011-05-17 11:06:36 -07:00 |
|
danielgrippi
|
12b5bd4b23
|
remove pending contacts
|
2011-05-17 10:43:25 -07:00 |
|
danielgrippi
|
1bdfd770b7
|
check for redis only if not in single process mode
|
2011-05-17 10:34:40 -07:00 |
|