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
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
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
Jonne Haß
92b5ea29ed
Merge branch 'stable' into develop
2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1
Add public stream
...
closes #6465
2015-10-07 22:29:39 +02:00
Steffen van Bergerem
64773d883e
Add permalink for stream elements
2015-10-06 23:29:09 +02:00
Jonne Haß
7b4d7dc737
Merge branch 'stable' into develop
2015-10-06 22:50:42 +02:00
Steffen van Bergerem
25e4d8c365
Fix shortcuts after changing streams
2015-10-06 22:34:36 +02:00
Steffen van Bergerem
20385701d2
Move interactions.scss
2015-10-06 10:30:11 +02:00
Steffen van Bergerem
ff99db1fd3
Change conversation page style
2015-09-27 23:11:19 +02:00
Jonne Haß
c60e32c513
Merge branch 'stable' into develop
2015-09-27 12:02:29 +02:00
Steffen van Bergerem
baba71612d
Replace deprecated default_wait_time for Capybara
...
closes #6430
2015-09-27 12:02:24 +02:00
Steffen van Bergerem
a5ca78bc87
Fix post preview with location
2015-09-27 03:03:28 +02:00
augier
f00f3965ff
Styling main stream
2015-09-18 19:13:49 +02:00
Steffen van Bergerem
953b03d086
Fix adding the first comment in the mobile view
2015-09-12 14:52:18 +02:00
Jonne Haß
48bc79f1b5
Merge branch 'stable' into develop
2015-08-30 01:14:54 +02:00
Jonne Haß
1223699f76
Disable all network requests in Cucumber suite
...
closes #6368
2015-08-30 01:14:49 +02:00
Jonne Haß
9842841c18
Merge branch 'stable' into develop
2015-08-29 19:55:09 +02:00
Steffen van Bergerem
34319758ed
Improve posts from ... page cukes
...
closes #6367
2015-08-29 19:55:03 +02:00
Jonne Haß
1dee542933
Merge branch 'stable' into develop
2015-08-29 17:01:14 +02:00
Jonne Haß
bf92a7441e
Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API
2015-08-29 15:58:08 +02:00
augier
3a5406a6e1
Styling of mobile header compilant with desktop version
2015-08-28 20:30:07 +02:00
Steffen van Bergerem
9446a3ae21
Merge pull request #6301 from AugierLe42e/image-gallery
...
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
augier
63bfcb7c98
Using Blueimp image gallery
2015-08-27 23:50:20 +02:00
Jonne Haß
24d9be2e68
Merge branch 'stable' into develop
2015-08-27 21:03:16 +02:00
augier
2ce7a1e185
Mobile subdomain
...
closes #6354
2015-08-27 21:01:36 +02:00
Dennis Schubert
6b863defa3
Merge branch 'stable' into develop
2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e
Remove unused js code (stream widget and dropdowns)
...
closes #6279
2015-08-25 04:26:17 +02:00
Steffen van Bergerem
eddfa7cb5c
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
...
Left and right navbar polishing
2015-08-23 11:29:51 +02:00
augier
450bf4f4ba
Refactor and minor styling
2015-08-23 09:59:12 +02:00
augier
281d1a9161
Rebasing and fixing tests
2015-08-11 18:12:02 +02:00
Steffen van Bergerem
8bc86eb98b
Replace jquery.autocomplete with typeahead.js
2015-08-10 22:55:05 +02:00
augier
f917757b5b
Use entypo icons on mobile posts
2015-08-06 15:56:58 +02:00
Jonne Haß
22a8997c47
Merge branch 'stable' into develop
2015-08-01 20:05:29 +02:00
theworldbright
b3242500b0
Disable ambiguous regex for step definitions
...
Signed-off-by: theworldbright <kent@kentshikama.com>
closes #6272
2015-08-01 20:05:24 +02:00
Jonne Haß
cf13672148
Stabilize mobile/not_safe_for_work.feature
2015-07-30 11:39:40 +02:00
Steffen van Bergerem
e402bbdd3d
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
...
Fix nsfw author
2015-07-30 00:28:15 +02:00
augier
9a23c92f8e
Show author of NSFW post
2015-07-29 21:13:41 +02:00
fla
4aef8de571
Improve mobile drawer
2015-07-29 14:22:19 +02:00
Dennis Schubert
23c83b9447
Merge branch 'stable' into develop
2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0
Fix conversations view with no contacts
...
closes #6266
2015-07-29 12:08:35 +02:00
Steffen van Bergerem
839d76c15e
Moar entypo on mobile website
2015-07-21 21:16:46 +02:00
Jonne Haß
397845161f
Merge pull request #6162 from cmrd-senya/5684-public-additional-profile
...
Allow additional profile fields (previously private profile) to be set public (new updated version)
2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a
Allow extended profile fields (previously private profile) to be set public ( #5684 ).
...
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).
In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.
This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
2015-07-11 04:36:45 +03:00
Jonne Haß
1e4224813e
Merge branch 'stable' into develop
2015-07-05 20:50:42 +02:00
Benjamin Neff
97f973b80a
fix rubocop warnings in poor_mans_webmock.rb
...
and remove unused HttpPost mock
2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3
change public_url to atom_url and profile_url
2015-07-05 20:44:24 +02:00
