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

15735 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
4812dc7a23 Merge pull request #5849 from svbergerem/406-on-people-contacts-json 
Return 406 on people/guid/contacts, format json
 2015-04-06 12:49:46 +02:00
Jonne Haß
f4ed086ae0 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-06 12:30:11 +02:00
Jonne Haß
3fcd0c683c Merge pull request #5853 from svbergerem/update-changelog 
Add link to custom splash page wiki examples
 2015-04-06 12:29:21 +02:00
Steffen van Bergerem
e6cc20d686 Add link to custom splash page wiki examples 2015-04-06 12:26:28 +02:00
Steffen van Bergerem
a6b9c6c057 Return 406 on people/guid/contacts, format json 2015-04-04 03:48:44 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Jonne Haß
cc5bd16eb4 Merge pull request #5848 from svbergerem/migrate-only-sharing 
Fix only sharing flag for contacts that are receiving
 2015-04-04 00:16:37 +02:00
Jonne Haß
b90dc790e5 Merge pull request #5846 from svbergerem/fix-destroying-auto-follow-back-aspect 
Disable auto follow back on aspect deletion
 2015-04-04 00:13:24 +02:00
Jonne Haß
55593bfb86 Start undoing HoundCI derivations from Rubocop defaults 2015-04-04 00:01:22 +02:00
Steffen van Bergerem
c7c20f9b4e Fix only sharing flag for contacts that are receiving 2015-04-03 23:45:27 +02:00
Steffen van Bergerem
019dc1478c Add migration to remove deleted aspects from auto follow back 2015-04-03 23:02:41 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Jonne Haß
bec2508545 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-03 02:21:59 +02:00
Steffen van Bergerem
3e5eb350ae Notification dropdown: 'mark all as read' link scroll fix 2015-04-03 02:21:06 +02:00
Jonne Haß
0155d8972a Merge pull request #5839 from svbergerem/use-test-instead-of-match 
Use test instead of match wherever possible
 2015-04-01 23:54:42 +02:00
Steffen van Bergerem
f8707e0e1a Use test instead of match wherever possible 2015-04-01 18:35:20 +02:00
Jonne Haß
4b54e1684f Merge pull request #5837 from jhass/fix_default_url_options 
Move default_url_options to application.rb
 2015-04-01 18:34:27 +02:00
Jonne Haß
099bb01005 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 18:28:08 +02:00
Jonne Haß
2dd4bf0acf Merge pull request #5838 from svbergerem/check-stream-before-adding-posts 
Don't add mentions and reshares to all streams
 2015-04-01 18:27:06 +02:00
Jonne Haß
6e1b5397cb Merge pull request #5837 from jhass/fix_default_url_options 
Move default_url_options to application.rb
 2015-04-01 16:59:31 +02:00
Steffen van Bergerem
1701bc30d0 Don't add mentions and reshares to all streams 2015-04-01 16:51:08 +02:00
Steffen van Bergerem
fecd5947bb Merge pull request #5824 from SansPseudoFix/Fix-overflow-mobile-tag-page 
Fix tag overflow mobile page
 2015-04-01 16:29:42 +02:00
Jonne Haß
179654071b Move default_url_options to application.rb 
Apparently the subclasses got loaded before the initializers
were run, thus not inheriting the config.
 2015-04-01 14:59:07 +02:00
SansPseudoFix
5b90e1a060 Fix tag overflow mobile page 
modified:   app/assets/stylesheets/mobile/mobile.scss

	modified:   app/assets/stylesheets/mobile/mobile.scss
 2015-04-01 14:55:45 +02:00
Jonne Haß
205e527986 Merge pull request #5836 from svbergerem/missing-button-styles 
Fix missing button styles in donate and admin sections
 2015-04-01 14:36:04 +02:00
Steffen van Bergerem
6b024dcd45 Fix missing button styles in donate and admin sections 2015-04-01 13:34:56 +02:00
Jonne Haß
5dd5f0b176 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 04:02:47 +02:00
Jonne Haß
51c54caa34 Remove double entries from Gemfile.lock 2015-04-01 04:02:25 +02:00
Jonne Haß
548b0d8161 Rescue correct constant in Workers::ReceiveLocalBatch 
Fixes #5834
 2015-04-01 04:01:40 +02:00
Jonne Haß
0881810f4e Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 03:07:30 +02:00
Jonne Haß
5c78ab6838 Merge pull request #5832 from svbergerem/remove-border-conversations 
Remove border from conversation stream
 2015-04-01 03:07:07 +02:00
Jonne Haß
a33f6001c1 Merge pull request #5831 from svbergerem/update-markdown-it 
Bump markdown-it
 2015-04-01 02:54:30 +02:00
Jonne Haß
9d4e7f3953 Merge pull request #5830 from svbergerem/fix-text-contact-page 
Contacts page: remove broken title from 'Start a conversation' button
 2015-04-01 02:54:18 +02:00
Jonne Haß
606d7499c2 Merge pull request #5833 from svbergerem/javascript-styleguide 
Update javascript styleguide
 2015-04-01 01:26:41 +02:00
Steffen van Bergerem
fdf3817ee2 Update javascript styleguide 2015-04-01 01:24:11 +02:00
Steffen van Bergerem
cb04e40de7 Remove border from conversation stream 2015-04-01 01:03:15 +02:00
Steffen van Bergerem
ba67196f5b Bump markdown-it 2015-04-01 00:59:13 +02:00
Steffen van Bergerem
7870f3b127 Contacts page: remove broken title from 'Start a conversation' button 2015-04-01 00:47:31 +02:00
Jason Robinson
c0b8f03225 bump to 0.5.0.0-RC 2015-03-30 17:49:15 +03:00
Dennis Schubert
bafc3ae70e Merge pull request #5822 from jhass/default_view 
Replace default.html with a regular view
 2015-03-29 00:16:35 +01:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef Merge pull request #5817 from jhass/generated_error_pages 
Generate error pages on assets:precompile
 2015-03-28 21:46:35 +01:00
Jonne Haß
1d5d872d2b Merge pull request #5821 from svbergerem/fix-layout-regression 
Fix layout regression: missing header on search page
 2015-03-28 14:46:23 +01:00
Steffen van Bergerem
176938c486 Fix layout regression: missing header on search page 2015-03-28 13:54:52 +01:00
Jonne Haß
331f4ed988 updated 80 locale files [ci skip] 2015-03-27 11:44:44 +01:00
Jonne Haß
e7d0a978ba Generate error pages on assets:precompile 
This allows us to reuse any CSS we have, unify
their look and unify their look with the regular
page design.

This works by instantiating ActionView and rendering
templates in a rake task.

Inspired by the errgent gem.
 2015-03-27 11:15:59 +01:00
Dennis Schubert
b07ad67946 Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message 
Add 'no contacts in this aspect yet' message
 2015-03-27 03:50:42 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
Dennis Schubert
aff728833a Merge pull request #5818 from svbergerem/fix-frontend-regressions 
Fix frontend regressions
 2015-03-27 01:30:44 +01:00