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
