Steffen van Bergerem
92a3dd53f0
Replace jquery.autoresize with autosize
2015-06-14 20:03:15 +02:00
Jonne Haß
40913f000a
make assets:generate_error_pages depend on environment [ci skip]
2015-06-08 10:37:37 +02:00
Dennis Schubert
8a4ec1d4c6
Merge branch 'stable' into develop
2015-06-08 04:18:38 +02:00
Benjamin Neff
d42b5c128e
update photos when received over public path
...
closes #6082
2015-06-08 04:18:31 +02:00
Benjamin Neff
e16b9af7e6
make public and private receiver work similar ...
2015-06-08 04:15:17 +02:00
Benjamin Neff
c75f92d07a
add XMLLogger to debug federation
2015-06-08 04:15:17 +02:00
Dennis Schubert
0c6ca1d235
Merge branch 'stable' into develop
2015-06-08 00:58:20 +02:00
Benjamin Neff
aa2297a8c0
retry receive share-visibility when failed while receiving parallel
...
refactoring:
- remove unused return-values (were used for caching, which was removed again)
- remove transaction (doesn't help here, added in 2615126closes #6068
2015-06-08 00:58:00 +02:00
Jonne Haß
ab1e879cc2
Merge branch 'stable' into develop
2015-06-07 11:36:12 +02:00
Benjamin Neff
2571b042c6
only log private stuff to debug
...
closes #6069
2015-06-07 11:36:07 +02:00
Jonne Haß
7bfa0f857c
Merge branch 'stable' into develop
2015-06-06 15:23:44 +02:00
Jonne Haß
6c71d9f257
Only strip text direction markers around hashtags for now
...
Fixes #6067
2015-06-06 15:23:12 +02:00
Dennis Schubert
b41007fae7
Merge branch 'stable' into develop
2015-06-04 04:18:34 +02:00
Benjamin Neff
27b4a44e4a
replace Rails.logger with logging-logger
...
closes #6041
2015-06-04 04:17:15 +02:00
Benjamin Neff
b6c46b3fc4
add logging mixin and replace federation-logger
2015-06-04 04:16:03 +02:00
Jonne Haß
3850118e4e
Merge branch 'stable' into develop
2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e
Set default for post title truncation to 70 characters
...
closes #6022
2015-06-02 12:14:35 +02:00
Dennis Schubert
8c4bcd8bd3
Merge branch 'stable' into develop
2015-05-31 01:47:09 +02:00
Steffen van Bergerem
fdad348898
Fix tag rendering in emails
...
closes #6009
2015-05-31 01:47:05 +02:00
Dennis Schubert
44919233c0
Merge branch 'stable' into develop
2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658
handle when the diaspora xml parser returns nil
...
closes #5991
2015-05-28 01:34:24 +02:00
Dennis Schubert
f9f73f56db
Merge branch 'stable' into develop
2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2
Introduce 'authorized' configuration option for services
...
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.
Clarifies the situation for #5923 , #5260 and #5085 .
closes #5985
2015-05-25 04:18:38 +02:00
Dennis Schubert
944c57f874
Merge branch 'stable' into develop
2015-05-18 03:23:43 +02:00
Benjamin Neff
196e438286
remove some hardcoded diasporahq hax
2015-05-18 03:23:14 +02:00
Jonne Haß
13b69f81d1
Merge branch 'stable' into develop
2015-05-16 13:54:05 +02:00
Benjamin Neff
d74e20a790
fetch public posts when someone starts sharing with you
...
closes #5960
2015-05-16 13:54:01 +02:00
Jonne Haß
ca33e984d3
Merge branch 'stable' into develop
2015-05-16 12:48:41 +02:00
Benjamin Neff
30cc330747
fix empty searchable in hcard, parse empty as false
...
closes #5962
2015-05-16 12:48:33 +02:00
Dennis Schubert
42a408045e
Merge branch 'stable' into develop
2015-05-16 03:44:35 +02:00
Benjamin Neff
c01fdb6e1c
fix the url for the public-posts json
...
closes #5958
2015-05-16 03:44:31 +02:00
Jonne Haß
59e77675ce
Merge branch 'stable' into develop
2015-05-10 00:10:19 +02:00
Dennis Schubert
6273c2959a
Rescue from private objects sent to the public api
...
closes #5938
2015-05-10 00:10:12 +02:00
Jonne Haß
fc00e94afa
Merge branch 'stable' into develop
2015-05-07 22:30:47 +02:00
Jonne Haß
138551112b
Fix obtaining sidekiq log path
2015-05-07 22:30:07 +02:00
Jonne Haß
7060840d0f
use stdlib logger for FEDERATION_LOGGER, closes #5657
2015-05-04 04:16:31 +02:00
Florian Staudacher
0bb316e893
update bookmarklet
...
* snippet now in a separate JS file - compiled and uglified with the other assets
* popup gets centered in opening browser window
* publisher gets pre-filled with markdown-styled content
2015-05-01 20:20:46 +02:00
Jonne Haß
78ea2c8204
Merge pull request #5878 from Flaburgan/chrome-frame
...
Fix the IE version number extractor to work without space between MSIE and the version number
2015-04-30 13:04:29 +02:00
Benjamin Neff
a863f3ebb2
encode unencoded urls and normalize IDN urls
2015-04-23 00:24:53 +02:00
Flaburgan
2b2c39eef3
Fix the IE version number extractor to work without space between MSIE and the version number, close #5858
2015-04-22 22:09:22 +02: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
Steffen van Bergerem
6d070c818c
Use jshintrb and guard-jshintrb instead of jshint
2015-03-18 10:49:17 +01:00
Sayed
18a1958ef8
fix too long tag name #5737
2015-03-15 16:15:33 +02:00
Steffen van Bergerem
f5bf53a004
Refactor vendor javascript
2015-03-11 15:51:08 +01:00
Jonne Haß
f525f9e34d
Merge pull request #5730 from Flaburgan/strip-markdown-from-title
...
Strip markdown from the heading of a post
2015-03-06 23:43:13 +01:00
Steffen van Bergerem
2a52f65160
Bump markdown-it
2015-03-06 20:40:06 +01:00
flaburgan
5dc8642a99
Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed...
2015-03-04 19:30:00 +01:00
Marcelo Briones
b154d87070
Exports user photos as zip file
2015-03-03 19:45:57 -03:00
Jonne Haß
1a7988caaa
Drop asset cache and precompilation on Travis again
2015-03-02 15:32:36 +01:00
Jonne Haß
4d540ce715
Precompile assets on Travis
2015-02-28 12:56:03 +01:00
