Raphael Sofaer
d9d66a5c31
WIP auth form and more oauth stuff
2011-06-08 11:55:11 -07:00
Arzumy MD
c0f5571795
do not unnecessary build the feed in users_controller#public when we want to redirect anyway
2011-06-08 17:50:13 +08:00
danielgrippi
96fc104218
paginate looks for stream elements
2011-06-06 23:12:14 -07:00
danielgrippi
b8a6bf9f51
trying something different on app show page. worth a shot.
2011-06-06 22:59:31 -07:00
Raphael Sofaer
8a2fece0f5
Don't n-query in contacts_sharing_with
2011-06-05 01:03:34 -07:00
Raphael Sofaer
753be12a1f
Don't force a query on like count
2011-06-05 00:32:10 -07:00
Raphael Sofaer
6d105e5c09
Don't n query in UsersController#public
2011-06-04 22:34:48 -07:00
Sarah Mei
243699c8e9
Tumblr service swallows exceptions raised by tumblbeasts.
2011-06-04 20:45:09 -07:00
Raphael Sofaer
21463582d4
Fix pagination on notifications page, it was getting all notifications for a user
2011-06-04 15:48:10 -07:00
Maxwell Salzberg
de55a1cbb3
remove remember aspects feature
2011-06-03 17:35:27 -07:00
Maxwell Salzberg
4b13c83de7
Chubbies now uses sqlite to have tables of pods and users
2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d
chubbies tests mow take diaspora handle
2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03
Chubbies now sends manifest data to create a client
2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d
Chubbies now sees that it has no secret and registers itself.
2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d
Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow
2011-06-03 16:22:38 -07:00
danielgrippi
40ab168a5a
DH DG; fix re-liking a post after unliking it
2011-06-03 12:20:59 -07:00
Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Maxwell Salzberg
149c086d5e
make the tumblr posting smarter
2011-06-02 17:02:29 -07:00
Dan Hansen
bc465848c9
MS DH fixed like sizes, everywhere
2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63
fix status message show page and break out Post to it's own javascript widget
2011-06-02 17:45:45 -05:00
MrZYX
82ca293825
fix services index with incomplete oauth_keys.yml
2011-06-02 13:20:22 +02:00
MrZYX
668c4ddfc5
d'oh
...
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
2011-06-02 12:32:21 +02:00
Maxwell Salzberg
f7181a7123
add tumblr translation
2011-06-01 22:43:23 -07:00
Maxwell Salzberg
72c6efe41c
basic specs
2011-06-01 22:38:15 -07:00
Maxwell Salzberg
5cbbdf2949
initial post to tumblr support
2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262
added pagination for people on tag pages
2011-06-01 18:59:15 -07:00
Raphael Sofaer
283e376712
Move initialize_signatures method out of user and into relayable
2011-06-01 16:45:30 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
MrZYX
de9e41a331
fixed total contact count
2011-06-01 12:23:37 +02:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Raphael Sofaer
71c3a29aa6
Move YoutubeTitles callback into module
2011-05-31 12:27:57 -07:00
Jonne Hass
1be2845687
Merge pull request #650 from yolk/1104-wrong-profile-picture-size
...
fixed #1104 wrong profile picture size
2011-05-31 10:33:26 -07:00
Sebastian
d4d0eacf49
fixed #1104 wrong profile picture size
2011-05-31 19:06:35 +02:00
Sebastian
d9f23b5e2a
fixed #1018 - aspects width on /aspects/manage
2011-05-31 18:29:24 +02:00
MrZYX
05aa73e93c
made everything in the sidebar translatable
2011-05-30 18:06:05 +02:00
MrZYX
3db4772652
ignore searchable if one searches by handle in people#index
2011-05-29 22:58:33 +02:00
MrZYX
502f467012
fix youtu.be links
2011-05-29 22:13:42 +02:00
MrZYX
42f5f7fc32
fixed find person by handle
2011-05-29 21:27:20 +02:00
MrZYX
cd887e9373
fixed unlike the right way
2011-05-29 18:15:46 +02:00
MrZYX
7b864dd208
Rails, welcome to 2011. Fyi: string concatenation is bad
2011-05-29 18:14:54 +02:00
MrZYX
d66fc9d99f
fix validation message if text is too long
2011-05-29 16:45:41 +02:00
MrZYX
0febee6fbb
fix unlike
2011-05-29 13:43:56 +02:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
MrZYX
54f1effdf8
Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora
2011-05-27 19:35:39 +02:00
Jakob Kramer
0efaa77c46
fixes bug #1092
2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2
Photo association on GUID 2/2: replace status_message_id with status_message_guid
2011-05-27 18:56:24 +02:00
MrZYX
ba08c38a74
fixed activity_streams::photo controller spec
2011-05-26 00:01:10 +02:00
Maxwell Salzberg
52487e87de
added a very basic page for the stream of all public activity stream photos
2011-05-25 12:57:29 -07:00
danielgrippi
d12944d57e
record objectId in post (cant use object_id booo)
2011-05-25 12:16:52 -07:00
Maxwell Salzberg
56644c9d1e
use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n
2011-05-24 21:45:12 -07:00
Sarah Mei
5e56b8a0ee
HULK SMASH PENDING SPEC
2011-05-24 23:36:00 -04:00
MrZYX
db22be43a8
really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF
2011-05-24 17:03:48 +02:00
danielgrippi
3f66458386
remove text from token page explaining there is no FF cubbies extension
2011-05-24 07:42:37 -07:00
Maxwell Salzberg
20cc3f0c7d
change the smiley for a heart.... the smiley looked sad at that size..
2011-05-23 23:53:18 -07:00
Raphael Sofaer
fc7b2cfe3f
Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation.
2011-05-23 23:09:48 -07:00
Raphael Sofaer
609439f948
Destroy notifications on contact destroy
2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781
Gross, but hopefully temporary solution for namespaced classes and old versions of libxml
2011-05-23 16:24:28 -07:00
Raphael Sofaer
cc84051541
Fall back to author if the diaspora_handle isn't set, that column just needs to be removed
2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0
Fix AS::Photo federation, hopefully
2011-05-23 13:56:42 -07:00
MrZYX
c732940b58
match trailing slash for vimeo links
2011-05-23 14:32:16 +02:00
danielgrippi
8e3149ca01
better page explaining cubbi.es and why we're promoting it on diaspora
2011-05-23 01:14:33 -07:00
Maxwell Salzberg
d776105558
grammer nazi cleanup of notification_people_link and refactor + tests
2011-05-22 17:18:44 -07:00
Maxwell Salzberg
90d62f3c8a
small ui tweak for mobile login page
2011-05-22 15:43:39 -07:00
Maxwell Salzberg
a4017ba16f
small linebreak for cubbies view for mobile
2011-05-22 15:25:37 -07:00
Maxwell Salzberg
59ae829254
there is a dumb bug where likes are targeting themselves
2011-05-22 15:02:01 -07:00
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
Raphael Sofaer
164226a3d7
Replace ServiceUser with fakes in ServicesController
2011-05-16 18:48:03 -07:00
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07:00
Raphael Sofaer
495dd89dd2
Fix password reset, add cucumber feature
2011-05-16 15:54:18 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
956f0044a9
set @contacts_of_contact_count in photos#index, thanks LPrelle
2011-05-16 16:21:13 +02:00
MrZYX
e338886910
fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled
2011-05-16 15:16:01 +02:00
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6
Users can log in on their phones again.
...
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
2011-05-14 14:58:52 -07:00
danielgrippi
01be909e38
well, that was dumb. (fix cucumber)
2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -07:00
danielgrippi
a02b9c01c8
eager loading aspect memberships
2011-05-13 18:22:42 -07:00
danielgrippi
30796de400
switching the order around to utilize eagerloading
2011-05-13 16:58:24 -07:00
danielgrippi
ee49fb3547
no more n-query in the view problem
2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1
Don't use rails case_sensitive false, it is very slow.
2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf
fixed cucumber with an exception of one step. added dropdowns to tag pages
2011-05-12 14:11:52 -07:00
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500
slimming down application_helper, moved markdown and aspect related methods to individual helpers
2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992
fix 500 on tags#show
2011-05-12 12:32:31 +02:00
MrZYX
9f070593ff
check if we can all cleaned_is_rtl? before doing it in direction_for helper
2011-05-12 11:05:32 +02:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea
fixed the formatting on emails
2011-05-11 17:02:05 -07:00
Raphael Sofaer
970190fb7a
OMG SO MANY EMAILS, fixed
2011-05-11 16:07:24 -07:00
danielgrippi
c67d143719
dropdown in ContactsController#sharing now works
2011-05-11 15:47:13 -07:00
Raphael Sofaer
6fa433ced8
added the header back
2011-05-11 15:33:39 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877
added translation to the likes popup, made the notification models a little clearer
2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f
unliking works right now minus on-page feedback
2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0
Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
...
This reverts commit bd74ab4acc .
This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc
Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec
2011-05-10 23:19:36 -05:00
Raphael Sofaer
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
Raphael Sofaer
37be13d4e0
Fix facebook finder and tests
2011-05-10 11:22:52 -07:00
=
2a11bb208e
Add message inbox link to mobile menu
2011-05-10 12:08:05 -05:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
danielgrippi
d34774f4e5
png favicon
2011-05-09 16:24:24 -07:00
danielgrippi
68601e392e
halfway to a better welcome/getting started page. wip.
2011-05-08 22:15:26 -07:00
MrZYX
3b7dd1906f
fixed 500 on /people/:person_id/photos
2011-05-08 21:36:27 +02:00
Raphael Sofaer
160e01f7bd
Fix broken sorting by activity
2011-05-07 00:50:26 -04:00
Maxwell Salzberg
7a2f6dae10
fixed js error on new comments on statusmessage show page
2011-05-06 15:29:39 -07:00
Arzumy MD
6ba2b00fb8
cleaned up formatting in application_helper, removed unnecessary return
2011-05-06 00:18:58 +08:00
Arzumy MD
2c4954bac8
spec for application_helper#page_title, with default text
2011-05-06 00:14:18 +08:00
danielgrippi
7e838fc778
only display contacts you are sharing with in aspect edit panes
2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10
#1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor
2011-05-05 00:05:59 +08:00
MrZYX
77bae90d0e
moar mappings for process_emoticons
2011-05-04 15:28:42 +02:00
Raphael Sofaer
87864bf4ff
people.diaspora_handle, not profiles.diaspora_handle
2011-05-03 11:39:34 -07:00
Raphael Sofaer
f89b6ae5be
Fix all contacts link
2011-05-03 11:02:08 -07:00
Raphael Sofaer
c7358c8664
Fix rendering into json for names with quotes
2011-05-03 10:50:13 -07:00
MrZYX
a92b28b4bf
general search and replace in markdownify ( #1042 )
2011-05-03 17:46:29 +02:00
Maxwell Salzberg
c20cd5381e
create a new notifciation if previous was read, only concatinate when it is the same unread message
2011-05-02 18:18:30 -07:00
Raphael Sofaer
567b440f3d
Use correct pagination in mobile person show
2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
MrZYX
b23f9b39eb
fixed adding contact feedback on people search result page
2011-04-30 17:00:52 +02:00
MrZYX
ff58d63191
minor cleanup to routes.rb
2011-04-30 16:28:39 +02:00
MrZYX
6623dbb1f1
fixed #1039
2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
Raphael Sofaer
28a997c2cd
Fix pagination on tags, specs are red, need to take all helpers out of applicationController
2011-04-28 09:28:59 -07:00
Raphael Sofaer
b4e36878fe
Fix pages after 1 on tag page
2011-04-28 09:28:59 -07:00
Dan Hansen
c1366e0e04
Make photos display inline on StatusMessage#show
2011-04-27 17:06:26 -05:00
Dan Hansen
4a101f25d9
Notifications.js refactor, add specs
2011-04-27 16:22:56 -05:00
Raphael Sofaer
5dcfff104a
Merge remote branch 'ritchewilson/prev_next'
...
Conflicts:
public/stylesheets/sass/mobile.sass
2011-04-19 17:05:12 -07:00
maxwell
9850a3f124
change text on manage services popup
2011-04-18 18:38:03 -07:00
maxwell
62c164e1a4
fixed displays of the days based on locale
2011-04-18 18:29:55 -07:00
maxwell
d70ef86337
make the days the right size in notification page
2011-04-18 17:55:17 -07:00
MrZYX
c06b885aa7
fixed #1027
2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980
basically fixed
2011-04-18 15:10:47 -07:00
maxwell
2223c562c0
first fix of notification page
2011-04-18 15:10:47 -07:00
maxwell
5050307179
Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])"
...
This reverts commit 981d39d220 .
2011-04-18 15:10:46 -07:00
MrZYX
981d39d220
Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])
...
This reverts commit a16e83df9e .
2011-04-16 14:03:24 +02:00