Raphael Sofaer
|
286f1b876d
|
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
|
2011-05-20 15:14:23 -07:00 |
|
danielgrippi
|
e9dbcc7972
|
rvmrc says ree
|
2011-05-20 14:59:13 -07:00 |
|
Maxwell Salzberg
|
15c4463c2a
|
gemfile wars
|
2011-05-20 14:54:04 -07:00 |
|
MrZYX
|
a605ed80dd
|
updated locales
|
2011-05-20 21:40:56 +02:00 |
|
MrZYX
|
e79ef29a39
|
fixed that super annoying bug on the notificaitons page
|
2011-05-20 21:36:06 +02:00 |
|
danielgrippi
|
16351227f7
|
use aspect dropdowns everywhere; updated rake to 0.9.0
|
2011-05-20 11:50:41 -07:00 |
|
Maxwell Salzberg
|
1e3971da3d
|
i think we want to not prevent non admins...
|
2011-05-19 22:22:03 -07:00 |
|
Arzumy MD
|
7c1a2f8d1d
|
add remove_contact to en.yml to fix the build
|
2011-05-20 11:05:06 +08:00 |
|
Arzumy MD
|
a060acffeb
|
add spec for admins_controller#add_invites
|
2011-05-20 10:51:04 +08:00 |
|
Arzumy MD
|
0ee41b3be5
|
removed user variable from admins_controller#user_search
|
2011-05-20 09:37:32 +08:00 |
|
Raphael Sofaer
|
93be5497a7
|
Small controller for generating an auth token, if you are an authable user
|
2011-05-19 18:29:53 -07:00 |
|
Raphael Sofaer
|
ed61c53e09
|
Wrap UsersController to not 500 when no params are submitted
|
2011-05-19 17:01:42 -07:00 |
|
Raphael Sofaer
|
c95ce3bd0c
|
Raise translation errors in specs
|
2011-05-19 17:01:42 -07:00 |
|
Raphael Sofaer
|
7912c8af3b
|
Be nicer about changing app_config.yml to app.yml
|
2011-05-19 17:01:41 -07:00 |
|
danielgrippi
|
b0967ad8b4
|
Fakes respond as expected to respond_to?
|
2011-05-19 16:24:12 -07:00 |
|
danielgrippi
|
f2259e5e25
|
put link in via link translation, add via link to mobile site
|
2011-05-19 16:06:29 -07:00 |
|
danielgrippi
|
83756c5713
|
actually add the views. fix object_path
|
2011-05-19 15:34:39 -07:00 |
|
danielgrippi
|
d7899d10e3
|
Fix various links in to cubbi.es objects
|
2011-05-19 15:17:42 -07:00 |
|
Maxwell Salzberg
|
69e83bb065
|
remove whitespace on your own profile
|
2011-05-19 15:08:17 -07:00 |
|
Maxwell Salzberg
|
8796c5b722
|
fixed build, added debugging info for notification 500s
|
2011-05-19 14:48:09 -07:00 |
|
Maxwell Salzberg
|
3c4c62abd5
|
moved auth token to admins page, and added a link in the dropdown
|
2011-05-19 14:23:04 -07:00 |
|
danielgrippi
|
925292a7b2
|
hey, federation works.
|
2011-05-19 13:20:58 -07:00 |
|
danielgrippi
|
177061d1c5
|
added via links
|
2011-05-19 13:13:08 -07:00 |
|
danielgrippi
|
6c31867345
|
check for AS object in partial hack
|
2011-05-19 12:40:05 -07:00 |
|
danielgrippi
|
5fdc0fb8d8
|
Merge branch 'cubbies-connection'
|
2011-05-19 12:20:17 -07:00 |
|
danielgrippi
|
e7095ba788
|
Tests now pass, stream_element needs de-hacking
|
2011-05-19 12:19:27 -07:00 |
|
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 |
|