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 |
|
babelouest
|
2e04b55709
|
fix display bug for add ldap addressbook button
|
2014-05-09 08:39:54 -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
|
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 |
|
babelouest
|
b8c3c4e1ea
|
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
|
2014-04-15 11:13:05 -04:00 |
|
Thomas Tanghus
|
26bed15085
|
UI permission fixes noticed when merging #457
|
2014-04-15 14:06:44 +02:00 |
|
babelouest
|
4100e647a0
|
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
|
2014-04-14 08:31:55 -04:00 |
|
Volkan Gezer
|
df3386a877
|
Remove extra tab spacing
|
2014-04-13 14:09:08 +02:00 |
|
babelouest
|
cffc06cc47
|
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
|
2014-04-10 23:33:17 -04:00 |
|
Thomas Tanghus
|
27a182b6e8
|
Be nice to IE8 for once
|
2014-04-10 20:29:34 +02:00 |
|
babelouest
|
8b7ad5b1ff
|
add parameters empty validation with error message && force numeric for page size
align checkbox on the left
|
2014-04-10 13:38:05 -04: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 |
|
Volkan Gezer
|
2f368b244f
|
Fix hardcoded strings in new contact template
|
2014-04-06 03:01:37 +02:00 |
|
babelouest
|
e4ac07cbab
|
Merge branch 'master' of https://github.com/owncloud/contacts into ldap
|
2014-04-04 18:51:44 -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 |
|
jbtbnl
|
7419b54e3e
|
Fix first run message
|
2014-04-01 18:25:46 +02:00 |
|
babelouest
|
3f26148233
|
implementing ldap addressbook modification (draft)
|
2014-04-01 09:16:53 -04:00 |
|
babelouest
|
a8e6ab0d33
|
change new addressbook ui for a dialog
implemented delete ldap addressbook
|
2014-03-29 01:22:52 -04:00 |
|
Thomas Tanghus
|
8368b128cd
|
Use p(), not echo
|
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
|
eb7c143718
|
More contact photo refactoring
|
2014-03-20 16:00:38 +01:00 |
|
Thomas Tanghus
|
05acb6e87a
|
Mostly done refactoring Photo controller
|
2014-03-20 01:55:57 +01:00 |
|
Thomas Tanghus
|
4c78e1fea0
|
Add title attribute to group element
|
2014-03-18 18:14:47 +01:00 |
|
Thomas Tanghus
|
868bf088b3
|
camelCase variables
|
2014-03-18 00:58:01 +01:00 |
|
babelouest
|
01d1b56bf5
|
change automatic value from -1 to automatic
|
2014-03-12 13:30:11 -04:00 |
|
babelouest
|
919f540d01
|
Import from multiple formats
|
2014-03-11 16:43:32 +01:00 |
|
Thomas Tanghus
|
45aa3198f7
|
More cleanups
|
2014-03-09 15:03:29 +01:00 |
|
Thomas Tanghus
|
3481235e63
|
Use core icons
|
2014-03-05 13:07:01 +01:00 |
|
Thomas Tanghus
|
3e2f508975
|
Cleanup contact actions. Close #377
|
2014-03-04 21:56:46 +01:00 |
|
Thomas Tanghus
|
24be2e4107
|
Don't show group/addressbook selects if there's only one.
|
2014-03-04 05:03:21 +01:00 |
|
Thomas Tanghus
|
1861231dab
|
Add missing icon class
|
2014-03-04 02:41:47 +01:00 |
|
Thomas Tanghus
|
ad15cb6471
|
Remove unneeded icon class
|
2014-02-27 18:21:34 +01:00 |
|
Thomas Tanghus
|
e6c1937597
|
Pixel push phototools. Refs. #406. Fix #265
|
2014-02-27 13:34:25 +01:00 |
|
Thomas Tanghus
|
394d15350e
|
Remove use of %webroot%. Closes #406
|
2014-02-26 23:23:01 +01:00 |
|
jbtbnl
|
c835daf184
|
Fix for #416.
|
2014-02-14 18:08:08 +01:00 |
|
Jan ten Bokkel
|
92acee747a
|
Removed unnecessary cancel button when creating a new contact.
|
2014-01-08 16:49:54 +01:00 |
|
Jan ten Bokkel
|
6f8331d244
|
Removed unnecessary tipsy pop-ups, fixes owncloud/#271.
|
2014-01-03 13:00:32 +01:00 |
|
Jan
|
1c7ccfdc92
|
Larger clickable space for checkboxes. Possibly fixes owncloud/#326.
|
2014-01-02 13:51:13 +01:00 |
|
Jan
|
ea58df34a4
|
Revert "Larger clickable space for checkboxes. Possibly fixes owncloud/#327."
This reverts commit 174105e44d .
|
2014-01-02 13:49:22 +01:00 |
|
Jan ten Bokkel
|
174105e44d
|
Larger clickable space for checkboxes. Possibly fixes owncloud/#327.
|
2014-01-02 13:46:04 +01:00 |
|
Jan ten Bokkel
|
a00e0a030b
|
Fixed merge and groups icon. Fixed add address book icon. CSS fixes for Firefox.
|
2013-12-31 12:06:12 +01:00 |
|
Jan ten Bokkel
|
0986453a0b
|
Fixed Firefox specific issue with select box.
|
2013-12-23 16:10:33 +01:00 |
|
Jan ten Bokkel
|
425c8b0c49
|
Move add-contact and add-group buttons back to menu.
|
2013-12-18 16:59:39 +01:00 |
|