Jonne Haß
35a4998707
Merge branch 'stable' into develop
2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly
...
closes #6877
2016-06-19 16:14:00 +02:00
Dennis Schubert
520d80cc1a
Merge branch 'stable' into develop
2016-06-09 03:19:35 +02:00
Steffen van Bergerem
a14c61300e
Remove the publisher from the photos page
...
closes #6851
2016-06-09 03:17:52 +02:00
Benjamin Neff
acb91c79d2
improve pod connection check
...
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
2016-03-05 02:57:11 +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
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
Manuel Vögele
4f34ecafa4
Show posts of ignored users on their profile page
2016-01-04 18:29:30 +01:00
augier
c62927bf00
Use backbone for flash messages
2015-10-10 12:15:41 +02:00
Steffen van Bergerem
b59c99807b
Move settings.scss
2015-10-05 16:12:40 +02:00
Florian Staudacher
738413c65f
fix some issues with pod-checking
...
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
2015-08-30 18:50:34 +02:00
Jonne Haß
bf92a7441e
Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API
2015-08-29 15:58:08 +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
Florian Staudacher
ea397ffdfb
Add connection test for pods in the network
...
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
Steffen van Bergerem
04191996a5
Add updates for 'only sharing' and 'all contacts'
2015-07-24 14:18:43 +02:00
Steffen van Bergerem
4a178e20e5
Update number of contacts on contact page when adding/removing contacts
2015-07-24 02:38:49 +02:00
Steffen van Bergerem
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +02:00
Steffen van Bergerem
295c8533a1
Fix profile visibility icon
2015-07-17 14:37:22 +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
Spanti Nicola (RyDroid)
df440ed8d8
Very minor changes of some JS files
2015-07-08 19:09:08 +02:00
Steffen van Bergerem
db00bd1b03
Fix conversation modal on contacts page
2015-07-03 17:44:12 +02:00
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +02:00
Jonne Haß
a2d894cb39
Improve stability for manages_aspects.feature:79
...
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.
The fix is to use Capybaras drag_to instead
2015-06-24 04:01:15 +02:00
Steffen van Bergerem
6c32fa7845
Fix Bootstrap 3 regression: add email visibility icon to settings page
2015-06-07 22:31:58 +02:00
Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Benjamin Neff
68f7208ff5
use id from preloaded gon.post to fix broken liking with guid
...
closes #5978
2015-05-23 01:24:09 +02:00
Steffen van Bergerem
716952dc0d
Put 'email not visible' text into popover/tooltip
...
closes #5956
2015-05-16 03:42:14 +02:00
Steffen van Bergerem
0c5443d543
Make js-routes use compact and camelcase function names
...
closes #5941
2015-05-10 02:00:30 +02:00
Benjamin Neff
28c9cfdfd4
write cucumber test and add order_id on create
2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417
refactoring javascript and controller
...
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
2015-04-28 01:57:43 +02:00
Steffen van Bergerem
75ef9f47d0
Use Bootstrap modal for new aspect form
2015-04-07 10:45:09 +02:00
Steffen van Bergerem
5fa6b8253e
JSHint unused and undefined variables
2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a
JSHint semicolon errors
2015-02-08 23:41:31 +01:00
Steffen van Bergerem
026773194a
Replace pagedown by markdown-it
2015-01-10 18:56:20 +01:00
Jonne Haß
f20020f06b
Merge pull request #5473 from svbergerem/contacts-backbonejs
...
Port contacts page to backbonejs
2015-01-06 14:38:55 +01:00
Steffen van Bergerem
9de6a26a22
Port contacts page to backbonejs
2015-01-04 17:13:18 +01:00
Steffen van Bergerem
59e9597c77
Remove asyncSubHeader from app.pages.Profile
2015-01-03 15:20:33 +01:00
Paul Hill
ac4607d75c
LibreJS should work with most of the site
2014-10-21 02:48:18 +01:00
Steffen van Bergerem
976ff0fcda
Redesign profile page and port to Bootstrap
2014-10-01 12:28:56 +02:00
Florian Staudacher
fe0f8df9c9
add a 'css mutex' for cuke failures
2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b
add the publisher back to ones own profile, fix some cukes
2014-09-16 02:16:14 +02:00
Florian Staudacher
a5da2ca48c
small fixes and more jasmine specs
2014-09-15 01:37:24 +02:00
Florian Staudacher
89d468cdcc
first round of specs and code cleanups/fixes
2014-09-15 01:37:23 +02:00
Florian Staudacher
e4ee28885a
make photos page work with backbone
2014-09-15 01:37:23 +02:00
Florian Staudacher
1f724dd123
* add a (hash)tag helper for handlebars
...
* re-add stream on profile page
* more controller refactoring
2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc
* refactored text direction detector into helper (also for handlebars)
...
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
2014-09-15 01:37:23 +02:00
