Commit graph

15249 commits

Author SHA1 Message Date
Jason Robinson
8cd4ce2381 Add changelog for #5489 [ci skip] 2015-01-17 03:42:11 +02:00
Jason Robinson
5c810a8a2e Merge pull request #5489 from collimarco/solved5482
Solved #5482
2015-01-17 03:39:03 +02:00
Jason Robinson
6513053586 Merge pull request #5499 from gdpelican/feature/json-exporter-deux
JSON Exporter, part deux
2015-01-17 00:51:38 +02:00
Jonne Haß
df0691cf9a bump rails-assets-diaspora_jsxc 2015-01-15 17:23:08 +01:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
Dennis Schubert
393f0292bf Merge pull request #5550 from maliktunga/patch-2
"privacy aware" should be "privacy-aware"
2015-01-14 03:53:41 +01:00
Jonne Haß
a1e1e1030e Merge pull request #5551 from svbergerem/markdown-it-sanitizer
Add more markdown-it plugins
2015-01-13 11:47:13 +01:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins
activate sanitizer, sub and sup
2015-01-13 03:41:06 +01:00
Gilles-Philippe Morin
85129fba2c "privacy aware" should be "privacy-aware"
http://www.w3.org/2005/Incubator/socialweb/XGR-socialweb-20101206/
https://cs.uwaterloo.ca/~uhengart/publications/gis10.pdf
http://research.microsoft.com/pubs/152497/01main.pdf
http://www.amazon.com/Privacy-Aware-Knowledge-Discovery-Applications-Techniques/dp/143980365X
2015-01-12 18:01:43 -05:00
Steffen van Bergerem
e5d725a604 Merge pull request #5545 from svbergerem/markdown-it-hashtag-0.2.3
Bump markdown-it-hashtag to v0.2.3
2015-01-11 18:52:25 +01:00
Steffen van Bergerem
0d9fd0aaac Bump markdown-it-hashtag to v0.2.3 2015-01-11 18:17:17 +01:00
Jonne Haß
b347022622 Merge pull request #5543 from svbergerem/markdown-it-3.0.3
Bump markdown-it to 3.0.3
2015-01-11 03:24:29 +01:00
Steffen van Bergerem
d692e6df7d Bump markdown-it to 3.0.3, markdown-it-hashtag to 0.2.2 and markdown-it-diaspora-mention to 0.1.2 2015-01-11 02:54:30 +01:00
Jason Robinson
e558562d4f Merge pull request #4830 from Flaburgan/dont-truncate-notification-emails
Don't truncate notification emails anymore
2015-01-11 00:34:52 +02:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +01:00
Jonne Haß
47cba24cf8 Merge pull request #5541 from svbergerem/posix-bracket-expressions-cleanup
Remove chars from PosixBracketExpressions that js doesn't like
2015-01-10 21:53:13 +01:00
Steffen van Bergerem
2541fc74d4 Remove chars from PosixBracketExpressions that js doesn't like 2015-01-10 21:38:03 +01:00
Jonne Haß
5b2d615d82 Merge pull request #5526 from svbergerem/update-pagedown
Replace pagedown by markdown-it
2015-01-10 20:38:35 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Jonne Haß
c246e80b1d Merge pull request #5536 from dimaursu/autoprefixer
Invert button gradient
2015-01-09 17:42:50 +01:00
Dumitru Ursu
36b66624e2 Invert gradient 2015-01-09 17:13:35 +02:00
Jonne Haß
9fffe6aa4f Merge pull request #5535 from dimaursu/autoprefixer
Use the standard syntax for gradient
2015-01-09 15:54:41 +01:00
Dumitru Ursu
80b4cb90ef Use the standard syntax for gradient 2015-01-09 16:49:26 +02:00
Jonne Haß
145aac4d28 Merge pull request #5532 from dimaursu/autoprefixer
Remove CSS vendor prefixes and switch to autoprefixer
2015-01-09 12:55:42 +01:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02:00
Dumitru Ursu
4ba1032f42 Add autoprefixer 2015-01-07 13:02:53 +02:00
Jonne Haß
9c99ae357a Merge pull request #5493 from collimarco/solved5341 2015-01-06 14:43:58 +01:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs
Port contacts page to backbonejs
2015-01-06 14:38:55 +01:00
Jonne Haß
d7a3559f4b Merge pull request #5472 from svbergerem/fix-typo-profile-header
Fix typo in profile_header_view
2015-01-06 14:37:34 +01:00
Jonne Haß
3f49bc52f4 Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu
Add followed tags to the mobile menu

Conflicts:
	Changelog.md
2015-01-06 14:35:37 +01:00
Jonne Haß
e94e9add1a Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons
Add currency setting to paypal donation and allow unhosted button setting

Conflicts:
	Changelog.md
2015-01-06 14:32:57 +01:00
Steffen van Bergerem
99fd5712b2 Fix jasmine specs
toBeTruethy and toBeFalsy don't test anything
use toBeTruthy() and toBeFalsy() instead
2015-01-04 17:13:18 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Steffen van Bergerem
c9ef1f290e Merge pull request #5509 from flamontagne/5273-missing-link-in-help-tags
Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ
2015-01-03 20:35:17 +01:00
François Lamontagne
4c33a6adeb Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273) 2015-01-03 13:25:16 -05:00
Steffen van Bergerem
59e9597c77 Remove asyncSubHeader from app.pages.Profile 2015-01-03 15:20:33 +01:00
Jonne Haß
8fa0ae1db2 Merge pull request #5494 from margori/4266-remove-content-from-email-notifications
Remove limited content from email notifications
2014-12-29 17:33:43 +01:00
Marcelo Briones
fe6052865c Remove limited content from email notifications 2014-12-28 22:15:47 -03:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
flaburgan
3ff298606f Add menu mobile and drawer navigation tests 2014-12-28 18:49:03 +01:00
Flaburgan
f9e9a0521d Add followed tags to the mobile menu 2014-12-28 13:48:48 +01:00
Steffen van Bergerem
731adffa78 Merge pull request #5497 from jhass/og_reshare_fix
Handle reshares of deleted posts in OpenGraph tags generation code
2014-12-27 15:44:02 +01:00
Jonne Haß
45b385d694 Handle reshares of deleted posts in OpenGraph tags generation code 2014-12-27 15:07:16 +01:00
Marco Colli
8dea4b5fd9 Solve #5341 2014-12-24 11:52:12 +01:00
Marco Colli
f775d74cfd Add failing test 2014-12-24 11:49:35 +01:00
Jonne Haß
6c9f191696 Merge pull request #5491 from collimarco/solved5348
Solve #5348
2014-12-23 23:00:06 +01:00
Jason Robinson
30eaf82762 Merge pull request #5481 from svbergerem/remove-stream-template
Remove unused stream template
2014-12-22 23:30:55 +02:00
Marco Colli
76cc5e2d5c Add ActiveRecord::RecordNotFound catching. Add tests. 2014-12-22 12:36:09 +01:00
Marco Colli
d75071bac9 Solve #5348 2014-12-20 19:09:33 +01:00
Marco Colli
1ac2e728f4 Solved #5482 2014-12-20 11:05:12 +01:00