nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16851 commits 4 branches 0 tags 121 MiB
Commit graph

16851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saritha
f27c0483ca Feature spec for change password on mobile website 
Fix #6372
 2015-10-28 15:05:34 +05:30
Steffen van Bergerem
3c43819bce Merge pull request #6504 from sarithats/fix/login_button 
Change login button color
 2015-10-21 08:16:54 +02:00
Dennis Schubert
1338725308 Merge pull request #6492 from marienfressinaud/6062-add-search-and-invte-links-when-no-contacts 
Add invite links when no contacts
 2015-10-21 01:20:59 +02:00
Jonne Haß
800be9b2cf Merge branch 'stable' into develop 2015-10-20 16:27:43 +02:00
cmrd Senya
00588e1ef8 Disable self-notification possibility 
closes #6512
 2015-10-20 16:27:39 +02:00
Saritha
7b08cdd488 Change button color to blue 
Fix #6449
 Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
 2015-10-20 12:53:59 +05:30
Dennis Schubert
9de2f99729 Merge branch 'stable' into develop 2015-10-19 18:57:08 -07:00
Dennis Schubert
d8ed529f92 Merge branch 'master' into stable 2015-10-19 18:56:56 -07:00
Dennis Schubert
bdc55f05f7 Release 0.5.4.0 2015-10-19 18:55:33 -07:00
Dennis Schubert
00ebe4963e Merge branch 'stable' into develop 2015-10-19 18:50:36 -07:00
Dennis Schubert
1f4ad4019f Merge branch 'release/0.5.4.0' into stable 2015-10-19 18:49:08 -07:00
Dennis Schubert
aabe6951e5 Do not reload Streams asynchronously 
Fixes #6494 and #6473
Partly reverts 517cd56f21
[ci skip]
 2015-10-19 18:46:09 -07:00
Jonne Haß
810f24db74 Merge branch 'stable' into develop 2015-10-15 12:20:46 +02:00
Steffen van Bergerem
06c1d2e9e3 Compare person id in people show view 
closes #6505
 2015-10-15 12:20:13 +02:00
Dennis Schubert
228f3852b2 Merge branch 'stable' into develop 2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path 
closes #6503
 2015-10-15 05:58:38 +02:00
Jonne Haß
7bc2c92b77 Merge pull request #6502 from svbergerem/fix-6452-regressions 
Fix #6452 regressions
 2015-10-15 01:59:16 +02:00
Steffen van Bergerem
829d4db213 Fix #6452 regressions 2015-10-15 00:45:37 +02:00
Jonne Haß
99d4e0b332 Merge branch 'stable' into develop 2015-10-14 22:33:14 +02:00
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +02:00
Marien Fressinaud
461e4cfd8c Cleanup the code 
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
 2015-10-14 22:31:39 +02:00
Giniouxe
1ae838b596 Open invite link in modal 2015-10-14 22:31:22 +02:00
fla
da1b0b5666 Add links to add or invite contacts 2015-10-14 22:31:22 +02:00
cmrd Senya
dc02c5384b Notify a remote user when a non-contact user likes or comment her public post 2015-10-14 22:30:35 +02:00
Jonne Haß
d9572ec337 Merge branch 'stable' into develop 2015-10-14 11:00:47 +02:00
Lincoln Stoll
6ac6dc1059 Don't set key for logfile on Heroku 
This fixes the issue reported in #5947. Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.

closes #6500
 2015-10-14 11:00:42 +02:00
Jonne Haß
403ef73d39 Merge branch 'stable' into develop 2015-10-14 01:14:59 +02:00
cmrd Senya
70b5d86386 Remove the lines from inlined_jobs.rb which never get called. 
closes #6499
 2015-10-14 01:14:54 +02:00
Jonne Haß
06f46541a7 Merge branch 'stable' into develop [ci skip] 2015-10-13 12:07:01 +02:00
Jonne Haß
6e845eb22a Do not enforce lambda { } for multiline [ci skip] 2015-10-13 12:06:53 +02:00
Jonne Haß
09f4eeac2a Merge branch 'stable' into develop 2015-10-12 16:12:36 +02:00
Steffen van Bergerem
b68daaece3 Redirect to sign in on 401 ajax response 
closes #6496
 2015-10-12 16:12:30 +02:00
Jonne Haß
00821781a0 Merge branch 'stable' into develop 2015-10-12 11:37:21 +02:00
Steffen van Bergerem
b9e6f749e2 Clean up view.js 2015-10-12 11:36:09 +02:00
Dennis Schubert
2b2ce66126 Merge branch 'stable' into develop 2015-10-12 03:44:44 +02:00
Dennis Schubert
9df2cb7290 Prepare 0.5.5.0 release 
[ci skip]
 2015-10-12 03:41:38 +02:00
Dennis Schubert
26082d3fa4 Merge pull request #6495 from svbergerem/clean-up-view-js 
Clean up view.js
 2015-10-12 02:06:28 +02:00
Steffen van Bergerem
4a55fc5fb6 Clean up view.js 2015-10-11 20:50:22 +02:00
Jonne Haß
2aed793d19 Merge branch 'stable' into develop 2015-10-11 17:30:47 +02:00
Steffen van Bergerem
123e6d1dd4 Redirect logged out users to sign up page for limited posts 
closes #6490
 2015-10-11 17:29:01 +02:00
Steffen van Bergerem
5d7470d94a Merge pull request #6452 from AugierLe42e/typehead-uses-bs-variable 
Use BS variable for typehead + header CSS enhancements
 2015-10-11 14:58:46 +02:00
augier
aa48c412a8 Use BS variable for typehead + header CSS enhancements 2015-10-11 12:21:34 +02:00
Jason Robinson
dd5409dce3 Merge pull request #6393 from pravi/patch-2 
switch back to jquery-colorbox
 2015-10-10 21:10:08 +02:00
Jonne Haß
77295ffcfb Merge pull request #6487 from svbergerem/move-reshare-count 
Move reshare count
 2015-10-10 20:51:27 +02:00
Jason Robinson
7f70f411fc Merge pull request #6488 from Zauberstuhl/bump_vines_jsxc 
Bump jsxc to v0.1.4.develop.3
 2015-10-10 20:45:50 +02:00
Jason Robinson
9e9128f77d Merge branch 'stable' into develop 2015-10-10 20:45:06 +02:00
Lukas Matt
9be6b41141 bump vines to v0.2.0.develop.4 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6489
 2015-10-10 20:44:57 +02:00
Lukas Matt
f89fc53b17 bump jsxc to v0.1.4.develop.3 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-10 20:42:21 +02:00
Steffen van Bergerem
bce7157b86 Merge pull request #6395 from AugierLe42e/drop-flash-messages-widget 
Use backbone for flash messages
 2015-10-10 17:17:52 +02:00
Steffen van Bergerem
e9350a57fc Fix pronto error, remove unused file 2015-10-10 14:22:59 +02:00