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

14422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
bc6ac28841 bump rb-inotify 2014-06-01 13:55:57 +02:00
Jonne Haß
08610f1b52 bump rack-cors 2014-06-01 13:55:57 +02:00
Jonne Haß
b749603d1e bump omniauth-wordpress 2014-06-01 13:55:57 +02:00
Jonne Haß
ef62fb8c89 bump omniauth 2014-06-01 13:55:57 +02:00
Jonne Haß
75107080c4 bump nokogiri 2014-06-01 13:55:57 +02:00
Jonne Haß
c25705a7e3 bump mysql2 2014-06-01 13:55:56 +02:00
Jonne Haß
dca5a6d8f3 bump markerb 2014-06-01 13:55:56 +02:00
Jonne Haß
241c584a0d bump guard-rspec 2014-06-01 13:55:56 +02:00
Jonne Haß
bb3fc500b1 bump gon 2014-06-01 13:55:56 +02:00
Jonne Haß
7b3abb1f11 bump fuubar 2014-06-01 13:55:56 +02:00
Jonne Haß
1704d71b22 bump fog 2014-06-01 13:55:51 +02:00
Jonne Haß
e8999332bf bump factory_girl_rails 2014-06-01 13:22:08 +02:00
Jonne Haß
85dc46b0de bump entypo-rails 2014-06-01 13:21:25 +02:00
Jonne Haß
5654d5921f bump devise 2014-06-01 13:20:06 +02:00
Jonne Haß
9f54d40428 bump database_cleaner 2014-06-01 13:19:14 +02:00
Jonne Haß
0ba9df6989 bump cucumber-rails 2014-06-01 13:18:24 +02:00
Jonne Haß
061373d2d4 bump compass-rails 2014-06-01 13:17:59 +02:00
Jonne Haß
cad043bfd7 bump carrierwave 2014-06-01 13:16:43 +02:00
Jonne Haß
f0b6f9315d bump backbone-on-rails 2014-06-01 13:15:16 +02:00
Jonne Haß
418c8d653d bump addressable 2014-06-01 13:11:57 +02:00
Jonne Haß
d34c932f53 try to make hovercards cuke even more stable 2014-06-01 12:15:20 +02:00
Jonne Haß
78fc90a2cd Merge pull request #4971 from MrZYX/hovercard_cuke 
Stabilize hovercards cuke
 2014-05-27 10:07:10 +02:00
Jonne Haß
3c01eb5dc4 Detect whether the stream has loaded more reliably in the hovercards cuke 2014-05-27 08:44:35 +02:00
Jonne Haß
a151ab9e30 Merge pull request #4970 from Flaburgan/realign-check-icons 
Realign check icon in aspect dropdown
 2014-05-27 08:07:28 +02:00
Jonne Haß
fc1f249129 Harden account deletion 
* Wrap it into a transaction
* Use destroy over delete so dependent destroys get triggered
  and we thus don't fail on the foreign key constraits
* Check if a photos status message actually exists before accessing
  it
* Add missing dependent destroys
 2014-05-27 00:15:15 +02:00
flaburgan
db18d9810c Realign check icon in aspect dropdown 2014-05-27 00:03:20 +02:00
Jonne Haß
1e09814b13 Enable Rails autoloading in rake tasks 
Then environment task disables, eager loading breaks with Devise
and requiring all needed files would be a mess
 2014-05-26 23:58:31 +02:00
Jonne Haß
553a5258a8 Merge pull request #4968 from taratatach/4967-use-https-for-osm-locator 
Use https to load the location from OSM
 2014-05-26 20:11:49 +02:00
Erwan Guyader
24d2ac0ec2 4967 Use https to load the location form OSM 2014-05-26 11:34:01 +02:00
Jonne Haß
5f0a11dfa6 Remove debug puts 2014-05-25 09:48:45 +02:00
Jonne Haß
e6348aa705 Use toggle() to hide the poll creator 2014-05-24 21:40:48 +02:00
Jonne Haß
77133a4062 Merge pull request #4963 from Ruxton/feature/rake_task_to_run_account_deletion_fixes_4792 
Rake task for running outstanding account deletions
 2014-05-24 18:03:10 +02:00
Jonne Haß
a3bfc4e92d Add changelog entry for #4758 [ci skip] 2014-05-24 17:58:20 +02:00
Jonne Haß
f650808828 Merge pull request #4758 from bronislav/feature/4724-remove-own-hovercard-popup-in-reshares 
[WIP] Fix hovercard in reshares
 2014-05-24 17:56:33 +02:00
Jonne Haß
9537c45d2a Merge pull request #4916 from hpetru/validate-poll-answer 
I added the validation to poll question and poll answer

Conflicts:
	app/assets/javascripts/app/views/publisher_view.js
 2014-05-24 17:42:18 +02:00
Jonne Haß
cbd9c56a7a Merge pull request #4919 from hpetru/4776-mention-on-mobile 
Unescape text before add mention, this commit solve #4776

Conflicts:
	Changelog.md
 2014-05-24 17:34:29 +02:00
Jonne Haß
0c5cc216c6 Replace vaild with valid 
Thanks to Josias for the hint
 2014-05-24 17:24:36 +02:00
Jonne Haß
ecb1b80e24 Render flash message content with .text 
.html does not escape any html input in these, leading to XSS
attack vectors.

Thanks to A Kai (@sixhundredns) for reporting the related issues.
 2014-05-24 16:08:32 +02:00
Jonne Haß
d36589e05b Remove hack from exporter 
I couldn't reproduce what the comment states anymore, so I just removed
it. This fixes a minor issue where html wouldn't be escaped in the
export.

Thanks to A Kai (@sixhundredns) for reporting.
 2014-05-24 15:27:13 +02:00
Jonne Haß
a216f267a0 Merge pull request #4965 from marienfressinaud/develop 
Remove duplicate checkbox in Settings
 2014-05-23 07:54:38 +02:00
Marien Fressinaud
fa2de8c195 Remove duplicate checkbox in Settings 
Fix issue #4964
 2014-05-22 22:39:09 +02:00
Florian Staudacher
693ded8298 unset any stream that might be left over from earlier specs 2014-05-20 20:52:25 +02:00
Ruxton
ba223fd3d7 Rake task for running outstanding account deletions 2014-05-19 16:05:16 +08:00
Florian Staudacher
46e3c5a870 add 'loginAs' to bookmarklet spec 2014-05-18 23:37:59 +02:00
Jonne Haß
bdaa32e70d updated 83 locale files [ci skip] 2014-05-17 11:52:31 +02:00
Jonne Haß
9e2c914a1b Merge pull request #4961 from Zauberstuhl/report_feature_issue_4959 
Do not try to render post/comment report which does not exist
 2014-05-16 16:10:06 +02:00
Lukas Matt
8170ef8363 Validate on report that post or comment does exist 2014-05-16 09:48:14 -04:00
Lukas Matt
6d6ebd297e Do not try to render posts/comments which are not present 
refs diaspora/diaspora#4959
 2014-05-16 09:48:14 -04:00
Jason Robinson
01381ddf25 Merge pull request #4957 from MrZYX/4956_deleted_reshare 
Use absolute_root more consistently in Reshare
 2014-05-16 10:00:31 +03:00
Jonne Haß
63c44d9f6b Merge pull request #4781 from Zauberstuhl/report_feature 
It is now possible to report posts and comments
 2014-05-15 19:53:44 +02:00