Benjamin Neff
46a22fefe9
use federation-gem for webfinger/hcard generation
...
remove old webfinger/hcard generation code
this fixes #5143
2015-07-10 01:46:48 +02:00
Jonne Haß
18c1dcc26a
Merge branch 'stable' into develop
2015-07-09 09:02:11 +02:00
Benjamin Neff
2df4a1cc5c
add logfile-appender in test environment
...
closes #6175
2015-07-09 09:02:04 +02:00
Dennis Schubert
aa86003cf9
Keep the hacky scope workaround in comments.js
...
because we still are supporting browsers without .bind() and I do not
want to break the patterns here.
Follow up to #6171 - I wanted to avoid feedback loop delays for that
little change.
2015-07-09 03:24:15 +02:00
Dennis Schubert
f8ff950672
Merge pull request #6171 from RyDroid/minor-js
...
Very minor changes of some JS files
2015-07-09 03:06:42 +02:00
Spanti Nicola (RyDroid)
df440ed8d8
Very minor changes of some JS files
2015-07-08 19:09:08 +02:00
Jonne Haß
9a6e001e87
Merge pull request #6172 from RyDroid/readme
...
Minor changes to README file
2015-07-08 15:40:30 +02:00
Jonne Haß
6dfe58f91e
Merge pull request #6170 from RyDroid/gitignore
...
Minor improvements to .gitignore
2015-07-08 10:05:37 +02:00
Spanti Nicola (RyDroid)
0bcfd43765
Minor changes to README file
2015-07-08 01:57:14 +02:00
Spanti Nicola (RyDroid)
6cf2ef814f
Minor improvements to .gitignore
2015-07-08 01:55:28 +02:00
Dennis Schubert
c703cadf9b
Merge branch 'stable' into develop
2015-07-07 02:51:38 +02:00
Dennis Schubert
b5b5f1f028
Revert "Issue #6145 : Set a fixed body-height" for global side effects
...
This reverts commit 990c678cd3
2015-07-07 02:50:30 +02:00
Dennis Schubert
eecceacd46
Merge branch 'stable' into develop
2015-07-07 02:46:39 +02:00
Haidy777
990c678cd3
Issue #6145 : Set a fixed body-height
...
closes #6169
2015-07-07 02:46:34 +02:00
Jonne Haß
1e4224813e
Merge branch 'stable' into develop
2015-07-05 20:50:42 +02:00
Benjamin Neff
b0a9a6342f
add url_to
...
closes #6168
2015-07-05 20:46:18 +02:00
Benjamin Neff
97f973b80a
fix rubocop warnings in poor_mans_webmock.rb
...
and remove unused HttpPost mock
2015-07-05 20:44:24 +02:00
Benjamin Neff
f45e053316
remove unused publics_helper
...
the Subscriber stuff was removed in 2010:
f97218c005
2015-07-05 20:44:24 +02:00
Benjamin Neff
540b8df1b8
don't get url from hcard, is already set from webfinger
...
prepare for federation refactoring
2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3
change public_url to atom_url and profile_url
2015-07-05 20:44:24 +02:00
Jonne Haß
202b6108e9
Merge branch 'stable' into develop [ci skip]
2015-07-05 12:22:35 +02:00
Mohammed Rashid
c652374787
typo in spec [ci skip]
...
closes #6167
2015-07-05 12:22:23 +02:00
Jonne Haß
6b240199a8
Merge branch 'stable' into develop
2015-07-04 10:48:42 +02:00
Johan
1e0d81190b
updating es-VE locale
...
closes #6165
2015-07-04 10:48:35 +02:00
Jonne Haß
69974bdc13
Merge pull request #6161 from svbergerem/fix-conversation-modal
...
Fix two modal issues
2015-07-03 20:26:31 +02:00
Jonne Haß
e1502bf602
Merge pull request #6160 from svbergerem/remove-aspects-dropdown
...
Remove aspects-dropdown.js
2015-07-03 19:15:52 +02:00
Steffen van Bergerem
61edda0fca
Aspect creation modal now creates an aspect when pressing enter
2015-07-03 18:20:32 +02:00
Steffen van Bergerem
db00bd1b03
Fix conversation modal on contacts page
2015-07-03 17:44:12 +02:00
Steffen van Bergerem
aeda8e37e3
Remove aspects-dropdown.js
2015-07-03 16:56:25 +02:00
Jonne Haß
7d32000bd0
Merge branch 'stable' into develop
2015-07-03 16:34:18 +02:00
cmrd Senya
fe3ff10e07
Add new daily job to clean cache in public/tmp (as suggested in #5946 ).
2015-07-03 16:34:01 +02:00
Jonne Haß
961f6b5350
Merge pull request #6158 from svbergerem/update-entypo
...
Update entypo
2015-07-03 16:31:35 +02:00
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +02:00
Steffen van Bergerem
b89fabc2ec
Update entypo-rails
2015-07-03 12:12:07 +02:00
Dennis Schubert
e0782437b8
Merge branch 'stable' into develop
2015-07-03 05:26:01 +02:00
theworldbright
d410d2ee76
Fix bug where flash error reappeared #6136
...
closes #6146
closes #6136
2015-07-03 05:25:22 +02:00
Jonne Haß
1cd2562572
Merge branch 'stable' into develop
2015-07-02 11:12:16 +02:00
Jonne Haß
6601576149
Merge branch 'master' into stable
2015-07-02 11:11:58 +02:00
Jonne Haß
8624ebb921
bump to 0.5.1.2
2015-07-02 11:09:05 +02:00
Dennis Schubert
e92c8000ba
Do not leak private profile fields in JSON format
...
Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>
2015-07-02 10:07:59 +02:00
Jonne Haß
6855095e7b
Merge branch 'stable' into develop
2015-06-30 23:30:14 +02:00
Steffen van Bergerem
4cda8675e6
Update markdown-it
...
closes #6150
2015-06-30 23:30:04 +02:00
Jonne Haß
d319474dea
Merge branch 'stable' into develop
2015-06-27 20:25:12 +02:00
Jonne Haß
3dc1eb2bdc
Shorter Travis notification for IRC
2015-06-27 20:24:37 +02:00
Dennis Schubert
8b773c89e1
Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments
...
Fix for #5483 and #5757 (mobile stream comments)
2015-06-27 04:43:50 +02:00
Dennis Schubert
9613eb845f
Merge branch 'stable' into develop
2015-06-27 04:38:37 +02:00
Jonne Haß
070e785714
bump rails
...
closes #6140
2015-06-27 04:38:25 +02:00
Dennis Schubert
4b1cd5b2fa
Merge branch 'stable' into develop
2015-06-27 04:37:10 +02:00
Jonne Haß
8b6f487874
bump rails
...
closes #6140
2015-06-27 04:36:36 +02:00
Jonne Haß
e6712185a2
bump listen
2015-06-27 04:36:21 +02:00
