Jonne Haß
|
c5ecc872ce
|
add integration spec for retracting a comment
|
2013-02-28 17:20:33 +01:00 |
|
Jonne Haß
|
ccedb6eff0
|
delegate parent_author to the target of a RelayableRetraction
|
2013-02-28 17:01:58 +01:00 |
|
Jonne Haß
|
df1abefc1c
|
Merge pull request #4015 from movilla/upload_photo_1
Fix css and js error with upload photo mobile
|
2013-02-27 17:11:04 -08:00 |
|
movilla
|
9b2d3c66bf
|
fix css and js error with upload photo mobile
|
2013-02-28 01:09:40 +01:00 |
|
Jonne Haß
|
b1cdc30367
|
Merge pull request #4004 from movilla/upload_photo
Upload photo mobile. Close #3324
|
2013-02-26 15:30:09 -08:00 |
|
movilla
|
76b1e9b0dc
|
Add the ability to upload photos from the mobile site
|
2013-02-26 23:25:58 +01:00 |
|
Jonne Haß
|
cf9659de4a
|
fix XSS vulnerability in conversations#new, closes #4010
|
2013-02-26 19:09:30 +01:00 |
|
Jonne Haß
|
3e32472dbb
|
Merge branch 'hotfix/0.0.3.2'
|
2013-02-26 19:06:40 +01:00 |
|
Jonne Haß
|
d6ff67fde2
|
fix XSS vulnerability in conversations#new, closes #4010
|
2013-02-26 19:06:01 +01:00 |
|
Jonne Haß
|
1b4f919b5e
|
Merge pull request #4008 from pestrada/3836-avoid-empty-comments
avoid posting empty comments
|
2013-02-26 02:47:33 -08:00 |
|
pestrada
|
3f3409a0a5
|
avoid posting empty comments
fix Jasmine test
updated changelog with bugfix #3836
fix changelog update
remove wrong bug fix line
|
2013-02-25 18:27:46 -06:00 |
|
Jonne Haß
|
3c9ce435e1
|
Merge branch 'hotfix/0.0.3.1' into develop
Conflicts:
Changelog.md
config/defaults.yml
|
2013-02-24 17:26:45 +01:00 |
|
Jonne Haß
|
4a92508281
|
Merge branch 'hotfix/0.0.3.1'
|
2013-02-24 17:25:39 +01:00 |
|
Jonne Haß
|
b487c389bc
|
release 0.0.3.1
|
2013-02-24 17:25:02 +01:00 |
|
Jonne Haß
|
6bb644f058
|
Sort tag followings alphabetically, not in reverse, fixes #3986
|
2013-02-24 17:23:01 +01:00 |
|
movilla
|
5d46baf33e
|
Wrap text if too long in mobile notifications
Conflicts:
Changelog.md
|
2013-02-24 17:23:01 +01:00 |
|
movilla
|
bfa8b92c57
|
Fixed removing images from publisher on the profile and tags pages
|
2013-02-24 17:23:01 +01:00 |
|
Jonne Haß
|
ee0d7b2e8b
|
move custom splash page login into the controller, fixes #3991
|
2013-02-24 17:23:01 +01:00 |
|
movilla
|
099f4a61e4
|
Include our custom fileuploader on the mobile site too
|
2013-02-24 17:23:01 +01:00 |
|
Jonne Haß
|
e232e164e4
|
exec foreman in script/server
|
2013-02-24 17:23:00 +01:00 |
|
Jonne Haß
|
ce8b3c89db
|
update changelog; replace "pre" releases with a plain "head"
Conflicts:
config/defaults.yml
|
2013-02-24 17:22:56 +01:00 |
|
Florian Staudacher
|
c984499d38
|
Merge pull request #3997 from MrZYX/reversed_tag_followings
Sort tag followings alphabetically, not in reverse, fixes #3986
|
2013-02-24 08:05:26 -08:00 |
|
Jonne Haß
|
0cf1c2d020
|
Sort tag followings alphabetically, not in reverse, fixes #3986
|
2013-02-24 16:22:01 +01:00 |
|
Jonne Haß
|
75c67e7d9b
|
Merge pull request #4002 from marpo60/refactor_people_show
Refactor people show
|
2013-02-24 07:09:10 -08:00 |
|
Fabián Rodríguez
|
eb8e777873
|
update changelog
|
2013-02-24 12:24:35 -02:00 |
|
Fabián Rodríguez
|
c1eb986f5b
|
remove unnecessary code from people_controller#contacts and use #each in view
|
2013-02-23 22:36:04 -02:00 |
|
Fabián Rodríguez
|
e76935daaf
|
remove inline styles from views/people/show
|
2013-02-23 22:36:04 -02:00 |
|
Fabián Rodríguez
|
7472642bd1
|
Refactor:
*people_controller#show
*photos_controller#index
*views/people/show both html and mobile
|
2013-02-23 22:36:03 -02:00 |
|
Jonne Haß
|
19b9b0edb8
|
Merge pull request #3990 from movilla/mismatch_author_name
Wrap text if too long in mobile notifications
|
2013-02-22 07:51:20 -08:00 |
|
movilla
|
c52a878e86
|
Wrap text if too long in mobile notifications
|
2013-02-22 16:15:25 +01:00 |
|
Florian Staudacher
|
f788f3426a
|
Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed
Include reshares in the public user feed, closes #1781
|
2013-02-21 13:37:29 -08:00 |
|
Jonne Haß
|
fe850e9e6e
|
Merge pull request #3995 from movilla/delete_upload
Delete images uploaded publisher profile/tags
|
2013-02-21 13:28:11 -08:00 |
|
movilla
|
e0d0d0f668
|
Fixed removing images from publisher on the profile and tags pages
|
2013-02-21 22:19:24 +01:00 |
|
Jonne Haß
|
abaf7f9a27
|
bump selenium-webdriver
|
2013-02-21 16:54:26 +01:00 |
|
Jonne Haß
|
35350d1ceb
|
Include reshares in the public user feed, closes #1781
|
2013-02-21 14:32:28 +01:00 |
|
Jonne Haß
|
0fd3bcb397
|
move custom splash page login into the controller, fixes #3991
|
2013-02-21 13:46:04 +01:00 |
|
Jonne Haß
|
125cbef69c
|
Merge pull request #3994 from movilla/upload_mobile
Problem with the button to upload images on the mobile interface
|
2013-02-20 16:31:44 -08:00 |
|
movilla
|
5769abcc32
|
Include our custom fileuploader on the mobile site too
|
2013-02-20 16:01:08 +01:00 |
|
Jonne Haß
|
5cede18e8d
|
exec foreman in script/server
|
2013-02-18 21:31:54 +01:00 |
|
Jonne Haß
|
ba9aee5902
|
update changelog; replace "pre" releases with a plain "head"
|
2013-02-18 20:20:50 +01:00 |
|
Jonne Haß
|
1f4787aa6d
|
Merge pull request #3980 from L3MNcakes/feature/facebook_delete
Feature/facebook delete
|
2013-02-18 11:17:51 -08:00 |
|
L3MNcakes
|
1120cba5f0
|
Issue #3939: Posts to Facebook do not delete
|
2013-02-18 18:21:59 +00:00 |
|
Jonne Haß
|
288e1ddd6c
|
Merge branch 'release/0.0.3.0'
|
2013-02-17 18:55:26 +01:00 |
|
Jonne Haß
|
35ba082ab5
|
Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop
Conflicts:
Changelog.md
|
2013-02-17 15:48:34 +01:00 |
|
Jonne Haß
|
40b10dc0d9
|
Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop
Conflicts:
Changelog.md
|
2013-02-17 15:47:20 +01:00 |
|
Jonne Haß
|
4264804343
|
Merge pull request #3984 from movilla/frienliar_new_conversation
Friendlier new conversation mobile
|
2013-02-17 06:44:59 -08:00 |
|
Jonne Haß
|
c5e712b17a
|
fix markdown syntax in the changelog [ci skip]
|
2013-02-17 15:09:15 +01:00 |
|
Jonne Haß
|
469b361869
|
update changelog [ci skip]
|
2013-02-17 14:58:28 +01:00 |
|
Jonne Haß
|
f3093ca8ae
|
Merge pull request #3864 from Raven24/aspect_memberships
[WIP] aspect membership dropdown Backbone.js rework
|
2013-02-17 05:54:12 -08:00 |
|
Jonne Haß
|
1f0f9dabc1
|
last minute updates to french locale
|
2013-02-17 14:52:25 +01:00 |
|