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
Steffen van Bergerem
1ff644c13e
Fix mobile notifications
2015-03-12 22:45:04 +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
f5bf53a004
Refactor vendor javascript
2015-03-11 15:51:08 +01:00
Augier
95f4675ddf
Port of notifications to Backbone
2015-03-11 02:11:05 +01:00
Jonne Haß
8ab6f31e0a
Merge pull request #5751 from svbergerem/fix-photo-count-profile
...
Fix photo count in the profile view
2015-03-10 17:45:12 +01:00
Steffen van Bergerem
d2222a97e5
Fix photo count in the profile view
2015-03-10 11:38:49 +01:00
Steffen van Bergerem
1b2b10877a
Fix services char counter
2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e
Use entypo icons for left navbar
2015-03-09 17:57:50 +01:00
Steffen van Bergerem
3298373a7f
Add missing http:// to urls
2015-03-09 01:42:40 +01:00
Jonne Haß
f525f9e34d
Merge pull request #5730 from Flaburgan/strip-markdown-from-title
...
Strip markdown from the heading of a post
2015-03-06 23:43:13 +01:00
Steffen van Bergerem
2a52f65160
Bump markdown-it
2015-03-06 20:40:06 +01:00
flaburgan
5dc8642a99
Strip markdown from the heading of a post. Impact notifications, email subjects, SPV <title>, the Atom feed...
2015-03-04 19:30:00 +01:00
Marcelo Briones
b154d87070
Exports user photos as zip file
2015-03-03 19:45:57 -03:00
Jonne Haß
dd45b79a98
Drop Youtube oembed HTTPS hack
...
upstream ships it now that way
2015-03-02 02:34:51 +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
Jonne Haß
987281270a
bump ruby-oembed
2015-02-28 02:36:13 +01:00
Jonne Haß
678033fa23
replace deprecated stub syntax in export user spec
2015-02-27 17:00:42 +01:00
Jonne Haß
7a741c6dce
Ensure deliveries are cleared after each example
2015-02-27 17:00:41 +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ß
d295b5d5b5
ActiveRecord::Base::reflection returns strings now
2015-02-27 16:58:39 +01:00
Jonne Haß
9530f00bd6
Don't use a too large invalid id
2015-02-27 16:58:39 +01:00
Jonne Haß
1ec3f5caa6
Don't pass a model instance where an id is expected
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ß
ed44689670
Fix a spec for LikesController
2015-02-27 16:36:45 +01:00
Jonne Haß
99ea156e1c
Refactor User.total_users into a scope
2015-02-27 16:30:51 +01:00
Jonne Haß
6432bbe67b
fix
2015-02-27 16:29:49 +01:00
Jonne Haß
93c9ad6eba
Fix participations controller spec
2015-02-27 16:27:55 +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ß
be1ab6c6a3
Merge branch 'collimarco-issue5350' into develop
2015-02-27 15:33:55 +01:00
Augier
168adae009
Adding help section for chat
2015-02-26 18:06:39 +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
Akash Agrawall
3bb5e78893
Lock account #5564
2015-02-19 05:45:04 +05:30
Jonne Haß
6a5a407e49
Strip Unicode format characters prior post processing
2015-02-17 23:29:05 +01:00
Steffen van Bergerem
eb7e2eac9d
Update jasmine-ajax
2015-02-17 04:03:42 +01:00
Steffen van Bergerem
9c22ed6aef
Add year to notifications page
2015-02-16 18:02:50 +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
Jonne Haß
84cfaa1cfb
Merge pull request #5659 from Zauberstuhl/link_to_remote_profile
...
Add the ability to link remote user profiles
2015-02-13 20:35:14 +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
Jonne Haß
b910adc52b
Merge pull request #5663 from svbergerem/pending-specs
...
Green pending specs for evil query spec tag stream
2015-02-13 13:46:08 +01:00
Steffen van Bergerem
55cb2dd30a
Green pending specs for evil query spec tag stream
2015-02-13 12:30:53 +01:00
Steffen van Bergerem
d09e8a3758
Bump markdown-it-sanitizer
2015-02-13 02:58:31 +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
3312f97981
Fix timeago for notifications, add 'no notifications yet' message
2015-02-09 03:56:37 +01:00
