Vincent Petry
c3c6e64027
Import legacy share dialog code
...
This will make the share dialog work as before
2015-09-28 10:46:45 +02:00
Thomas Müller
663f9a4eaa
Merge pull request #775 from owncloud/noglobal
...
Dont load scripts in other apps like news
2015-07-01 17:14:00 +02:00
Bjoern Schiessle
e0d0755998
allow user to add federated cloud ID to addressbook
2015-06-23 17:46:07 +02:00
Bjoern Schiessle
ceac26931b
fix closing div
2015-06-17 10:02:37 +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
jbtbnl
0190af8529
Fixes Contacts app not loading with latest master
2015-01-16 12:38:09 +01:00
Bernhard Posselt
44736ec035
dont load scripts in other apps
2015-01-14 16:21:06 +01:00
LEDfan
67281815b8
Remove uneeded files and lines
2014-12-05 08:28:40 +01:00
LEDfan
be111f3cab
Use correct combobox
2014-12-05 08:28:18 +01:00
jbtbnl
d8714363fb
Fix for TravisCI: Errors parsPHP Parse error: syntax error, unexpected
...
'[' in /home/travis/build/owncloud/contacts/templates/contacts.php on
line 4
2014-11-18 13:02:08 +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
ea7e3b4844
Load resources from template using script() and style() functions.
2014-11-08 16:35:22 +01:00
Volkan Gezer
f1065084d8
Fix typo
2014-09-16 19:27:41 +02:00
Jan ten Bokkel
8654fe0aba
Improve import dialog styling
2014-08-28 16:49:53 +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
babelouest
378ab9eb37
Change label when there is no contact
2014-07-27 18:40:25 -04:00
Volkan Gezer
f21fcf3460
forgotten translation tag
2014-05-19 15:17:32 +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
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
