Jonne Haß
|
eda65f3258
|
Merge pull request #4464 from movilla/profile_mobile_500
Error 500 when visit probile mobile and logged out. Fix #4458
|
2013-08-29 05:19:18 -07:00 |
|
movilla
|
2b97f74015
|
error 500 when visit probile mobile and logged out. Fix #4458
|
2013-08-29 12:18:53 +02:00 |
|
Jonne Haß
|
26e13c5edf
|
Merge branch 'ssrihari-disable-mark-all-read' into develop
|
2013-08-29 12:13:32 +02:00 |
|
Jonne Haß
|
e194a07f18
|
Merge branch 'develop' of github.com:diaspora/diaspora into develop
Conflicts:
Changelog.md
|
2013-08-28 20:43:01 +02:00 |
|
Jonne Haß
|
e24e024f5f
|
Merge branch 'ssrihari-click-to-select-invite-link' into develop
|
2013-08-28 20:41:33 +02:00 |
|
svbergerem
|
fa7a03e9a7
|
Fix style in profile sidebar / contacts
|
2013-08-28 13:07:01 +02:00 |
|
Florian Staudacher
|
ba9e715c66
|
Merge branch '4239-move-federation-stuff-into-lib' of github.com:oliverbarnes/diaspora into oliverbarnes-4239-move-federation-stuff-into-lib
|
2013-08-27 22:05:27 +02:00 |
|
Jonne Haß
|
17580c123d
|
Merge pull request #4353 from netom/oembed_to_mobile_view
Added oembed display to mobile stream view
Conflicts:
app/views/status_messages/_status_message.mobile.haml
|
2013-08-27 21:59:00 +02:00 |
|
Jonne Haß
|
c94ca826b2
|
Merge pull request #4448 from ssrihari/fix-invite-code-input-width
Fixing Invite code input width to be same across browsers
|
2013-08-27 21:48:29 +02:00 |
|
Jonne Haß
|
f86ecdb327
|
Merge pull request #4441 from ssrihari/user-menu-highlight
Hightlighting the down-arrow next to user name on hover
|
2013-08-27 21:46:56 +02:00 |
|
Jonne Haß
|
625159c8ad
|
start new development cycle
|
2013-08-27 09:59:46 +02:00 |
|
Jonne Haß
|
2919c7c73f
|
bump to 0.2.0.0
|
2013-08-27 09:57:46 +02:00 |
|
flaburgan
|
3899e383ee
|
Re align check icon in aspect dropdown
|
2013-08-26 21:24:02 +02:00 |
|
Steffen van Bergerem
|
324b09a72a
|
add help page
|
2013-08-26 15:26:18 +02:00 |
|
Jonne Haß
|
f9a3990562
|
do not leak photos through photos#show
|
2013-08-26 09:39:39 +02:00 |
|
Jonne Haß
|
e58019fe8e
|
Merge pull request #4440 from Flaburgan/fix-contacts-page
Add aspect modification and fix check icon regression on contacts page, close #4397
|
2013-08-25 15:46:11 -07:00 |
|
Jonne Haß
|
20adeae204
|
add gem updates to changelog [ci skip]
|
2013-08-25 23:05:44 +02:00 |
|
flaburgan
|
96e18c6a7b
|
Add aspect modification and fix check icon regression on contacts page, close #4397
|
2013-08-25 21:42:32 +02:00 |
|
Jonne Haß
|
2d18184653
|
Merge branch 'ssrihari-header_icons_hover' into develop
|
2013-08-25 11:51:41 +02:00 |
|
Jonne Haß
|
1b7bc02eee
|
Merge pull request #4410 from rogerbraun/feature/spv-redesign
New single post view
Conflicts:
app/assets/stylesheets/application.css.sass
|
2013-08-22 10:37:25 +02:00 |
|
Roger Braun
|
039cf4dea1
|
Fix changelog.md
|
2013-08-22 09:56:36 +02:00 |
|
flaburgan
|
abba8d8dfc
|
Add header to the single post view
|
2013-08-22 09:56:34 +02:00 |
|
Steffen van Bergerem
|
7fe972555a
|
profile message and mention icons
|
2013-08-21 23:05:42 +02:00 |
|
flaburgan
|
ba886d127a
|
Valid meta elements, add pod personalization
|
2013-08-21 10:30:20 +02:00 |
|
Steffen van Bergerem
|
e5e63b09a3
|
fix opacity of control icons
|
2013-08-20 12:20:24 +02:00 |
|
Steffen van Bergerem
|
f22b4d7da7
|
Change contact list on profile page
|
2013-08-19 14:02:08 +02:00 |
|
carolina
|
d107e7d11d
|
Changelog.md changed
|
2013-08-19 12:49:38 +02:00 |
|
Jonne Haß
|
caae0d6af6
|
Merge pull request #4358 from arlogn/2943-fix-embedded-media-over-elements
Fix the overlapping of youtube embedded videos
|
2013-08-19 09:23:42 +02:00 |
|
Jonne Haß
|
684067be4f
|
Merge pull request #4409 from movilla/remove_comments
Remove comments from the mobile site. Close #4225
|
2013-08-16 15:21:35 -07:00 |
|
movilla
|
d1c679cc22
|
remove comments from the mobile site. Close #4225
|
2013-08-16 22:14:52 +02:00 |
|
Jonne Haß
|
22db89a361
|
Merge pull request #4408 from movilla/reremove_post
Remove post from the mobile site
|
2013-08-16 12:21:31 -07:00 |
|
movilla
|
73825ab94a
|
Remove post from the mobile site
|
2013-08-16 20:44:22 +02:00 |
|
Jonne Haß
|
3b06184d72
|
Merge pull request #4398 from movilla/deleted_reshared_mobile
Mobile Error 500 if a reshared (original) post will be deleted.
Conflicts:
Changelog.md
|
2013-08-16 14:08:53 +02:00 |
|
Jonne Haß
|
30778ffbd0
|
Merge pull request #4407 from rogerbraun/feature/spv-photo-background-removal
SPV photo background removal,
|
2013-08-16 14:07:43 +02:00 |
|
movilla
|
795a7a5751
|
mobile error 500 if a reshared (original) post will be deleted.
|
2013-08-16 12:07:14 +02:00 |
|
Jonne Haß
|
2207069b86
|
Merge pull request #4396 from movilla/registration_mobile_width
Fix layout on the registration page for mobile
Conflicts:
Changelog.md
|
2013-08-14 21:28:17 +02:00 |
|
movilla
|
77c4731157
|
fix layout on the registration page for mobile
|
2013-08-14 13:52:52 +02:00 |
|
flaburgan
|
485c0dae7f
|
Remove placeholders for name fields in settings (no more Sofaer)
|
2013-08-13 19:03:16 +02:00 |
|
movilla
|
152c08963a
|
fix mobile search tags
|
2013-08-12 16:01:26 +02:00 |
|
flaburgan
|
96337ef7d4
|
Fix regression in header style
|
2013-08-11 23:23:15 +02:00 |
|
Jonne Haß
|
041f7b7402
|
Merge branch 'max258-develop' into develop
|
2013-08-11 15:34:07 +02:00 |
|
Jonne Haß
|
f4169d7f30
|
Merge pull request #4384 from andrewcsmith/bug/4211-twitter-should-not-cut-links
Fixed problem where the add_post_link method would truncate the status update in the middle of a link
|
2013-08-11 00:25:12 +02:00 |
|
Sean Tilley
|
e7ea763ab5
|
Merge pull request #4373 from Flaburgan/patch-4
Make contacts visible in new aspect unchecked by default, close #4343
|
2013-08-10 15:00:16 -07:00 |
|
Jonne Haß
|
948939cd30
|
Merge pull request #4381 from goobertron/4380-facebook-count
Updated Facebook character limit.
|
2013-08-10 21:40:44 +02:00 |
|
Jonne Haß
|
cbfcea7198
|
Merge pull request #4379 from Flaburgan/fix-welcome-banner
Remove overflow hidden on welcome banner, close #4377
|
2013-08-10 12:02:58 +02:00 |
|
Antoine D
|
ef24275f7c
|
Make contacts visible in new aspect unchecked by default, close #4343
|
2013-08-09 22:13:40 +02:00 |
|
Jonne Haß
|
a2e5f1f88e
|
Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete
#4169 tag search autocomplete
|
2013-08-06 13:29:12 -07:00 |
|
Jonne Haß
|
a267f2a4db
|
Merge pull request #4354 from Flaburgan/improve-mobile-view
Improve mobile usability
Conflicts:
Changelog.md
|
2013-08-06 21:31:55 +02:00 |
|
Jonne Haß
|
efbd3c8605
|
Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth
Issue #4124 Check write access before authorizing Twitter
|
2013-08-06 21:21:56 +02:00 |
|
Jonne Haß
|
a67e2dc1cd
|
Merge pull request #4348 from svbergerem/4346-post-preview-auto-expand
auto expand post preview
Conflicts:
Changelog.md
|
2013-08-06 21:17:35 +02:00 |
|