Maxwell Salzberg
|
77fc40d404
|
add application helper to notification helper spec, made the link an object_link rather than status_message_link
|
2011-05-22 14:59:04 -07:00 |
|
Maxwell Salzberg
|
2f6d079635
|
added failure test for deleted likes
|
2011-05-22 14:45:16 -07:00 |
|
Maxwell Salzberg
|
66c28c4caf
|
notification page now has links for likes
|
2011-05-22 14:35:35 -07:00 |
|
Maxwell Salzberg
|
d4d3b1e44c
|
MSSM like notification are concatinated, and backfilled some like tests
|
2011-05-22 13:59:33 -07:00 |
|
MrZYX
|
a68031179b
|
prevent inviting yourself, #515
|
2011-05-22 14:48:07 +02:00 |
|
MrZYX
|
07395fb2c9
|
added maxlength attribute to aspect name input, fixed #675
|
2011-05-22 13:50:44 +02:00 |
|
danielgrippi
|
3fb81d37d0
|
missing closing tag in aspect_dropdown helper
|
2011-05-21 15:08:19 -07:00 |
|
danielgrippi
|
6a108104e8
|
add spacing
|
2011-05-21 14:56:11 -07:00 |
|
danielgrippi
|
0391795f80
|
better right pane sections
|
2011-05-21 14:52:59 -07:00 |
|
danielgrippi
|
7c949f4377
|
show diaspora handle on token page
|
2011-05-20 21:48:45 -07:00 |
|
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
|
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
|
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 |
|
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
|
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 |
|
MrZYX
|
331aa1ff60
|
you know the facepalm smiley? Here it is: m(
|
2011-05-19 20:10:35 +02:00 |
|
Ilya Zhitomirskiy
|
6cda0bf9ea
|
Revert "added a podwide email preference"
This reverts commit 60c0a9839b.
|
2011-05-18 10:38:45 -07: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 |
|
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 |
|
MrZYX
|
c47c9ef069
|
fix untranslated string; fix two translations; don't mess routes.rb again
|
2011-05-18 00:53:48 +02: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 |
|
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
|
775e7b6b2b
|
Merge branch 'master' into follow
Conflicts:
features/step_definitions/user_steps.rb
|
2011-05-17 11:33:35 -07:00 |
|
Raphael Sofaer
|
5218bd89c6
|
Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated.
This reverts commit 0a8ce3b9f2.
This reverts commit f9ef9a4b47.
This reverts commit 164226a3d7.
|
2011-05-17 10:33:33 -07:00 |
|
MrZYX
|
1746f610b6
|
if we disable websocket in single process mode, there's no need for the JS
|
2011-05-17 19:26:37 +02:00 |
|
Raphael Sofaer
|
0a8ce3b9f2
|
Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge
|
2011-05-17 10:24:28 -07:00 |
|
Raphael Sofaer
|
f9ef9a4b47
|
Make FakeServiceUser assoc methods tolerant of nil
|
2011-05-17 10:14:39 -07:00 |
|