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

12971 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
4dd1c728e5 ...and make sure that it is a new list item... [ci skip] 2013-02-15 01:10:46 +01:00
Jonne Haß
ea8fd164be Update Code Climate badge [ci skip] 2013-02-15 01:09:30 +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
Jonne Haß
c5f52248a6 Merge pull request #3967 from prellele/autoscroll_to_unread_messages_in_conversation 
added a id and a autoscroll to first unread message in conversation
 2013-02-11 08:22:03 -08: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
Jonne Haß
1c2b80b7aa Merge pull request #3973 from movilla/buttons_mobile 
Buttons on mobile are hard to click on
 2013-02-09 10:21:10 -08: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
Jonne Haß
f50ce2cb1d Merge pull request #3963 from movilla/publisher_counter 
Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post. Close #3956
 2013-02-06 05:24:53 -08:00
Fabián Rodríguez
38cf1efdd4 update changelog 2013-02-05 23:52:04 -02:00
Fabián Rodríguez
703c52f74c limit ShareablesFromPerson queries to improve performance 2013-02-05 23:35:00 -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
Jonne Haß
3f3b8f0d28 Merge pull request #3921 from Ruxton/feature/changelog_url 
Add a changelog_url helper
 2013-02-04 03:29:24 -08:00
Ruxton
60f5173c77 Spec coverage for changelog_url and adjustment to behaviour 2013-02-04 11:00:57 +08:00
Ruxton
ff7308685a Add a changelog_url helper so that pods can report a more correct changelog 2013-02-04 09:45:36 +08:00
Jonne Haß
880d440f3b bump recommended ruby and rubygems version to the latest and greatest 2013-02-04 00:40:12 +01:00
Jonne Haß
1b73817a5e bump and lock down rmagick 2013-02-04 00:39:41 +01:00
Jonne Haß
5a5d891a09 Merge pull request #3953 from movilla/search_mobile 
Adapt css for search mobile page
 2013-02-02 16:56:27 -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
Jonne Haß
801669850f Merge pull request #3951 from movilla/status_new 
Excessive padding with select aspect in mobile publisher
 2013-02-02 07:56:06 -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ß
dfbb6fa324 Merge branch 'hotfix/0.0.2.4' 2013-02-01 22:22:09 +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
Jonne Haß
1b3664a157 Merge pull request #3947 from asphxia/3272-repeated-post-on-stream 
Repeated post on stream fails when content is the same
 2013-01-31 17:42:20 -08:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Jonne Haß
baadb49ebf Merge pull request #3844 from asphxia/feature/3672-reshare-alert-box-appearing-twice 
Issue #3672: Reshare alert box is appearing twice
 2013-01-31 11:13:13 -08:00
Jonne Haß
ff10ffe43c update feature to match overriden translation 2013-01-31 19:31:38 +01:00
Jonne Haß
01299ee8e8 update spec to match overriden translation 2013-01-31 19:25:30 +01:00
Jonne Haß
1aa8b6e9f2 do not display the publisher on the profile photos page 2013-01-31 19:25:30 +01:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Jonne Haß
dc8a0eb94b Merge pull request #3914 from asphxia/3149-timeago-show-timestamp 
Hovering a Timeago-String should show the Timestamp
 2013-01-31 08:54:03 -08:00
Asphyxia
b91ed859a1 Hovering a Timeago-String should show the Timestamp 2013-01-31 13:43:37 -03:00
Jonne Haß
cba76060bf ensure our locales are at the bottom of the load path, fixes #2614 2013-01-31 16:41:09 +01:00
Jonne Haß
c763586a6a Merge pull request #3918 from asphxia/3910-stream-form-on-profile-page 
Stream form on profile page
 2013-01-31 03:32:54 -08:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Jonne Haß
d398365641 Merge branch 'movilla-settings_mobile' into develop 2013-01-29 15:13:19 +01:00
Jonne Haß
4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile 
Conflicts:
	Changelog.md
 2013-01-29 14:58:11 +01:00
Jonne Haß
58b4907de8 Merge pull request #3937 from marpo60/refactor-contacts-view 
Refactor contacts view
 2013-01-29 04:08:59 -08:00
Fabián Rodríguez
8c6b539224 update changelog 2013-01-29 10:02:46 -02:00
Fabián Rodríguez
8b4aab0780 change #count to #size in notifications_helper to reduce queries 2013-01-29 10:01:09 -02:00
Fabián Rodríguez
d4d3bf8af6 fix translation in contacts_helper 2013-01-29 10:01:08 -02:00
Fabián Rodríguez
649844ea6a Refactor contacts/index 2013-01-29 10:01:08 -02:00
Jonne Haß
099b4063d2 Merge pull request #3932 from marpo60/improve-tags-query 
don't join the tags table here, it makes the query slower
 2013-01-29 03:56:49 -08:00
Jonne Haß
6ded1238c7 bump configurate 2013-01-29 12:54:35 +01:00
Fabián Rodríguez
130e4cfbd2 update changelog 2013-01-28 19:24:27 -02:00
Fabián Rodríguez
4fa04e88ac don't join the tags table here, it makes the query slower 2013-01-28 18:57:26 -02:00