Jonne Haß
|
188e554b7b
|
Merge branch 'stable' into develop
|
2015-06-21 20:48:57 +02:00 |
|
fap
|
1061e101fd
|
Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config.
This also enables the podmin account to send messages
to any local user.
closes #6128
|
2015-06-21 20:48:48 +02:00 |
|
Jonne Haß
|
79c5202a5b
|
Merge pull request #6109 from svbergerem/bootstrap-header-rewrite
Bootstrap header rewrite
|
2015-06-21 19:46:07 +02:00 |
|
SansPseudoFix
|
57ac37cd2d
|
Fix broken avatar getting start page
Update add contact page
BS3
Fix syntax
|
2015-06-21 16:38:12 +02:00 |
|
Steffen van Bergerem
|
8d5794a2a4
|
Fix autoresize default height for comment box
|
2015-06-21 04:40:56 +02:00 |
|
Steffen van Bergerem
|
b3c535bab4
|
Add color theme support for new header
|
2015-06-20 00:38:40 +02:00 |
|
Steffen van Bergerem
|
049c8eb384
|
Bootstrap header rewrite
|
2015-06-20 00:38:40 +02:00 |
|
Steffen van Bergerem
|
e890ffa698
|
Merge branch 'stable' into develop
|
2015-06-19 22:20:57 +02:00 |
|
Faldrian
|
0fa571d5e4
|
Fixed more-button wording when there are <15 posts
|
2015-06-19 22:17:21 +02:00 |
|
Steffen van Bergerem
|
078e7a722f
|
Merge branch 'stable' into develop
|
2015-06-19 21:30:15 +02:00 |
|
SansPseudoFix
|
cce5a98537
|
Add link to pod statistics in right navigation
closes #6117
|
2015-06-19 21:29:25 +02:00 |
|
Flaburgan
|
3e4b8500a4
|
Refactor Account settings page with bootstrap grid
|
2015-06-18 17:26:31 +02:00 |
|
fla
|
5537e8687b
|
Extract privacy_settings content in a partial
|
2015-06-18 17:26:31 +02:00 |
|
fla
|
264f41a09d
|
Add Services and Privacy settings page to mobile
|
2015-06-18 17:26:31 +02:00 |
|
Jonne Haß
|
93281d283f
|
Merge branch 'stable' into develop
|
2015-06-17 12:40:27 +02:00 |
|
Pablo Cuadrado
|
c050c606c2
|
this was causing an empty element to be created
closes #6111
|
2015-06-17 12:40:22 +02:00 |
|
Steffen van Bergerem
|
ae0209b49b
|
Merge branch 'stable' into develop
|
2015-06-16 23:43:32 +02:00 |
|
Jonne Haß
|
3a527d01da
|
Remove top margin for first heading in a post
That is, if it's the first element in the post
closes #6110
|
2015-06-16 23:43:14 +02:00 |
|
Steffen van Bergerem
|
b3a5e92eca
|
Remove all faceboxes
|
2015-06-15 14:09:24 +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 |
|
Steffen van Bergerem
|
92a3dd53f0
|
Replace jquery.autoresize with autosize
|
2015-06-14 20:03:15 +02: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 |
|
Steffen van Bergerem
|
18a8211cc3
|
Add img-responsive to image class
|
2015-06-12 00:01:56 +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 |
|
Dennis Schubert
|
8a4ec1d4c6
|
Merge branch 'stable' into develop
|
2015-06-08 04:18:38 +02:00 |
|
Benjamin Neff
|
ed10bea21f
|
don't dispatch photos twice ...
|
2015-06-08 04:15:17 +02:00 |
|
Dennis Schubert
|
ad52eaf6d7
|
Merge branch 'stable' into develop
|
2015-06-08 04:09:57 +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 |
|
Dennis Schubert
|
e0420d733a
|
Merge branch 'stable' into develop
|
2015-06-08 00:49:55 +02:00 |
|
Benjamin Neff
|
010afa1019
|
refactor: iterate over visiblities
closes #6060
|
2015-06-08 00:45:16 +02:00 |
|
Benjamin Neff
|
0ffb83d351
|
load conversations and visibilities in one query with correct order
|
2015-06-08 00:44:41 +02:00 |
|
Steffen van Bergerem
|
6c32fa7845
|
Fix Bootstrap 3 regression: add email visibility icon to settings page
|
2015-06-07 22:31:58 +02:00 |
|
Steffen van Bergerem
|
9ad58c94a1
|
Remove cancel button from user edit
|
2015-06-07 21:49:11 +02:00 |
|
Jonne Haß
|
1c834d49d8
|
Merge branch 'stable' into develop
|
2015-06-07 21:14:51 +02:00 |
|
Benjamin Neff
|
735d692ac0
|
fix selected week on weekly stats page
closes #6079
|
2015-06-07 21:14:47 +02:00 |
|
efstrian
|
69c3a4100d
|
Issue #4297: Color themes can override bootstrap variables
|
2015-06-07 19:58:54 +03:00 |
|
efstrian
|
d64ea15891
|
Issue #4297: Style fixes - Default theme is configurable
|
2015-06-07 19:58:14 +03:00 |
|
dimana
|
31d760867c
|
Issue #4297: Updated color themes and testing
|
2015-06-07 19:57:37 +03:00 |
|
efstrian
|
57d766346c
|
Issue #4297: Enable color theme setup
|
2015-06-07 19:57:16 +03:00 |
|
Jonne Haß
|
c054d17bbb
|
Merge pull request #6074 from svbergerem/mobile-notification-padding
Fix some Bootstrap 3 regressions
|
2015-06-07 17:23:08 +02:00 |
|
Jonne Haß
|
fe8b06bb36
|
Merge pull request #6073 from svbergerem/mobile-contacts
Bootstrap 3 regression: Fix mobile contacts view
|
2015-06-07 15:08:25 +02:00 |
|
Steffen van Bergerem
|
4f9ac8dd96
|
Fix Bootstrap 3 regressions
* mobile notification padding
* width of mobile notifications and stream page
|
2015-06-07 12:48:12 +02:00 |
|
Steffen van Bergerem
|
fcb9b001a2
|
Bootstrap 3 regression: Fix mobile contacts view
|
2015-06-07 12:13:21 +02:00 |
|
Steffen van Bergerem
|
06a1a1c978
|
Fix Bootstrap3 regression: reshares in SPV
|
2015-06-07 12:01:13 +02:00 |
|