nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17430 commits 4 branches 0 tags 121 MiB
Commit graph

3829 commits

Author SHA1 Message Date
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
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
cde9b24476 fix margin/padding for "original post deleted"-message 2015-05-19 02:59:31 +02:00
Dennis Schubert
3ae370780c Merge branch 'stable' into develop 2015-05-16 03:42:18 +02:00
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip 
closes #5956
 2015-05-16 03:42:14 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
Dennis Schubert
aac0a2582e Merge branch 'stable' into develop 2015-05-12 04:00:12 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
3f3148af2c Merge branch 'stable' into develop 2015-05-10 02:00:41 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Jonne Haß
bd17c528e1 Merge branch 'stable' into develop 2015-05-05 18:02:26 +02:00
Rich
2ce0e8045b Change <subtitle> branding on atom feeds 
Minor consistency change ( from Diaspora to diaspora* )

closes #5929
 2015-05-05 18:02:14 +02:00
Jonne Haß
4a7c358be9 Merge branch 'stable' into develop 2015-05-05 01:39:52 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
Dennis Schubert
9db8cea504 Merge branch 'stable' into develop 2015-05-04 04:42:20 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Jonne Haß
2570d88cc3 Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 
prefill bookmarklet with markdown-formatted content
 2015-05-04 04:10:03 +02:00
Steffen van Bergerem
1fc31cc313 Fix close account for mobile view 
and use Bootstrap modal for desktop close account
 2015-05-04 03:31:28 +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
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Dennis Schubert
67a6c8be0c Merge pull request #5877 from SuperTux88/fix-notification-mails 
fix notification mails for limited posts
 2015-04-25 01:09:46 +02:00
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request 
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
 2015-04-22 20:20:10 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Jonne Haß
9a9cf6f6a5 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
9d4916709b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 22:40:12 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Benjamin Neff
128cfb247c fix not_public page 
body was rendered in the head
 2015-04-20 22:32:32 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
6b024dcd45 Fix missing button styles in donate and admin sections 2015-04-01 13:34:56 +02:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef Merge pull request #5817 from jhass/generated_error_pages 
Generate error pages on assets:precompile
 2015-03-28 21:46:35 +01: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
Dennis Schubert
b07ad67946 Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message 
Add 'no contacts in this aspect yet' message
 2015-03-27 03:50:42 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
Steffen van Bergerem
c9457ffd86 Add missing .container to admin pages, add note to changelog 2015-03-26 23:51:41 +01:00
SansPseudoFix
a97bfec39c add option pagination 
center pagination

Fix pagination css

Symbols for previous and next

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Add responsive pagination

Fix broken pagination

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Fix broken pagination for mobile

Mobile pagination

Unify desktop and mobile background

change background color
 2015-03-26 19:53:23 +01:00
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page 
Add ball.svg to /graphics
 2015-03-26 00:32:41 +01:00
Sayed
e21afc6636 order-of-comments-on-the-mobile-version-is-reversed #5804 2015-03-21 15:20:57 +02:00
Jonne Haß
496a16d14d Merge pull request #5799 from svbergerem/invitation-input 
Unify invite code and contacts page link style
 2015-03-20 01:52:00 +01:00
Steffen van Bergerem
4a7781f1e7 Unify invite code and contacts page link style 2015-03-19 02:46:25 +01:00
Steffen van Bergerem
d9bf4a2fa6 Remove layout 'centered_with_header_with_footer' 2015-03-18 21:59:56 +01:00
Sayed
bf3d903c11 refactor mobile stream post_stats 2015-03-17 20:37:16 +02:00
Sayed
99f42cb643 fix missing reshares count on mobile stream 2015-03-17 01:14:22 +02:00
Steffen van Bergerem
e7ec3d495f Refactor and improve sidebar css 2015-03-16 02:03:53 +01:00
Augier
322ee30005 Tests with Jasmine 2015-03-15 14:52:49 +01:00
Steffen van Bergerem
caf7470e8e Various style fixes 2015-03-15 01:58:29 +01:00
Steffen van Bergerem
2328f64d56 Merge pull request #5580 from MothOnMars/5549-password-reset-error 
display specific error messages for password change (issue #5549)
 2015-03-14 03:25:08 +01:00
Martha
985141c0e8 display specific error messages for password change (issue #5549) 2015-03-13 11:35:21 -07:00
Giniouxe
efcff444fd Refactor registrations #5670 - Partial form 2015-03-13 16:16:45 +01:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
1ff644c13e Fix mobile notifications 2015-03-12 22:45:04 +01:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls 
Use entypo for control icons
 2015-03-12 19:29:40 +01:00
Marcelo Briones
7be56849d9 DRY on avatars 2015-03-12 09:52:36 -03:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Steffen van Bergerem
4f4dfc7554 Fix missing assets bug 2015-03-11 19:18:05 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Steffen van Bergerem
be175e969e Fix mobile sign up with invitation 2015-03-11 10:52:42 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Steffen van Bergerem
d3c0259026 Remove unused aspect files 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
31d7904701 Remove unused blueprint invitations view 2015-03-09 17:57:49 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Pablo Cuadrado
56a79828bc using circled help icon 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
2fb594735e main stream widths with fluid container 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
52fef10bea lame BR removed 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
ba9bb619e4 using container instead of container fluid for the stream, we can manage this 
better when migrating to Bootstrap 3
 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
7f2ee4bf3d dropping blueprint option on publisher 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b2e3866217 removing blueprint classes from new aspect modal 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
e48679affe removing a missing mixing, using row instead of row-fluid 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
c4fda4b563 main_stream ported, no further styling applied 2015-03-01 12:04:51 +01:00
Steffen van Bergerem
0434599bd0 Contacts page: 'Start a conversation' button should depend on number of contacts in aspect 2015-02-19 20:22:07 +01:00
Jonne Haß
a19b91083e Merge pull request #5643 from aka001/5564_lock_account 
Lock account #5564
 2015-02-19 03:43:38 +01:00
Akash Agrawall
3bb5e78893 Lock account #5564 2015-02-19 05:45:04 +05:30
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
Steffen van Bergerem
b3558d0db1 Fix captcha and box-shadow 2015-02-18 22:45:46 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
flaburgan
44649e9167 Unify not connected pages 2015-02-18 22:45:46 +01:00
Steffen van Bergerem
d1dfd7c1cd Style improvements for the year on the notifications page 2015-02-16 21:45:39 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Jonne Haß
34ad598cff Merge pull request #5594 from Faldrian/4055-add_contacts_mobile 
4055 add contacts mobile
 2015-02-15 23:12:18 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Giniouxe
e2866a12ea Issue #5662: Fix text on change button 2015-02-15 20:42:55 +01:00
Steffen van Bergerem
1733131c0c Add invitation link to contacts page 2015-02-12 03:34:24 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Jonne Haß
dece3cf6b0 Merge pull request #5417 from svbergerem/notifications-fix-timeago 
Fix timeago for notifications, add 'no notifications yet' message
 2015-02-10 12:20:09 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation 
Technical limitations of how old one can be on D* #5373
 2015-02-09 02:28:15 +01:00
Akash Agrawall
6b105274af Technical limitation of how old one can be on D* 5373 2015-02-09 06:19:09 +05:30
Jonne Haß
3114b04a08 Merge pull request #5635 from svbergerem/remove-unused-files 
Remove unused files, fix syntax in jasmine tests
 2015-02-07 23:43:48 +01:00
Jonne Haß
63363340f6 Merge pull request #5623 from AugierLe42e/fix-mobile-login-view 
[Mobile] Does not display the header on sing_in page
 2015-02-07 21:30:03 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +01:00
Augier
4be1e2b38e Does not display the header on sing_in page 2015-02-04 23:45:13 +01:00
flaburgan
b8aaad6318 Hide sign up button when registration are disabled 2015-02-01 14:01:44 +01:00
Augier
55d258c5ac Fix registrations displaying 2015-01-30 18:00:22 +01:00
Augier
f14ad5ce35 Fixes the header problem rendering statistics page 2015-01-25 13:24:19 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
Jonne Haß
cd6475d572 Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight 
5560 Hide community spotlight setting if not enabled
 2015-01-21 05:38:25 +01:00
Sakshi Jain
8b1f0453a1 5560 Hide community spotlight setting if not enabled 2015-01-20 10:31:31 +05:30
James Kiesel
7bbd9138de Fix bad email formatting 2015-01-20 16:51:08 +13:00
Marcelo Briones
63eca447d0 Strip EXIF data as user preference 2015-01-18 10:28:28 -03:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors. 
Fixes also mobile bookmarklet services.
 2015-01-17 15:50:06 +02:00
Jason Robinson
5c810a8a2e Merge pull request #5489 from collimarco/solved5482 
Solved #5482
 2015-01-17 03:39:03 +02:00