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

8277 commits

Author SHA1 Message Date
Jonne Haß
17d0ddab41 Merge branch 'stable' into develop 2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions 
closes #6552
 2015-11-18 03:16:54 +01:00
Steffen van Bergerem
09a26fbf57 Merge pull request #6448 from AugierLe42e/replace-entypo-mail 
[Quickfix] Use entypo-mail on mobile view
 2015-11-16 01:41:50 +01:00
augier
02e82029c3 Use entypo-mail on mobile view 2015-11-15 14:11:29 +01:00
Jonne Haß
c6939361ee Revert "Revert "Force flash message width to 80% of screen on small devices"" 
This reverts commit 53a7d36e44.
 2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73 Merge branch 'stable' into develop 2015-11-13 16:03:44 +01:00
Jonne Haß
53a7d36e44 Revert "Force flash message width to 80% of screen on small devices" 
This reverts commit e731bb86c5.
 2015-11-13 15:59:18 +01:00
Jonne Haß
5de0655e54 Merge branch 'stable' into develop 2015-11-13 14:31:10 +01:00
Augier
e731bb86c5 Force flash message width to 80% of screen on small devices 
closes #6529
 2015-11-13 14:31:06 +01:00
Manuel Vögele
1680c0c924 Do not disable submit button if comment is empty in mobile view 
Fixes #5485
 2015-11-13 02:46:22 +01:00
Jonne Haß
7fca5cf93a Merge branch 'stable' into develop 2015-11-04 22:10:07 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller 
closes #6533
 2015-11-04 22:10:00 +01:00
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
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
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
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
Steffen van Bergerem
b9e6f749e2 Clean up view.js 2015-10-12 11:36:09 +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
Steffen van Bergerem
e9350a57fc Fix pronto error, remove unused file 2015-10-10 14:22:59 +02:00
Steffen van Bergerem
74a3a9719c Display reshares under the post 2015-10-10 14:22:59 +02:00
augier
aefd7273d9 Drop ID 2015-10-10 12:34:59 +02:00
augier
c62927bf00 Use backbone for flash messages 2015-10-10 12:15:41 +02:00
Dennis Schubert
aab21be09d Merge branch 'stable' into develop 2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62 Fix hovercard view console error 
closes #6480
 2015-10-10 06:45:09 +02:00
Jonne Haß
858bdb0808 Merge branch 'stable' into develop 2015-10-09 23:11:05 +02:00
Steffen van Bergerem
2fc7caf0bd Fix infinite scroll console error 
closes #6478
 2015-10-09 23:10:58 +02:00
Steffen van Bergerem
4e5d09e6c5 Fix 'post to single aspect' cukes 2015-10-09 23:10:53 +02:00
Jonne Haß
c27b629515 Merge branch 'stable' into develop 2015-10-09 17:47:39 +02:00