Thomas Müller
f8e175f944
Merge pull request #734 from owncloud/fix-updated-t
...
fix auto escaping functionality of t()
2015-05-08 00:43:00 +02:00
Vincent Petry
0b5fb1bfc7
Fix to make it compatible with Sabre 2.1
...
Also fixed unit tests so they run but some still fail
- Added IUserSession mock
- Replaced OCP::getUser() with IUserSession usage to make the mock work
- Added base class for test cases
2015-03-17 12:53:05 +01:00
Rumesh Eranga
7d729efdc8
Code formatted in addContact function
2015-02-09 23:41:34 +05:30
rumesh
14684eff32
#786 fixed
...
Check addressbooks count before create the contact.
2015-02-09 23:14:28 +05:30
Lukas Reschke
94dfff4eb5
Fix encoding in 3rdparty lib
2015-02-06 15:01:42 +01:00
jbtbnl
3a145480f1
Fixes CardDAV link for shared addressbooks #701
2015-01-12 14:11:28 +01:00
Morris Jobke
fe38635a6c
placeholder are now escaped in core
2014-12-18 14:46:52 +01:00
babelouest
713ad24d67
fix bug #488
2014-12-08 15:56:12 -05:00
LEDfan
0c136bcb2a
Merge pull request #650 from ymv/fix-prefered
...
Show preferred value in contacts list
2014-12-05 07:54:25 +01:00
LEDfan
8c3d7ccdba
install multi-select and combobox via bower
...
Remove old combobox
user bower for onfontresize
Add jcrop + md5
Add files to scrutinizer ignore list
Remove misplaced text
Selected the right MultiSelect library via bower
Move bower dependencies to correct location
2014-11-18 12:54:33 +01:00
Bernhard Reiter
66f8c5d882
Merge pull request #668 from ockham/share-contact-groups2
...
Share contact groups
2014-11-17 16:51:07 +01:00
Bernhard Reiter
8f23166955
Display correct number of contacts in shared addressbooks.
...
Fixes #654 .
2014-10-28 23:17:38 +01:00
Jan ten Bokkel
34ff3c492c
Revert "Removed t is undefined, which causes passman to hang."
...
This reverts commit dad944a951
2014-10-27 18:08:54 +01:00
Sander
dad944a951
Removed t is undefined, which causes passman to hang.
2014-10-12 11:55:09 +02:00
Bernhard Reiter
e8a735a210
Rename group by id.
2014-10-11 01:47:49 +02:00
Bernhard Reiter
c86dbf11b5
Delete groups by their id instead of their name.
2014-10-11 01:47:49 +02:00
Bernhard Reiter
83bc1eaadf
Prepare for sharing of contact groups.
2014-10-11 01:47:44 +02:00
Jörn Friedrich Dreyer
7d8fe72351
customize search results
2014-10-01 18:09:01 +02:00
LEDfan
cd2d7573d9
Merge pull request #638 from owncloud/fix_404
...
Solve the 404 contact not found error #623
2014-09-28 10:03:06 +02:00
LEDfan
7478295db5
Fix additional 404's refs https://github.com/owncloud/contacts/issues/623#issuecomment-56631474
2014-09-25 08:08:50 +02:00
Yourkov Mikhail
b5689d6c16
getPreferedValue returns value with PREF flag
2014-09-16 01:22:50 +04: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
jbtbnl
0357bd3d3f
Hide import input fields and import button on import start
2014-09-02 16:25:39 +02:00
jbtbnl
cf02c8dbb4
Remove drag&drop tipsy reminder
2014-08-29 18:40:34 +02:00
Jan ten Bokkel
7945f1fcc8
Fix export of contacts
2014-08-29 17:52:51 +02:00
Jan ten Bokkel
ee1e61535e
Fixes contacts export function
2014-08-29 14:00:15 +02:00
Jan ten Bokkel
4a0c4870d7
Fix header positioning. Make sort order reappear afder deselection.
2014-08-29 11:07:13 +02:00
Jan ten Bokkel
8654fe0aba
Improve import dialog styling
2014-08-28 16:49:53 +02:00
Jan ten Bokkel
be5ae33234
Align import dialog to screen center
2014-08-28 16:24:38 +02:00
jbtbnl
65966d2888
Fix Scrutinizer issues
2014-08-26 23:20:29 +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
Adam Williamson
128f8be707
correct selection of current type for multi-type parameters: #536
...
This check was exactly the wrong way around, so the code to select
the appropriate type wouldn't run when it was actually needed.
2014-07-26 11:20:38 -07:00
root
f7aed92d77
forgot to comment out 3 lines after last change
2014-07-04 11:19:55 -04:00
root
e789f0480c
disable import vcf file by clicking on it on the file app (incompatible with the new import module)
2014-07-04 11:16:33 -04:00
xhess
e5a2c205a3
birthday date picker date range
...
change birthday date range from the future to the past.
see: https://github.com/owncloud/contacts/issues/520
2014-06-30 15:11:37 +02:00
babelouest
91e0917aaa
workaround for the AddressbookList which is empty when the import dialog is opened
...
[to be removed when the parent bug will be solved]
2014-05-12 16:53:51 -04:00
babelouest
c80714f1d7
Merge remote-tracking branch 'origin/import-new-ui' into import-new-ui
2014-05-12 14:40:47 -04:00
babelouest
af3df8e95a
fixed undefined connectors
2014-05-12 13:01:34 -04: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
b2d26811e3
fixed scrutinizer issues
2014-05-09 15:18:44 -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
f9aa396d01
Small readability fix
2014-05-09 11:29:21 +02:00
babelouest
1ba63234ac
removed unnecessary debugging functions
2014-05-07 22:51:13 -04: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
b89b933a98
remove buildImportSelect2()
2014-05-05 15:20:19 -04:00
babelouest
7f7a2f6a7d
use ocdialog instead of bottom-left controls
2014-05-05 15:18:48 -04:00
babelouest
a3166ee452
add admin settings to enable/disable ldap backend
2014-05-05 01:10:01 -04:00
