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

8541 commits

Author SHA1 Message Date
Dennis Schubert
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count 
Fix notification count change on contacts page
 2016-02-25 09:26:34 +01:00
Dennis Schubert
477e2572ac Merge pull request #6717 from svbergerem/fix-contacts-page-style-regression 
Fix style regression on contacts page from #6697
 2016-02-25 09:24:42 +01:00
Dennis Schubert
de37bbbed0 Merge pull request #6712 from svbergerem/spv-avatar-alignment 
Improve interaction avatar alignment for SPV
 2016-02-25 09:24:28 +01:00
Steffen van Bergerem
dafafcd680 Fix notification count change on contacts page 2016-02-24 23:56:01 +01:00
Steffen van Bergerem
5692190f09 Fix style regression on contacts page from #6697 for notification dropdown and no contacts well 2016-02-24 22:46:47 +01:00
cmrd Senya
8683067ace Remove #publisher_photo_upload from haml 
It seems like #publisher_photo_upload is relict of blueprint.
It was removed from CSS in 0c7d319fdc and
probably was unused even before. So remove it from publishers.
 2016-02-24 13:47:45 +03:00
Steffen van Bergerem
f9fe64da23 Improve interaction avatar alignment for SPV 2016-02-23 22:15:43 +01:00
Dennis Schubert
5e02dd0864 Merge pull request #6709 from svbergerem/unify-spv-ui 
Adjust the SPV design
 2016-02-23 11:47:09 +01:00
Steffen van Bergerem
d9e3f3a734 Merge branch 'stable' into develop 2016-02-23 09:38:53 +01:00
Dennis Schubert
9f2e5b1868 Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications... 
closes #6711
 2016-02-23 09:38:34 +01:00
Steffen van Bergerem
c7e3f2fc19 Adjust the SPV design 2016-02-23 09:20:54 +01:00
Dennis Schubert
dbdf352a6b Merge branch 'stable' into develop 2016-02-23 06:35:26 +01:00
Steffen van Bergerem
0392549702 Add footer on conversations page 
closes #6710
 2016-02-23 06:35:15 +01:00
Dennis Schubert
535057aca4 Merge branch 'stable' into develop 2016-02-21 04:26:25 +01:00
Marien Fressinaud
27a8e0fbca Test if user is nil in #reset_authentication_token 
Actually it redirects to stream page and says that user is already logged in.

Fix https://github.com/diaspora/diaspora/issues/6326
 2016-02-21 04:24:50 +01:00
Dennis Schubert
3d3e82f7f0 Merge branch 'stable' into develop 2016-02-21 04:20:19 +01:00
Saritha
7fe7287928 Fix for Empty input field when editing aspect name Fix #6548 2016-02-21 04:18:07 +01:00
Steffen van Bergerem
f8f05371e0 Merge pull request #6394 from AugierLe42e/mobile-js-refactor 
Mobile JS refactor
 2016-02-15 22:22:35 +01:00
Augier
28c509baeb Add jasmine specs for mobile view 2016-02-15 12:14:35 +01:00
Dennis Schubert
41ccccb85a Merge pull request #6697 from svbergerem/unify-ui 
Unify contacts, notifications and settings UI
 2016-02-15 01:41:16 +01:00
Steffen van Bergerem
89f21e87f8 Remove unused code 2016-02-14 02:48:51 +01:00
Steffen van Bergerem
1ba4357aaa Unify contacts, notifications and settings UI 2016-02-14 00:12:11 +01:00
Jonne Haß
e873b6cd4f Merge branch 'stable' into develop 2016-02-12 15:51:29 +01:00
Steffen van Bergerem
c805ee2cec Remove unused variables, fix undefined variables 
closes #6694
 2016-02-12 15:51:25 +01:00
augier
cc1faa63ec Mobile JS refactor 2016-02-11 10:21:24 +01:00
Steffen van Bergerem
be254a7d4d Fix placement of gallery navigation arrows 2016-02-10 01:20:05 +01:00
Steffen van Bergerem
6efde34bb8 Remove stream faces 2016-02-08 17:42:36 +01:00
Dennis Schubert
5b21be845e Merge branch 'stable' into develop 2016-02-08 08:21:35 +01:00
Steffen van Bergerem
f066daedbb Disable share button in mobile publisher on submit 
closes #6682, closes #6330
 2016-02-08 08:20:24 +01:00
Dennis Schubert
695ca83638 Merge branch 'stable' into develop 2016-02-08 08:18:33 +01:00
Steffen van Bergerem
f9f5e990f9 Remove bidi-override for author names 
closes #6680, closes #4785
 2016-02-08 08:16:37 +01:00
Dennis Schubert
5933c63a4a Merge pull request #6684 from svbergerem/fix-mobile-js-avatar-upload 
Fix uncaught type error for mobile avatar upload
 2016-02-08 08:01:21 +01:00
Dennis Schubert
9f6cc7cf12 Merge pull request #6683 from svbergerem/fix-mobile-500-like 
Fix 500 for mobile like without javascript
 2016-02-08 08:00:07 +01:00
Dennis Schubert
73ab7e253e Merge pull request #6681 from svbergerem/mobile-getting-started-completed 
Mark getting started as completed on mobile website
 2016-02-08 07:58:29 +01:00
Dennis Schubert
a87f313927 Merge pull request #6679 from svbergerem/post-report-reason-in-mail 
Add reason for post report to email sent to admins
 2016-02-08 07:56:49 +01:00
Steffen van Bergerem
9cc40af69c Fix 500 for mobile like without javascript 2016-02-08 03:11:55 +01:00
Steffen van Bergerem
6e895532c5 Fix uncaught type error for mobile avatar upload 2016-02-08 02:46:50 +01:00
Steffen van Bergerem
77d45c28c9 Mark getting started as completed on mobile website 2016-02-07 23:21:38 +01:00
Steffen van Bergerem
482cbe7fcc Add reason for post report to email sent to admins 2016-02-07 17:58:03 +01:00
Dennis Schubert
0c1483b16a Merge pull request #6678 from svbergerem/mobile-registration 
Fix mobile registration design
 2016-02-07 16:33:17 +01:00
Dennis Schubert
15d5e0febc Merge branch 'stable' into develop 2016-02-07 16:31:53 +01:00
Steffen van Bergerem
785665b9ad Fix mobile registration layout after failed registration 
closes #6677
 2016-02-07 16:31:48 +01:00
Steffen van Bergerem
b06981c031 Fix mobile registration design 2016-02-07 13:42:52 +01:00
Dennis Schubert
d67ec12913 Merge branch 'Faldrian-3307-collapse_long_images' into develop 2016-02-07 05:55:14 +01:00
Dennis Schubert
26e37c46bd Merge branch 'svbergerem-textarea-autosize' into develop 2016-02-07 05:39:49 +01:00
Dennis Schubert
868a45e3e0 Merge branch 'svbergerem-unify-ui' into develop 2016-02-07 05:29:08 +01:00
Steffen van Bergerem
936460e874 Merge branch 'stable' into develop 2016-02-06 15:40:16 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg 
closes #6673
 2016-02-06 15:39:38 +01:00
Steffen van Bergerem
3f72b231d4 Enable autosize for all textareas 2016-02-06 15:10:32 +01:00
Steffen van Bergerem
ada0ad6eb5 Unify settings ui 2016-02-06 14:15:04 +01:00
Steffen van Bergerem
03ef5bd064 Set max-width to 1200px for container-fluid 2016-02-06 14:15:04 +01:00
Steffen van Bergerem
0c34452840 Merge pull request #6654 from korun/set-default-resize-style-01 
CSS: set "resize: vertical" as default for textarea
 2016-02-06 12:00:44 +01:00
Steffen van Bergerem
0c05b474c5 Merge pull request #6509 from AugierLe42e/fix-mobile-comment 
Refactor mobile comment section
 2016-02-05 11:30:04 +01:00
Faldrian
6da2720168 Check for collapsible content_view again after images are loaded 2016-02-04 21:39:28 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
Jonne Haß
1832c2956e Merge branch 'stable' into develop 2016-02-01 11:27:06 +01:00
Sayed Abdelhaleem
fa97a5a5a2 Issue #6662: fix refresh my photos routing error 
closes #6667
 2016-02-01 11:24:16 +01:00
Steffen van Bergerem
17e8d2fcbb Fix blueimp gallery indicators 2016-02-01 02:32:49 +01:00
Jonne Haß
f4454f4488 Merge branch 'stable' into develop 2016-01-30 15:04:29 +01:00
Jonne Haß
32bda8fe20 Merge branch 'stable' into develop 2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings 
closes #6658
 2016-01-28 18:47:13 +01:00
Steffen van Bergerem
40c42eb5b3 Merge pull request #6641 from Flaburgan/add-poll-result 
Add answer poll counts
 2016-01-26 23:54:37 +01:00
Dennis Schubert
7c197756dd Merge branch 'stable' into develop 2016-01-26 15:19:55 +01:00
Dennis Schubert
211365c169 Merge branch 'master' into stable 2016-01-26 15:19:27 +01:00
Dennis Schubert
ad20bb052c Fix include_root_in_json misuse 
since it is no longer exposed for instances, our post_presenter failed
hard.
 2016-01-26 15:18:02 +01:00
fla
1e27b509f9 Add number of votes on poll answers 2016-01-24 14:31:06 +01:00
Ivan
b631b4c0e5 set "resize: vertical" as default for textarea 2016-01-24 10:53:19 +03:00
cmrd Senya
ed61ef6d6a Replace sidetiq with sidekiq-cron 
closes #6616
 2016-01-24 07:20:44 +01:00
Dennis Schubert
515cda7658 Merge branch 'stable' into develop 2016-01-24 07:15:04 +01:00
Benjamin Neff
44ab0df02b fix suppress_annoying_errors 
closes #6653
 2016-01-24 07:14:58 +01:00
Dennis Schubert
b1aa8aacfd Merge branch 'stable' into develop 2016-01-24 07:13:11 +01:00
Steffen van Bergerem
0213bbc028 Add podmin email to 500 error page 
closes #6652
 2016-01-24 07:12:06 +01:00
Steffen van Bergerem
a3adc2fb36 Fix timeago tooltips for reshares 2016-01-21 22:42:30 +01:00
Dennis Schubert
dd93cb6cad Merge pull request #6646 from svbergerem/commenting-when-ignored 
Tell user that the author might ignore them when commenting/liking failed
 2016-01-21 21:07:37 +01:00
Steffen van Bergerem
a52c8a2f55 Tell user that the author might ignore them when commenting/liking failed 2016-01-21 21:02:39 +01:00
Dennis Schubert
ff867cd471 Merge branch 'stable' into develop 2016-01-21 21:00:32 +01:00
Steffen van Bergerem
749016a7b4 Fix keyboard shortcuts on profile pages 
closes #6647
 2016-01-21 21:00:26 +01:00
Steffen van Bergerem
6fce81fc99 Merge branch 'stable' into develop 2016-01-20 21:37:30 +01:00
tamatsyk
960e651764 internationalize controller rescue_from text 
Fix typos

change forbitten to forbidden

fix styling issue and copypaste

improve code style for aspec_memberships_controller.rb with rubocop

fix styling issues

aligned elements of hash literals

fix typo

fix locale name and styling of its usage

fix failing tests

closes #6554
 2016-01-20 21:37:02 +01:00
augier
054971c7de Big refactor on mobile comments 2016-01-15 15:54:34 +01:00
Marien Fressinaud
bde3b47c02 [WIP] [mobile] Embedded new comment form in HTML 2016-01-15 15:54:34 +01:00
Steffen van Bergerem
5bd15e23f8 Clean up scss code for original white background 2016-01-10 00:48:30 +01:00
jpope
cab192b69e add original white background color theme 2016-01-10 00:48:30 +01:00
Steffen van Bergerem
67922f8ad4 Merge pull request #6483 from Flaburgan/add-not-connected-header-to-mobile 
Add header on not connected pages on mobile version
 2016-01-08 13:33:04 +01:00
Jonne Haß
baeff22451 Merge pull request #6095 from AugierLe42e/openid 
OpenID Connect
 2016-01-06 12:30:15 +01:00
Manuel Vögele
4f34ecafa4 Show posts of ignored users on their profile page 2016-01-04 18:29:30 +01:00
theworldbright
38439277d6 Add licenses where appropriate 2016-01-04 17:22:44 +09:00
theworldbright
58aef5658b Fix remaining remarks 2016-01-04 17:01:40 +09:00
augier
ef7ea1a855 General text error + CSS styling 
Minor merge conflict fix by theworldbright
 2016-01-04 16:49:59 +09:00
augier
10314ffc8c Fixing more remarks 2016-01-04 16:49:58 +09:00
theworldbright
c1e1f9bf69 Fix 500 error when unknown algorithm is used for JWT 2016-01-04 16:49:58 +09:00
theworldbright
4cde41486b Fix handling of prompt=login 2016-01-04 16:49:58 +09:00
theworldbright
9f85a90f55 Update code_used to false after issues new code 2016-01-04 16:49:58 +09:00
theworldbright
a4095692b7 Add default kid to jwks.json 2016-01-04 16:49:58 +09:00
theworldbright
1e3421713a Handle error when request object is signed 2016-01-04 16:49:58 +09:00
theworldbright
7e8bd0f411 Add fallback for failed app logo rendering 2016-01-04 16:49:58 +09:00
theworldbright
fd4022a55c Fix pronto remarks 2016-01-04 16:49:58 +09:00
theworldbright
773a5a67d9 Add default kid to ID token 2016-01-04 16:49:58 +09:00
theworldbright
ed1dc256a8 Fix handling of error message in authorization controller 2016-01-04 16:49:58 +09:00
augier
ebeafb7894 Add custom error page when prompt=none 2016-01-04 16:49:57 +09:00