Manuel Vögele
4f34ecafa4
Show posts of ignored users on their profile page
2016-01-04 18:29:30 +01:00
augier
ef7ea1a855
General text error + CSS styling
...
Minor merge conflict fix by theworldbright
2016-01-04 16:49:59 +09:00
augier
10314ffc8c
Fixing more remarks
2016-01-04 16:49:58 +09:00
theworldbright
7e8bd0f411
Add fallback for failed app logo rendering
2016-01-04 16:49:58 +09:00
theworldbright
ed1dc256a8
Fix handling of error message in authorization controller
2016-01-04 16:49:58 +09:00
augier
ebeafb7894
Add custom error page when prompt=none
2016-01-04 16:49:57 +09:00
augier
7b2be0d3c6
Support displaying TOS and policy
2016-01-04 16:49:56 +09:00
augier
2c7d102019
Design for authorization page when client_name not providen + XSS spec
2016-01-04 16:49:55 +09:00
theworldbright
9439a16d98
Fix failing auth code test and styles
2016-01-04 16:49:54 +09:00
augier
8c2af74447
Fixing last remarks
2016-01-04 16:49:54 +09:00
augier
c33cce0953
Styling user consent form
2016-01-04 16:49:54 +09:00
theworldbright
1a7f2edc01
Perform major refactoring
...
- Add foreign_keys
- Remove unused classes/methods
- Fix pronto errors
- Add method to retrieve client id from name
- Remove TODO comments
- Fix unnecessary private key generation
2016-01-04 16:49:54 +09:00
theworldbright
e55a0b0d0b
Replace scopes with constants in Authorization
2016-01-04 16:49:54 +09:00
augier
07c12ba057
Using Camo for the application logo
2016-01-04 16:49:53 +09:00
augier
3fb2d262b8
Using entypo icon as default application image
2016-01-04 16:49:52 +09:00
augier
098e8e46dd
CSS for applications settings page
2016-01-04 16:49:52 +09:00
augier
469521c572
Addin scopes translation and description
2016-01-04 16:49:52 +09:00
augier
b9da104b28
Revoke button on applications page
2016-01-04 16:49:52 +09:00
augier
308170f691
Add applications information page
2016-01-04 16:49:52 +09:00
theworldbright
bc5e5c7420
Fix pronto errors
2016-01-04 16:49:51 +09:00
augier
de4f68c289
Support for more metadata
2016-01-04 16:49:50 +09:00
theworldbright
17fde49d61
Implement ID Token for the implicit flow
2016-01-04 16:49:50 +09:00
Augier
c6eb722517
Replace ERB by HAML, added locales, corrected Gemfile
2016-01-04 16:49:49 +09:00
theworldbright
3cfbcbce8f
Implement authorization endpoint (part 1)
...
The user can now authenticate with the authorization
server's authorization endpoint and receive a fake
id token.
2016-01-04 16:49:49 +09:00
fla
3a1235e2b2
Unify not connected header on desktop and mobile
2015-12-30 00:04:13 +01:00
fla
119ded6fdc
remove landing header on sign in mobile page
2015-12-29 23:55:46 +01:00
fla
96af4a0aec
Add header on not connected pages on mobile version
2015-12-29 23:55:46 +01:00
Jonne Haß
21cb1f44cd
Merge branch 'stable' into develop
2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8
Fix_notifications_timestamp_issue #4826
...
closes #6573
2015-12-08 17:30:27 +01:00
augier
02e82029c3
Use entypo-mail on mobile view
2015-11-15 14:11:29 +01:00
Steffen van Bergerem
3c43819bce
Merge pull request #6504 from sarithats/fix/login_button
...
Change login button color
2015-10-21 08:16:54 +02:00
Dennis Schubert
1338725308
Merge pull request #6492 from marienfressinaud/6062-add-search-and-invte-links-when-no-contacts
...
Add invite links when no contacts
2015-10-21 01:20:59 +02:00
Saritha
7b08cdd488
Change button color to blue
...
Fix #6449
Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
2015-10-20 12:53:59 +05:30
Jonne Haß
810f24db74
Merge branch 'stable' into develop
2015-10-15 12:20:46 +02:00
Steffen van Bergerem
06c1d2e9e3
Compare person id in people show view
...
closes #6505
2015-10-15 12:20:13 +02:00
Dennis Schubert
228f3852b2
Merge branch 'stable' into develop
2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37
Display publisher on user profile path
...
closes #6503
2015-10-15 05:58:38 +02:00
Marien Fressinaud
461e4cfd8c
Cleanup the code
...
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
2015-10-14 22:31:39 +02:00
Giniouxe
1ae838b596
Open invite link in modal
2015-10-14 22:31:22 +02:00
fla
da1b0b5666
Add links to add or invite contacts
2015-10-14 22:31:22 +02:00
Jonne Haß
77295ffcfb
Merge pull request #6487 from svbergerem/move-reshare-count
...
Move reshare count
2015-10-10 20:51:27 +02:00
Steffen van Bergerem
e9350a57fc
Fix pronto error, remove unused file
2015-10-10 14:22:59 +02:00
augier
aefd7273d9
Drop ID
2015-10-10 12:34:59 +02:00
augier
c62927bf00
Use backbone for flash messages
2015-10-10 12:15:41 +02:00
Jonne Haß
92b5ea29ed
Merge branch 'stable' into develop
2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1
Add public stream
...
closes #6465
2015-10-07 22:29:39 +02:00
Steffen van Bergerem
b59c99807b
Move settings.scss
2015-10-05 16:12:40 +02:00
Steffen van Bergerem
66fb953591
Move registration.scss
2015-10-05 16:12:40 +02:00
Steffen van Bergerem
052d20d30d
Move base.scss
2015-10-05 01:51:13 +02:00
Lukas Matt
97ee2cd975
Display all reports and give the ability to review them
2015-10-03 17:18:03 +02:00
Lukas Matt
95072d6010
Add get_reported_guid spec for report helper
...
* two new methods in report model reported_author and item
* merge deletion methods in report model
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 17:17:06 +02:00
Lukas Matt
d1e3e568b9
Report tab; bootstrap3 compatible, add user detail btn
...
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 10:58:01 +02:00
fla
97a5a5cbe3
Hide publisher cancel button on xsmall screens
2015-09-30 23:19:14 +02:00
Steffen van Bergerem
ff99db1fd3
Change conversation page style
2015-09-27 23:11:19 +02:00
Jonne Haß
4087036e63
Merge pull request #6428 from svbergerem/unify-error-pages
...
Unify error pages
2015-09-27 11:42:03 +02:00
Steffen van Bergerem
9d6ce5b110
Merge pull request #6336 from AugierLe42e/clean-publisher
...
Cleaning publisher
2015-09-26 00:49:34 +02:00
Steffen van Bergerem
8a02bc6e71
Redesign error pages
2015-09-25 22:24:04 +02:00
Steffen van Bergerem
bf6b0e4616
Fix remaining BS3 regressions
2015-09-25 00:31:16 +02:00
augier
c3ddd4c086
Cleaning publisher a bit + responsive styling
2015-09-24 08:54:19 +02:00
augier
f00f3965ff
Styling main stream
2015-09-18 19:13:49 +02:00
Steffen van Bergerem
7bcccde9f4
Merge pull request #6383 from AugierLe42e/improve-mobile-conversations-design
...
[Quickfix] Improve mobile conversations design
2015-09-12 12:20:59 +02:00
augier
44d71c3905
Improve mobile conversations design
2015-09-11 23:17:02 +02:00
Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
realtin
15b186518c
add moderators to report email recievers
...
and refactor coding style according to pull request comments
(#5324 )
2015-09-07 12:31:25 +02:00
realtin
0b420d0308
adapt templates to allow moderator to view reports
...
(#5324 )
2015-09-07 12:29:46 +02:00
Steffen van Bergerem
5020ac45c7
Merge branch 'stable' into develop
2015-08-29 18:19:12 +02:00
SansPseudoFix
110284626a
Fix mobile pagination for notifications view
...
Fix syntax
Fix syntax
closes #6364
2015-08-29 18:13:54 +02:00
Jonne Haß
bf92a7441e
Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API
2015-08-29 15:58:08 +02:00
augier
3a5406a6e1
Styling of mobile header compilant with desktop version
2015-08-28 20:30:07 +02:00
augier
2ca963fadb
Correcting BS3 regression on badge color + spelling mistake
2015-08-28 13:02:48 +02:00
Steffen van Bergerem
9446a3ae21
Merge pull request #6301 from AugierLe42e/image-gallery
...
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
augier
63bfcb7c98
Using Blueimp image gallery
2015-08-27 23:50:20 +02:00
Jonne Haß
a30ba5697e
Merge pull request #6290 from Raven24/pod_test
...
test pods for connectivity
2015-08-27 11:38:18 +02:00
Steffen van Bergerem
b4a5819aa8
Merge pull request #6349 from Faldrian/beautify-blocked-persons
...
Beautify ignored people list and add diaspora handle for identification
2015-08-27 11:00:56 +02:00
Faldrian
37793f7dbb
beautify ignored people list and add diaspora handle for identification
2015-08-27 09:52:49 +02:00
Dennis Schubert
6b863defa3
Merge branch 'stable' into develop
2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e
Remove unused js code (stream widget and dropdowns)
...
closes #6279
2015-08-25 04:26:17 +02:00
Florian Staudacher
ea397ffdfb
Add connection test for pods in the network
...
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
Steffen van Bergerem
eddfa7cb5c
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
...
Left and right navbar polishing
2015-08-23 11:29:51 +02:00
augier
450bf4f4ba
Refactor and minor styling
2015-08-23 09:59:12 +02:00
Steffen van Bergerem
a76b228478
Merge pull request #6321 from AugierLe42e/admin-use-bs-forms
...
[Quickfix] Admin panel use 'form-control' class for selects
2015-08-22 03:56:39 +02:00
Steffen van Bergerem
36eb283546
Merge pull request #6302 from AugierLe42e/comment-button-misbehaving
...
[Quickfix] Fixing comment button misbehaving
2015-08-22 02:07:14 +02:00
augier
38f811f9fd
Admin panel use 'form-control' class for selects
2015-08-22 01:20:33 +02:00
Augier
75b317895d
Fixing comment button misbehaving
2015-08-14 16:18:42 +02:00
augier
281d1a9161
Rebasing and fixing tests
2015-08-11 18:12:02 +02:00
Pablo Cuadrado
bc1b6bd44d
polishing the sidebar on large (lg on BS3) screens
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
37e3a2749f
- left background to the far left of the screen
...
- large screen breakpoints from BS3
- hover color is the same of link color (variable $blue)
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
b787db13ba
minor css polishing for the username
...
trying a new set of responsive grid rules
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
267d98f132
leftnavbar with full sized clickable anchors, better padding, weight font reduced, overall looks polished
...
fixed background added for contrast, hideable on SM or XS bootstrap-based sizes.
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
c38da4c787
controlling right sidebar behaviour on large screens
2015-08-11 18:08:13 +02:00
Pablo Cuadrado
754d8107a8
reasonable max-width for right sidebar
2015-08-11 18:08:12 +02:00
Pablo Cuadrado
c8ba4f061e
polishing of the right sidebar
2015-08-11 18:08:12 +02:00
Steffen van Bergerem
8e99a240c9
Use css spinner instead of gif
2015-08-01 13:00:48 +02:00
Steffen van Bergerem
bc89f73179
Add Bootstrap classes to mobile getting started input fields
2015-07-30 14:44:14 +02:00
Steffen van Bergerem
bdfbbdc3eb
Merge branch 'stable' into develop
2015-07-30 04:20:26 +02:00
Mohammed Rashid
dd42635442
Issue #6235 : Add hoverable class inside the a tag
...
closes #6267
2015-07-30 04:18:06 +02:00
Steffen van Bergerem
e402bbdd3d
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
...
Fix nsfw author
2015-07-30 00:28:15 +02:00
augier
9a23c92f8e
Show author of NSFW post
2015-07-29 21:13:41 +02:00
Steffen van Bergerem
816092c477
Remove remaining span-* and improve mobile photos page
2015-07-28 23:36:47 +02:00
SansPseudoFix
a0eb2f065c
Fix capitalize for powered by diaspora - translation
2015-07-27 13:47:34 +02:00
Dennis Schubert
04135d7b28
Merge branch 'stable' into develop
2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777
Fix mobile photos index page
...
closes #6243
2015-07-27 01:59:26 +02:00
Steffen van Bergerem
1aebf74a3f
Merge pull request #6247 from AugierLe42e/bs3-regression-profile-stream
...
Fix page width on people view (BS3 regression)
2015-07-26 12:38:20 +02:00
Steffen van Bergerem
9ca8005b27
Fix percentage on mobile polls
2015-07-25 04:34:52 +02:00
augier
00674fee74
Fix page width on people view (BS3 regression)
2015-07-24 21:08:54 +02:00
Jonne Haß
97c9561ab7
Merge branch 'stable' into develop
2015-07-24 11:33:47 +02:00
Jonne Haß
b9bc20c7ce
Backport statistics page to Bootstrap 2
2015-07-24 11:30:34 +02:00
Dennis Schubert
be8f920c29
Merge branch 'stable' into develop
2015-07-24 04:05:32 +02:00
Jonne Haß
b7064677ff
Collapse StatisticsController into NodeInfoController
2015-07-24 03:51:31 +02:00
Dennis Schubert
929248c112
Merge pull request #6230 from Flaburgan/add-viewport
...
Add viewport to desktop view
2015-07-23 23:46:49 +02:00
Steffen van Bergerem
6fafa731e6
Display locations on mobile devices
2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443
Display polls on mobile devices
2015-07-23 14:09:38 +02:00
Steffen van Bergerem
031faeece5
Fix regression for default.html
2015-07-22 22:00:37 +02:00
fla
2090b5f909
Add viewport to desktop view
2015-07-22 19:27:30 +02:00
Steffen van Bergerem
5fd89961c4
Use aria-labelledby for conversations
2015-07-22 13:02:16 +02:00
Steffen van Bergerem
4819544030
Use sr-only and aria-labelledby on signup/signin/password pages
2015-07-22 12:24:09 +02:00
Jonne Haß
6e2a2d420c
Merge branch 'develop' of github.com:diaspora/diaspora into develop
2015-07-22 10:07:25 +02:00
Jonne Haß
0cbe7ec9a8
Merge branch 'stable' into develop
2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54
Remove correlations
...
closes #6223
2015-07-22 09:46:52 +02:00
Dennis Schubert
3210fb3835
Merge pull request #6224 from svbergerem/sticky-footer
...
Sticky footer
2015-07-22 04:21:18 +02:00
Steffen van Bergerem
37352b1b10
Sticky footer
2015-07-22 02:40:23 +02:00
Steffen van Bergerem
839d76c15e
Moar entypo on mobile website
2015-07-21 21:16:46 +02:00
Steffen van Bergerem
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +02:00
Steffen van Bergerem
94b745d5c8
Merge branch 'stable' into develop
2015-07-20 01:31:33 +02:00
Ivan Korunkov
5ca9ca9844
Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource.
...
closes #6212
2015-07-20 01:31:22 +02:00
Ivan Korunkov
c98dacdfab
Default home page: fix indent level; fix indentation level for configuration message block to make it looks like other blocks.
2015-07-20 01:29:00 +02:00
Steffen van Bergerem
295c8533a1
Fix profile visibility icon
2015-07-17 14:37:22 +02:00
Jonne Haß
9229f1dfd2
Merge branch 'stable' into develop
2015-07-14 09:58:59 +02:00
Alex Chvatal
634aa7b09a
capitalize Wiki in the links sidebar. closes #6188
...
closes #6193
2015-07-14 09:58:43 +02:00
Benjamin Neff
f875be8d5b
use federation-gem for webfinger/hcard generation
...
remove old webfinger/hcard generation code
this fixes #5143
2015-07-14 05:50:26 +02:00
Dennis Schubert
6b6bf84598
Merge pull request #6151 from SuperTux88/federation-gem
...
Federation Gem Step 1: Webfinger/HCard generation
2015-07-12 17:02:23 +02:00
Jonne Haß
397845161f
Merge pull request #6162 from cmrd-senya/5684-public-additional-profile
...
Allow additional profile fields (previously private profile) to be set public (new updated version)
2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a
Allow extended profile fields (previously private profile) to be set public ( #5684 ).
...
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).
In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.
This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
2015-07-11 04:36:45 +03:00
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ß
1e4224813e
Merge branch 'stable' into develop
2015-07-05 20:50:42 +02:00
Benjamin Neff
2294e59ee3
change public_url to atom_url and profile_url
2015-07-05 20:44:24 +02:00
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +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
Jonne Haß
a2d894cb39
Improve stability for manages_aspects.feature:79
...
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.
The fix is to use Capybaras drag_to instead
2015-06-24 04:01:15 +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
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
theworldbright
3ac66128ad
Restyle button and adjust position of back up arrow
...
Squashed commits:
[47c4a02] Remove styling for return to top of post button
2015-06-17 22:23:25 +09:00
theworldbright
5fa4519e93
Fix #5757 (+2 squashed commits)
...
Squashed commits:
[e10acde] Open reactions after commenting
[aceea75] Fix hound remarks and reactions tests
The ".comment_action" should be active when the
user clicks on "a.show comments"
[d1deae5] Fix hound remarks
[f5db5dd] Keep current instead of scrolling to first comment
[be63092] Remove unused evt parameter
2015-06-17 22:23:25 +09:00
theworldbright
7dc70c7311
Fix #5483
...
Please see https://github.com/diaspora/diaspora/issues/5483#issuecomment-109277476 (+5 squashed commits)
Squashed commits:
[62f38a6] Wrap all handlers with document.ready()
Also add the copyright at the top of the file.
[e861587] Split up show_comments handling
Currently there are two classes that have the
class show_comments. I renamed one to
"back_to_stream_element_top" as it is responsible
for scrolling the user all the way up to the top
when clicked. The other which toggles the
reactions will remain as "show_comments".
[a8dbc4e] Remove unused "cancel new comment" action
[db575cc] Move comment related js to mobile_comments.js
[de44f81] Move add comment container to new comment partial
2015-06-17 22:23:25 +09:00
Steffen van Bergerem
b3a5e92eca
Remove all faceboxes
2015-06-15 14:09:24 +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
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
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
7b7700b317
Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input
2015-06-05 12:09:42 +02:00
Steffen van Bergerem
93dd3a3a72
Use nav-tabs for ToS
2015-06-04 18:05:45 +02:00
Steffen van Bergerem
20c63b20ba
Remove inline css, use font-size-small
2015-06-04 18:05:45 +02:00
Steffen van Bergerem
cc58c66e3d
Use media objects for mobile posts/comments/notifications
2015-06-04 18:05:44 +02:00
theworldbright
98f11b944a
Fix styleguide violations
...
Fix hound remark 12
Remove unnecessary explicit div tag
Rename el_**** to ****El (hound remark 2 and 3)
Only find and replace operations were done with
this commit
Fix hound remark 4 and 8
Fix hound remark 6
Fix hound remark 7
Fix hound remark 9
Fix hound remark 10 and 11
Fix hound remark 13
Fix hound remark 1
Change single quotes to double quotes
Change single quotes to double in publisher view
Fix camelCase and missing {} in publisher view
Change single quotes to double in bookmarklet view
Use dot notation for serializedForm in publisher
Change single quotes to double in bookmarklet spec
Change single quotes to double in publisher spec
Fix missing {} in publisher views
Use ruby 1.9 hash syntax in invite_link
Fix indentation in publisher view
2015-06-04 18:05:44 +02:00
Augier
d7522d9498
corrected failing cuke and social buttons
2015-06-04 18:05:44 +02:00
Jonne Haß
e3bff1f20b
Fix syntax error in shared/_modal.haml
...
Also can't use quoted keys there yet because of Ruby 2.1
2015-06-04 18:05:44 +02:00
theworldbright
5589dac108
Perform compositional styling to "getting started"
2015-06-04 18:05:44 +02:00
theworldbright
ed5f7837b5
Fix styleguide violations
...
Fix hash syntax 3
Fix hash syntax 1 and 2
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
46abdbdd1f
Style fixes for left navbar in notification view
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8e9ceb9a2b
Improve no message text and delete icon for conversations, fix regressions
2015-06-04 18:05:43 +02:00
Augier
0cbf581176
Better settings display
2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8a004ee02a
Overwrite Bootstrap variables and fix publisher
2015-06-04 18:05:43 +02:00
theworldbright
e372b4eb95
Remove some inline css and minor refactoring
2015-06-04 18:05:43 +02:00
Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +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
Jonne Haß
b722a75a44
Merge branch 'stable' into develop
2015-06-02 00:44:56 +02:00
Benjamin Neff
a7fa3eabcb
Disable autocorrect/autocapitalize for the username
...
and cleanup the code so it follows the code guidelines
closes #5955
closes #6028
2015-06-02 00:44:47 +02:00
Dennis Schubert
70da822d69
Merge branch 'stable' into develop
2015-06-01 04:55:32 +02:00
Steffen van Bergerem
35e75b3c64
Atom feed: set post title length to 50 and use configured pod name in the feed title
...
closes #6020
2015-06-01 04:55:27 +02:00
Dennis Schubert
7401808e3f
Merge branch 'stable' into develop
2015-05-31 01:49:43 +02:00
Benjamin Neff
76ca4fdc70
use image_url for the logo in mails
...
closes #6013
2015-05-31 01:49:38 +02:00
Jonne Haß
6581c580f8
Merge branch 'stable' into develop
2015-05-29 11:39:36 +02:00
Benjamin Neff
604ffb445a
optimized sprites
...
- move mobile icons to mobile-folder, so they aren't included in the
icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
big other branding-images
- delete duplicate images
closes #6004
2015-05-29 11:39:30 +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
