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
Jonne Haß
39c50b231f
Merge pull request #5665 from AugierLe42e/chat-help-section-bis-repetita
...
Adding help section for chat
2015-02-26 22:20:57 +01:00
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
94f73be7d9
bump Vines to v0.1.27 and Jsxc to v0.0.12
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
Jonne Haß
3a0857b4bf
Merge pull request #5699 from WebDevFromScratch/5690-update-stream-on-reshare
...
5690 update stream on reshare
2015-02-23 16:37:54 +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
Steffen van Bergerem
cdd1155bd2
JSHint: change values for bitwise and notypeof to the thoughtbot defaults [ci skip]
2015-02-22 13:42:02 +01:00
Jonne Haß
9ad26604b7
Merge pull request #5640 from zachrab/5625-disable-mail-to-deleted-user
...
Fixes issue #5625
2015-02-20 02:29:51 +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
Jonne Haß
5af4324377
Merge pull request #5691 from svbergerem/contacts-start-conversation
...
Contacts page: 'Start a conversation' button should depend on number of contacts in aspect
2015-02-20 00:17:50 +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ß
fb1ff06395
Merge pull request #5686 from svbergerem/fix-conversations-notification
...
Fix notification for new conversations
2015-02-19 14:13:57 +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
Steffen van Bergerem
8beadf5400
Merge pull request #5391 from Flaburgan/unify-not-connected-pages
...
Unify disconnected pages
2015-02-19 00:45:15 +01:00
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
Jonne Haß
7de66abce9
Merge pull request #5682 from svbergerem/opacity-transition-post-controls
...
Add opacity transition for post controls
2015-02-18 18:38:23 +01:00
Steffen van Bergerem
7d485ce6a6
Add opacity transition for post controls
2015-02-18 18:16:10 +01:00
Steffen van Bergerem
b4ab31d6f9
Merge pull request #5680 from jhass/strip_formatting_chars
...
Strip Unicode format characters prior post processing
2015-02-18 03:26:50 +01:00
Jonne Haß
6a5a407e49
Strip Unicode format characters prior post processing
2015-02-17 23:29:05 +01:00
Steffen van Bergerem
c03eb0c191
Merge pull request #5675 from SansPseudoFix/5586-fix-overflow-code-mobile
...
fix code overflow in mobile comments #5586
2015-02-17 13:09:56 +01:00
SansPseudoFix
0c49219ca7
Global prevent for overflow in mobile view
2015-02-17 13:00:39 +01:00
Steffen van Bergerem
a47f7c2556
Merge pull request #5666 from jhass/editorconfig
...
Editorconfig
2015-02-17 04:55:16 +01:00
Jonne Haß
34187c9d42
Merge pull request #5679 from svbergerem/update-jasmine-ajax
...
Update jasmine-ajax
2015-02-17 04:42:38 +01:00
Steffen van Bergerem
eb7e2eac9d
Update jasmine-ajax
2015-02-17 04:03:42 +01:00
Jonne Haß
ce618b3a51
Merge pull request #5677 from svbergerem/notifications-year-style
...
Style improvements for the year on the notifications page
2015-02-16 22:26:50 +01:00
Steffen van Bergerem
d1dfd7c1cd
Style improvements for the year on the notifications page
2015-02-16 21:45:39 +01:00
Jonne Haß
278ca84ec2
Merge pull request #5676 from svbergerem/notifications-add-year
...
Add year to notifications page
2015-02-16 18:44:48 +01:00
Steffen van Bergerem
9c22ed6aef
Add year to notifications page
2015-02-16 18:02:50 +01:00
Jonne Haß
3149ab7125
Merge pull request #5672 from svbergerem/bootstrap-stream-improvements
...
Bootstrap stream: add spinner and improve comment box
2015-02-16 12:59:41 +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
Jonne Haß
e801c859a8
Merge pull request #5671 from giniouxe/5662-privacy-button-text
...
Issue #5662 Fix text on change button
2015-02-15 20:38:52 +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
