carolina
|
d7e6ec8a4c
|
Add photo count
|
2013-08-19 12:49:38 +02:00 |
|
carolina
|
a7bfc542e1
|
Add view_all link below photo thumbnails
|
2013-08-19 12:49:38 +02:00 |
|
carolina
|
d107e7d11d
|
Changelog.md changed
|
2013-08-19 12:49:38 +02:00 |
|
carolina
|
9a5691c46a
|
Add to leftsidebar link to photos index + thumbnails from last 3 photos
|
2013-08-19 12:39:51 +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ß
|
a1f4c4b1d0
|
wild shot at stabilizing features/aspect_navigation.feature:18 by making sure all aspects are deselected after deselecting all aspects
|
2013-08-18 12:05:05 +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 |
|
Dennis Schubert
|
051cceaf34
|
Merge pull request #4371 from MrZYX/bump_devise
Update devise
|
2013-08-16 14:13:13 -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 |
|
Roger Braun
|
e9977af7b1
|
Fix specs for TemplatePicker
|
2013-08-16 11:08:22 +02:00 |
|
Roger Braun
|
ec9c8d7dae
|
Remove photo backdrop in single post view.
|
2013-08-16 10:46:15 +02:00 |
|
Fabian Rodriguez
|
3e15835386
|
Merge pull request #4341 from MrZYX/readme_rewrite
Proposal: new readme
|
2013-08-15 19:12:41 -07: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 |
|
Jonne Haß
|
e5bf54f2d0
|
Merge pull request #4385 from Flaburgan/change-default-value-profile
Remove placeholders for name fields in settings (no more Sofaer)
|
2013-08-14 12:24:26 -07: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 |
|
Jonne Haß
|
420561c502
|
Merge pull request #4383 from oliverbarnes/4361-breaks-facebook-posting
Rewrite twitter access-level check - fixes #4361
|
2013-08-12 15:05:18 -07:00 |
|
Oliver Azevedo Barnes
|
4b516603f7
|
Fix #4361 twitter access level check breaking facebook addition to user
Rewrite twitter access-level check
Fixed tests, still working on getting facebook up
Add heroku example to diaspora.example.yml
|
2013-08-12 13:17:18 -05:00 |
|
Jonne Haß
|
9c8dfb38ab
|
Merge pull request #4392 from movilla/search_mobile
Fix mobile search tags
|
2013-08-12 07:55:00 -07:00 |
|
movilla
|
152c08963a
|
fix mobile search tags
|
2013-08-12 16:01:26 +02:00 |
|
Sean Tilley
|
a5d7340129
|
Merge pull request #4388 from MrZYX/4378-reenable_getting_started
whitelist getting_started as a user settable attribute
|
2013-08-12 01:22:51 -07:00 |
|
Jonne Haß
|
ed7281d730
|
Merge branch 'refatoring-header' into develop
|
2013-08-11 23:30:37 +02:00 |
|
flaburgan
|
96337ef7d4
|
Fix regression in header style
|
2013-08-11 23:23:15 +02:00 |
|
Jonne Haß
|
2ca4cdec1b
|
Merge pull request #4389 from Flaburgan/refatoring-header
Extract and factorize the header css in a new file
|
2013-08-11 12:14:01 -07:00 |
|
flaburgan
|
820fa4e9b2
|
Extract and factorize the header css in a new file, fix ugly registration header design
|
2013-08-11 20:18:40 +02:00 |
|
Jonne Haß
|
14c78da6cd
|
whitelist getting_started as a user settable attribute, fixes #4378
|
2013-08-11 16:52:54 +02:00 |
|
Jonne Haß
|
041f7b7402
|
Merge branch 'max258-develop' into develop
|
2013-08-11 15:34:07 +02:00 |
|
Bender Bending Rodríguez
|
7086055f4e
|
Bitcoin donations
|
2013-08-11 15:31:05 +02:00 |
|
Jonne Haß
|
45e4817a58
|
expect the ajax request updating the profile name in features/signs_up.feature
|
2013-08-11 11:20:29 +02:00 |
|
Jonne Haß
|
bf9996b25d
|
lets see if page.should have_no_css actually waits for the element to disappear
|
2013-08-11 10:06:42 +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 |
|
Andrew Smith
|
65a14ccc2c
|
Fixed problem where the add_post_link method would truncate the status update in the middle of a link. This led to sending Twitter broken links.
Refactored :extract_truncated_link method
Removed complicated while loop in avoiding cutting off links, using refactoring from MrZYX
|
2013-08-10 14:40:53 -07:00 |
|
Jonne Haß
|
9d157670a4
|
Merge pull request #4386 from Faldrian/develop
Fixed global search field, will search when a dropdown item is clicked
|
2013-08-10 14:03:39 -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ß
|
4354e9497a
|
Merge pull request #4376 from Flaburgan/fix-mobile-view
fix mobile view
|
2013-08-10 12:39:09 -07:00 |
|
Faldrian
|
cc71ce4a2c
|
Fixed global search field, will search when a dropdown item is clicked
|
2013-08-10 19:59:05 +02:00 |
|
Jonne Haß
|
9b92d6a10a
|
bump devise to 3.0.2
|
2013-08-10 15:42:06 +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 |
|
Sean Tilley
|
7eb4707606
|
Merge pull request #4382 from goobertron/develop
Update javascript.en_1337.yml
|
2013-08-10 00:41:26 -07:00 |
|
goobertron
|
00a63d381a
|
Update javascript.en_1337.yml
Corrected a couple of spelling mistakes (don't ask me what I was doing looking in the 1337 file...!)
|
2013-08-10 00:45:59 +01:00 |
|
goobertron
|
8bffdb873a
|
Updated Facebook character limit.
|
2013-08-10 00:18:49 +01:00 |
|
flaburgan
|
895a7c79a3
|
Remove overflow hidden on welcome banner, close #4377
|
2013-08-10 00:07:02 +02:00 |
|
flaburgan
|
2e36fd6c67
|
fix mobile view
|
2013-08-09 23:12:14 +02:00 |
|
Antoine D
|
ef24275f7c
|
Make contacts visible in new aspect unchecked by default, close #4343
|
2013-08-09 22:13:40 +02:00 |
|