Steffen van Bergerem
|
b3a5e92eca
|
Remove all faceboxes
|
2015-06-15 14:09:24 +02:00 |
|
Jonne Haß
|
8a6706337a
|
Merge branch 'stable' into develop
|
2015-06-15 13:47:01 +02:00 |
|
Benjamin Neff
|
beb06bc42d
|
precompile images from facebox gem
regression from #6005
closes #6105
|
2015-06-15 13:46:07 +02:00 |
|
Steffen van Bergerem
|
ab60644aa0
|
Merge pull request #6087 from Flaburgan/improve-mobile-conversation-design
Improve mobile conversation design
|
2015-06-15 13:26:49 +02:00 |
|
fla
|
44a12e74b1
|
Improve mobile conversation design
|
2015-06-15 12:32:03 +02:00 |
|
Jonne Haß
|
50dbe0db80
|
Merge pull request #6102 from svbergerem/close-account-regression
Fix Bootstrap 3 regression: close account
|
2015-06-14 22:21:11 +02:00 |
|
Jonne Haß
|
15aa40631e
|
Merge pull request #6104 from svbergerem/jquery-autosize
Replace jquery.autoresize with autosize
|
2015-06-14 22:20:35 +02:00 |
|
Steffen van Bergerem
|
92a3dd53f0
|
Replace jquery.autoresize with autosize
|
2015-06-14 20:03:15 +02:00 |
|
Jonne Haß
|
77854cd355
|
Merge branch 'stable' into develop
|
2015-06-14 18:00:25 +02:00 |
|
Jonne Haß
|
a247984685
|
Merge branch 'master' into stable
|
2015-06-14 18:00:01 +02:00 |
|
Jonne Haß
|
9b36ec6797
|
release 0.5.1
|
2015-06-14 17:57:41 +02:00 |
|
Jonne Haß
|
1dee08843b
|
Merge branch 'stable' into develop
|
2015-06-14 17:42:00 +02:00 |
|
Jonne Haß
|
5a63d201a3
|
Merge branch 'release/0.5.1.0-RC' into stable
|
2015-06-14 17:41:42 +02:00 |
|
Jonne Haß
|
7052f2a63b
|
updated 12 locale files [ci skip]
|
2015-06-14 17:40:55 +02:00 |
|
Jason Robinson
|
e8f5173856
|
Merge pull request #6097 from Flaburgan/remove-old-service-stats
Remove old service keys in statistics.json
|
2015-06-14 16:26:08 +03:00 |
|
Steffen van Bergerem
|
4534ba5de8
|
Fix Bootstrap3 regression: close account
|
2015-06-14 13:22:39 +02:00 |
|
fla
|
7f6609d17b
|
Remove old service keys in statistics.json
|
2015-06-13 11:03:47 +02:00 |
|
Jonne Haß
|
b0de3925aa
|
Merge pull request #6092 from svbergerem/text-renderer-img-responsive
Add img-responsive to image class for user input
|
2015-06-12 12:48:16 +02:00 |
|
Steffen van Bergerem
|
18a8211cc3
|
Add img-responsive to image class
|
2015-06-12 00:01:56 +02:00 |
|
Jonne Haß
|
c83650f023
|
Merge branch 'stable' into develop
|
2015-06-10 13:33:37 +02:00 |
|
Steffen van Bergerem
|
034fc5b183
|
Update markdown-it
closes #6091
|
2015-06-10 13:33:33 +02:00 |
|
Jonne Haß
|
1be1bec9c9
|
Merge branch 'stable' into develop
|
2015-06-09 22:55:23 +02:00 |
|
Benjamin Neff
|
ce380d78c9
|
make sql and federation debug-logging configurable
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.
closes #6090
|
2015-06-09 22:55:16 +02:00 |
|
Dennis Schubert
|
1c7f86b290
|
Merge branch 'stable' into develop
|
2015-06-09 05:51:52 +02:00 |
|
Dennis Schubert
|
ea4eebd2e1
|
Merge branch 'release/0.5.1.0-RC' into stable
|
2015-06-09 05:51:36 +02:00 |
|
Jonne Haß
|
38b32ca2c4
|
updated 73 locale files [ci skip]
|
2015-06-09 05:51:16 +02:00 |
|
Dennis Schubert
|
828ae5994d
|
Merge branch 'stable' into develop
|
2015-06-09 05:49:34 +02:00 |
|
Dennis Schubert
|
1aa802c07c
|
Merge branch 'release/0.5.1.0-RC' into stable
|
2015-06-09 05:48:53 +02:00 |
|
Dennis Schubert
|
2837e58903
|
Remove listen note from the readme
this is not included in 0.5.1.0.
[ci skip]
|
2015-06-09 05:48:29 +02:00 |
|
Jonne Haß
|
72bb85eeba
|
Merge branch 'stable' into develop
|
2015-06-08 16:59:31 +02:00 |
|
Steffen van Bergerem
|
5516926b74
|
Update perfect-scrollbar
closes #6085
|
2015-06-08 16:59:27 +02:00 |
|
Jonne Haß
|
aeeb6570d3
|
Merge branch 'stable' into develop
|
2015-06-08 13:52:53 +02:00 |
|
Jonne Haß
|
dd1cea9665
|
Merge branch 'release/0.5.0.0-RC' into stable
|
2015-06-08 13:52:42 +02:00 |
|
Jonne Haß
|
baafa9c51b
|
updated 73 locale files [ci skip]
|
2015-06-08 13:51:17 +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
|
a5eb7d5d1e
|
Merge branch 'stable' into develop
|
2015-06-08 04:33:30 +02:00 |
|
Dennis Schubert
|
b80785e06e
|
Update Changelog for the upcoming 0.5.2.0
|
2015-06-08 04:32:29 +02:00 |
|
Dennis Schubert
|
80db18805c
|
Merge branch 'stable' into develop
|
2015-06-08 04:26:43 +02:00 |
|
Dennis Schubert
|
ebd12430ea
|
Add note regarding production.server.listen changes
[ci skip]
|
2015-06-08 04:26:13 +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
|
99b36598c7
|
add migration to fix public flag of photos
|
2015-06-08 04:15:17 +02:00 |
|
Benjamin Neff
|
e16b9af7e6
|
make public and private receiver work similar ...
|
2015-06-08 04:15:17 +02:00 |
|
Benjamin Neff
|
ed10bea21f
|
don't dispatch photos twice ...
|
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
|
ad52eaf6d7
|
Merge branch 'stable' into develop
|
2015-06-08 04:09:57 +02:00 |
|
Benjamin Neff
|
97153ad08b
|
update tests for new twitter client
closes #6083
|
2015-06-08 04:08:46 +02:00 |
|
Jan Berdajs
|
ec4e7b4a69
|
upgrade Twitter gem - fixes Faraday deprecation warning
|
2015-06-08 04:08:02 +02:00 |
|
Jonne Haß
|
67de83f325
|
Merge pull request #6080 from svbergerem/user-edit-remove-cancel-button
Remove cancel button from user edit
|
2015-06-08 01:07:51 +02:00 |
|
Jonne Haß
|
3975f02f2c
|
Merge pull request #6081 from svbergerem/email-visibility
Fix Bootstrap 3 regression: add email visibility icon to settings page
|
2015-06-08 01:07:35 +02:00 |
|