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
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
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
Steffen van Bergerem
c1d714d2c7
Remove unused files, fix syntax in jasmine tests
2015-02-07 21:17:51 +01:00
Steffen van Bergerem
8b33b9eb18
Merge pull request #5602 from Faldrian/more-shortcuts
...
Add shortcuts for reshare, expand Post and open first link in a post
Conflicts:
config/locales/diaspora/en.yml
2015-02-07 14:41:56 +01:00
Sam Radhakrishnan
a12c0d83c0
Fixed Bug #5593 . Added length validation to location in profile model with maximum length 255.
2015-02-02 19:42:53 +05:30
goobertron
42cd2337be
Amend all text strings in en locales to use sentence case
...
Adapt cukes to work with new capitalisation rules
2015-01-31 17:44:57 +00:00
Augier
55d258c5ac
Fix registrations displaying
2015-01-30 18:00:22 +01:00
Faldrian
099974ddef
Add shortcuts for reshare, expand Post and open first link in a post
2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32
Allow user to enable / disable notifications for a post from stream #5350
2015-01-25 18:40:47 +01:00
Sakshi Jain
8b1f0453a1
5560 Hide community spotlight setting if not enabled
2015-01-20 10:31:31 +05:30
Jonne Haß
6502000429
Merge pull request #5574 from svbergerem/fix-linkify
...
Fix markdown-it linkify blocking Firefox
2015-01-19 15:02:00 +01:00
Steffen van Bergerem
b63d8fc679
Fix markdown-it linkify blocking Firefox
2015-01-19 02:09:10 +01:00
Marcelo Briones
63eca447d0
Strip EXIF data as user preference
2015-01-18 10:28:28 -03:00
