Thomas Müller
|
44370e7f38
|
Merge pull request #926 from mroi/patch-1
fix app loading with avatars disabled
|
2015-06-26 17:40:36 +02:00 |
|
Bjoern Schiessle
|
e0d0755998
|
allow user to add federated cloud ID to addressbook
|
2015-06-23 17:46:07 +02:00 |
|
Michael Roitzsch
|
07283a2290
|
add avatar JavaScript
otherwise the contacts app fails to load due to JavaScript errors when avatars are disabled
|
2015-06-19 10:49:19 +02:00 |
|
Bernhard Reiter
|
ea7e3b4844
|
Load resources from template using script() and style() functions.
|
2014-11-08 16:35:22 +01:00 |
|
Bernhard Reiter
|
5728c8663b
|
Load md5 and Jcrop scripts and styles from their new locations.
They could not be loaded as they have been replaced by their bower
counterparts with
owncloud/core@49fbd766c2 and
owncloud/core@73569b29bc
|
2014-11-07 21:44:56 +01:00 |
|
Jan ten Bokkel
|
2cec676c10
|
Add avatar and placeholder JavaScripts
|
2014-08-31 10:51:24 +02:00 |
|
babelouest
|
c682a3585d
|
Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap
Conflicts:
admin.php
lib/backend/ldap.php
lib/dispatcher.php
|
2014-05-09 14:54:49 -04:00 |
|
Thomas Tanghus
|
f699812f69
|
Move instantiation of ImportManager to PageController
|
2014-05-09 13:39:17 +02:00 |
|
babelouest
|
03cf95f37c
|
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
|
2014-04-09 13:45:48 -04:00 |
|
babelouest
|
c674b8db00
|
code clean in js config dialog
distinction between a ldap addressbook edition and a local addressbook edition in the UI
several bug fixes
|
2014-04-09 13:38:09 -04:00 |
|
Thomas Tanghus
|
70438c997d
|
Align controllers to owncloud/core#8017
|
2014-04-07 22:29:24 +02:00 |
|
babelouest
|
ec8053c915
|
Several corrections and improvements, thanks to the feedbacks on the PR
|
2014-04-04 18:50:55 -04:00 |
|
Thomas Tanghus
|
868bf088b3
|
camelCase variables
|
2014-03-18 00:58:01 +01:00 |
|
Thomas Tanghus
|
394d15350e
|
Remove use of %webroot%. Closes #406
|
2014-02-26 23:23:01 +01:00 |
|
Thomas Tanghus
|
9abdeb75ce
|
2014
|
2014-01-26 00:40:22 +01:00 |
|
Thomas Tanghus
|
1d29b943ae
|
Finally works with core master
|
2013-10-17 02:10:50 +02:00 |
|