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 |
|