Commit graph

7635 commits

Author SHA1 Message Date
SansPseudoFix
f8b69ae7d7 grey link with black grey dots border 2015-03-04 18:35:59 +01:00
SansPseudoFix
2b29bfe403 focus link grey with grey dots 2015-03-04 15:00:39 +01:00
Jonne Haß
26cda1b1c5 Merge pull request #5724 from AugierLe42e/comment-design
Changed color border on active text
2015-03-04 11:52:09 +01:00
SansPseudoFix
330ae471f1 Fix #5716 focus header link color 2015-03-04 11:03:44 +01:00
Marcelo Briones
b154d87070 Exports user photos as zip file 2015-03-03 19:45:57 -03:00
Augier
5be2fbafab Changed color border on active text" 2015-03-03 21:18:53 +01:00
Selman Ercan
35fe6bda68 Issue #5631. Made top and left coordinates of hovercards match those of their parents.
Added line to changelog for bug fix of issue #5631.

Processing the 'mouseleave' event only if we've left both the parent and the hovercard.

Fixed indentation.

Replaced issue id with pull request id and fixed indentation.
2015-03-02 09:41:29 +01:00
Steffen van Bergerem
0c7d319fdc Remove unused css files 2015-03-02 00:04:58 +01: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
3721861c94 border on the left of the stream and profile header 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
b0a8ecf8be margin 0 was messing up the left bar 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
c402c65f56 unprefixing opacity 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
84739a86d1 invite code box fix 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
9cbc09316d text shadow made the buttons look blurry 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
b23c0f7ae4 ensuring that the oembed element has the same size of the thumb 2015-03-01 12:04:53 +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
122fde9093 colliding style removed 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cfff769152 comment button using bootstrap styles 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cb99ad9e68 left bar styles adjusted 2015-03-01 12:04:51 +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
flaburgan
741a24bc08 Add tooltip style on post report icon 2015-02-28 16:57:41 +01:00
Dennis Schubert
ab4e04e8c4 Don't specify file extensions in SCSS imports 2015-02-28 05:04:39 +01:00
Jonne Haß
c96834bdf2 Remove .css extension from SCSS files
sass-rails 5.0 deprecated those
2015-02-28 03:37:46 +01:00
Jonne Haß
1b0cf2d11f bump compass & sass 2015-02-28 02:36:14 +01:00
Jonne Haß
3a90386303 deliver needs to be called on the return value of the mailer call 2015-02-27 16:58:39 +01:00
Jonne Haß
f62ba0f73c Don't split contact_ids when they already are an array 2015-02-27 16:58:39 +01:00
Jonne Haß
f49c8884f4 Use _url, not _path, in mailers 2015-02-27 16:58:39 +01:00
Jonne Haß
290aded7f6 ActionMailer deliver -> deliver_now 2015-02-27 16:58:39 +01:00
Jonne Haß
162303db37 Enable Rails 5 behavior for exceptions in after_commit callbacks 2015-02-27 16:58:39 +01:00
Jonne Haß
9ad2409264 Don't use AR internals (@attributes) 2015-02-27 16:58:38 +01:00
Jonne Haß
99ea156e1c Refactor User.total_users into a scope 2015-02-27 16:30:51 +01:00
Jonne Haß
95053ccbf2 Merge pull request #5351 from MarcBurt/5041-Total-user-statistic-shouldnt-include-closed-accounts
5041 total user statistic shouldnt include closed accounts
2015-02-27 16:02:35 +01:00
Jonne Haß
e46a77ba19 Merge pull request #5706 from aka001/help_section
Update the help section #5698
2015-02-27 15:57:12 +01:00
Jonne Haß
e8440bb25f Merge pull request #5683 from svbergerem/mobile-fix-style-more
Mobile: fix style of 'more' button
2015-02-27 15:53:36 +01:00
Jonne Haß
205f82bfd0 Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login
Adjust jsxc initialization for ajax login
2015-02-27 15:52:30 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Jonne Haß
073e99992e Some fixes to participation controls
* prevent default event in JS handlers to prevent jumping back to the
  top.
* Use js-routes
* Use sprite for icons
* Reply with 200 instead of 204 when destroying a participation,
  to prevent errors in the browser console.
2015-02-27 15:31:30 +01:00
Akash Agrawall
e85cb7b373 Help_section_update_keyboard_shortcut 2015-02-27 16:36:11 +05:30
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
Lukas Matt
e484ebc85f Using dot notation for accessing token 2015-02-25 00:11:01 +01:00
Lukas Matt
30685b2709 Adjust jsxc initialization for ajax login
related to diaspora/jsxc#81
2015-02-25 00:09:23 +01:00
PIOTR KLOSINSKI
b8be76be3c changed reshare function, so it adds the object to the stream
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon
2015-02-23 15:44:31 +01:00
zachrab
f695b5d3e7 Set disable_mail to true
Add #clear_account! disable mail spec

Add migration for disabling mail for all closed accounts

Change migration to use #update_all for disable_mail attribute

Add #clear_account! false fields spec
2015-02-19 16:45:39 -08: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
Steffen van Bergerem
53714c4699 Fix notification for new conversations 2015-02-19 13:39:25 +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
06ab4d0514 Mobile: fix style of 'more' button 2015-02-18 20:41:01 +01:00
Steffen van Bergerem
7d485ce6a6 Add opacity transition for post controls 2015-02-18 18:16:10 +01:00
SansPseudoFix
0c49219ca7 Global prevent for overflow in mobile view 2015-02-17 13:00:39 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +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
Steffen van Bergerem
4da6b075ad Bootstrap stream: fix interaction buttons 2015-02-16 06:23:34 +01:00
Steffen van Bergerem
f1836580db Bootstrap stream: add spinner and improve comment box 2015-02-16 04:56:35 +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
Jonne Haß
9dbf6b82a8 Merge pull request #5655 from svbergerem/contacts-page-add-invitations
Add invitation link to contacts page
2015-02-15 16:00:20 +01:00
Jonne Haß
f326b58d31 Merge pull request #5664 from svbergerem/remove-people-last_post
Remove last_post from PeopleController
2015-02-15 15:58:02 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails
profile photos as thumbnails
2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile
related to diaspora/jsxc#77
2015-02-13 19:23:26 +01:00
Steffen van Bergerem
2193ff2b58 Remove last_post from PeopleController 2015-02-13 12:25:50 +01:00
Steffen van Bergerem
1733131c0c Add invitation link to contacts page 2015-02-12 03:34:24 +01:00
Jonne Haß
3c58cbeaee Merge pull request #5646 from svbergerem/fix-conversation-scrolling
Conversations: fix badge count and automatic scrolling
2015-02-11 14:19:48 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
17c7771a6b Fix typo in AspectGlobalHelper 2015-02-10 16:43:14 +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
Steffen van Bergerem
2ec093a54c JSHint boss, evil, loopfunc and scripturl 2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1 JSHint eqeqeq 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a JSHint semicolon errors 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Faldrian
5d3145bf8f added avatar error correction on core view rendering 2015-02-08 19:32:50 +01:00
Faldrian
32ca5cc16d removed css-spill on reshare link in stream 2015-02-08 17:24:16 +01:00
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00
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