rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-02-08 02:54:17 +01:00
Code Issues Releases Activity
3,375 Commits 18 Branches 95 Tags
Commit Graph

146 Commits

Author SHA1 Message Date
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
Bernhard Reiter
8f23166955 Display correct number of contacts in shared addressbooks. 
Fixes #654.
 2014-10-28 23:17:38 +01:00
jbtbnl
e947469545 Merge pull request #628 from owncloud/issue-592 
Add avatar and placeholder JavaScripts
 2014-10-22 12:51:23 +02:00
jbtbnl
18c7e95380 Merge branch 'master' into import-new-ui 
Conflicts:
	css/contacts.css
 2014-09-15 11:14:31 +02:00
Jan-Christoph Borchardt
ea5d8fbb79 Merge pull request #619 from owncloud/fix-header 
Small fixes for header
 2014-09-08 17:00:46 +02:00
Jan ten Bokkel
2cec676c10 Add avatar and placeholder JavaScripts 2014-08-31 10:51:24 +02:00
Jan ten Bokkel
7945f1fcc8 Fix export of contacts 2014-08-29 17:52:51 +02:00
Bernhard Reiter
0eb18b2a15 Fix typos in variable names that broke stuff. 2014-08-29 00:45:56 +02:00
Bernhard Reiter
0d6f16f612 Fix one error reporting line in the group controller. 2014-08-29 00:45:56 +02:00
jbtbnl
0129e59024 Hide upload iframe and fix merge flaws 2014-08-26 19:28:45 +02:00
jbtbnl
a9ade3079d Merge remote-tracking branch 'origin/master' into import-new-ui 
Conflicts:
	css/contacts.css
	lib/controller/importcontroller.php
 2014-08-26 17:42:14 +02:00
Bernhard Reiter
1e015d9872 Rename $this->tagMgr to $this->tags as that's what they are. 
They're instances of OCP\ITags, not of OCP\ITagManager.
 2014-08-19 14:29:46 +02:00
Thomas Müller
0549c01fe8 Merge pull request #568 from owncloud/adding-php-lint 
adding php-lint
 2014-07-30 11:33:10 +02:00
Clark Tomlinson
e7755dcc32 Extracting closures into methods to solve php 5.3 issue #546 2014-07-30 11:07:44 +02:00
Bernhard Reiter
dd2c0f7c14 Use OCP\ITags in lib/controller/importcontroller.php. 2014-07-23 20:43:32 +02:00
root
5c5bc56ae4 fix TagMgr access 
remove unwanted error_log
 2014-07-04 10:51:59 -04:00
LEDfan
bf9d2cd999 Instead of throwing error, give a JSON result when there isn't a photo 2014-07-02 17:25:34 +02:00
babelouest
229c49d43e Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui 
Conflicts:
	js/addressbooks.js
	templates/contacts.php
 2014-05-10 12:09:23 -04: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
babelouest
de4bb76c53 after a painful rebase 2014-05-09 14:30:14 -04:00
Thomas Tanghus
f699812f69 Move instantiation of ImportManager to PageController 2014-05-09 13:39:17 +02:00
babelouest
da0d990472 adapted import ui to fit in the ocdialog 
might be some bugs left though
 2014-05-07 22:46:22 -04:00
babelouest
f3272ad159 reimplemented import ui in a ocdialog 2014-05-07 16:54:58 -04:00
babelouest
a3166ee452 add admin settings to enable/disable ldap backend 2014-05-05 01:10:01 -04:00
Thomas Tanghus
a50b1b4860 Add use OCP\ICache to ImportController 2014-04-18 02:00:17 +02:00
Thomas Tanghus
561d13c20e Simplify cropPhoto args 2014-04-17 17:38:01 +02:00
babelouest
5512e72ef4 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-11 07:56:06 -04:00
Thomas Tanghus
bf37aead8e Inject API in AddressBookController. Refs. #460 2014-04-11 12:45:15 +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
babelouest
e354d0fae3 use ocdialog 
fix a bug in the contact.save() methid that was readonly for no reason
 2014-04-07 19:40:21 -04:00
Thomas Tanghus
e993761cb3 Forgot access sig 2014-04-08 01:32:53 +02:00
Thomas Tanghus
c5bdc2f74d Scrutinizer fixes 2014-04-08 01:19:30 +02:00
Thomas Tanghus
d0e8457fc3 No need to instantiate App twice 2014-04-07 23:35:57 +02:00
Thomas Tanghus
8dcd7a7d8b server => cache in ContactPhotoController 2014-04-07 23:21:12 +02:00
Thomas Tanghus
70438c997d Align controllers to owncloud/core#8017 2014-04-07 22:29:24 +02:00
babelouest
57211530f8 clean code 2014-04-07 01:17:48 -04:00
babelouest
ec8053c915 Several corrections and improvements, thanks to the feedbacks on the PR 2014-04-04 18:50:55 -04:00
babelouest
e9c9f6d363 first batch of a working of add/update addressbook dialog window 
several bugs remaining and code cleaning is necessary
 2014-04-03 17:35:58 -04:00
babelouest
536b5d5261 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-01 09:17:38 -04:00
babelouest
3f26148233 implementing ldap addressbook modification (draft) 2014-04-01 09:16:53 -04:00
Thomas Tanghus
06f865beeb Explicitly check for request vars 2014-04-01 03:38:01 +02:00
Thomas Tanghus
fa9f66e140 Unused var 2014-04-01 02:31:16 +02:00
Thomas Tanghus
9d672249da Add route for getting AddressBook metadata. Refs. #412 2014-04-01 02:11:29 +02:00
babelouest
a8e6ab0d33 change new addressbook ui for a dialog 
implemented delete ldap addressbook
 2014-03-29 01:22:52 -04:00
babelouest
e70faa6e82 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-03-28 10:39:49 -04:00
babelouest
440fce7ca8 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 
Conflicts:
	formats/backend_ldap_connector.xml
	lib/backend/abstractbackend.php
	lib/backend/database.php
	lib/backend/ldap.php
	lib/controller/addressbookcontroller.php
 2014-03-28 10:39:25 -04:00
Thomas Tanghus
1c1fc532d5 Throw proper exceptions in GroupController 2014-03-25 01:16:08 +01:00
Thomas Tanghus
a1c8fe7f1e Merge pull request #444 from owncloud/import_multi_format2 
Import from multiple formats
 2014-03-23 14:18:48 +01:00
Thomas Tanghus
a2323e1dc6 Add to CacheThumbnail call 2014-03-21 15:19:32 +01:00