nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13057 commits 4 branches 0 tags 121 MiB
Commit graph

165 commits

Author SHA1 Message Date
Jonne Haß
ccedb6eff0 delegate parent_author to the target of a RelayableRetraction 2013-02-28 17:01:58 +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
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ß
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
Jonne Haß
0cf1c2d020 Sort tag followings alphabetically, not in reverse, fixes #3986 2013-02-24 16:22:01 +01:00
Fabián Rodríguez
eb8e777873 update changelog 2013-02-24 12:24:35 -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
movilla
e0d0d0f668 Fixed removing images from publisher on the profile and tags pages 2013-02-21 22:19:24 +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
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ß
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ß
0a124acdf0 Revert "fix regression from #3968" 
Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries"

This reverts commit ddfc558a9b.
This reverts commit 30ed4b4e70, reversing
changes made to f50ce2cb1d.

limiting the fetch of the IDs breaks paginating, there's no quick way to fix that

I left the spec in for future use.
 2013-02-16 23:48:10 +01:00
movilla
ce76f12591 friendlier new-conversation mobile 2013-02-16 22:53:43 +01:00
movilla
dfcc8e7c80 Overflow info_author mobile web 2013-02-16 14:51:51 +01:00
movilla
4d6110246e Overflow name author mobile post 2013-02-15 17:44:54 +01:00
Jonne Haß
ad4ba363a9 Merge branch 'hotfix/0.0.2.5' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
	config/defaults.yml
 2013-02-11 20:54:35 +01:00
Jonne Haß
f2ce9fa17f * Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58) 
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
 2013-02-11 20:51:02 +01:00
Lennart Prelle
2d0abe8309 added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01:00
movilla
63f1d1c197 friendlier mobile buttons 2013-02-09 15:23:04 +01:00
Jonne Haß
30ed4b4e70 Merge pull request #3968 from marpo60/limit_shareable_from_person_queries 
limit ShareablesFromPerson queries to improve performance
 2013-02-06 05:27:07 -08:00
Fabián Rodríguez
38cf1efdd4 update changelog 2013-02-05 23:52:04 -02:00
movilla
4343914cdb Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post 2013-02-04 21:31:48 +01:00
Ruxton
60f5173c77 Spec coverage for changelog_url and adjustment to behaviour 2013-02-04 11:00:57 +08:00
movilla
0ea7bc5258 Adapt css for search mobile page 2013-02-02 23:23:22 +01:00
Jonne Haß
865152be90 Merge pull request #3949 from movilla/gettins_started 
Add Getting_Started page mobile. Close #3854
 2013-02-02 08:00:16 -08:00
movilla
27813ec5dd Excessive padding with select aspect in mobile publisher 2013-02-02 16:41:14 +01:00
movilla
507e8ee199 Add Getting_Started page mobile 2013-02-02 16:02:19 +01:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop 
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
 2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948 
From a quick look at the for us available databases this was not actually used in the wild.
 2013-02-01 22:20:31 +01:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00