wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6011 commits 157 branches 562 tags 714 MiB
Commit graph

754 commits

Author SHA1 Message Date
Thomas Tanghus
61c7700ce6 Add support for IMPP properties. 2012-08-22 18:51:17 +02:00
Thomas Tanghus
ac9fd79329 Email type list wasn't initialized. 2012-08-22 12:40:35 +02:00
Thomas Tanghus
78b7e28ce0 Removed unused variable. 2012-08-22 12:40:35 +02:00
Thomas Tanghus
5c1dd82998 Minor layout change. 2012-08-22 12:40:35 +02:00
Jenkins for ownCloud
e6d87b2c4b [tx-robot] updated from transifex 2012-08-22 02:08:16 +02:00
Thomas Tanghus
25dd0e940f Preliminary support for Apple X-ABLabel. Also for oc-1508. 2012-08-21 03:57:48 +02:00
Thomas Tanghus
8d38dc04a0 Remove class contactsection 2012-08-21 03:57:48 +02:00
Jenkins for ownCloud
b819aa33f7 [tx-robot] updated from transifex 2012-08-21 02:09:12 +02:00
Thomas Tanghus
1e42cd162e Added types to emails. Support for custom types. Partial fix for oc-1508. 2012-08-21 00:20:18 +02:00
Thomas Tanghus
719ae155db Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Michael Gapczynski
82d81e8d39 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
f893d21660 [tx-robot] updated from transifex 2012-08-20 02:03:51 +02:00
Jenkins for ownCloud
36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Thomas Tanghus
2d3ec5cb4b Removed stray img element. 2012-08-19 17:05:45 +02:00
Thomas Tanghus
4946e23bdc Strip slashes from commas and semi-colons. 2012-08-19 16:32:32 +02:00
Lukas Reschke
d54390b1a0 Optimized image size 2012-08-18 13:56:04 +02:00
Jenkins for ownCloud
f1cabdd8e0 [tx-robot] updated from transifex 2012-08-18 02:04:07 +02:00
Jenkins for ownCloud
70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Jenkins for ownCloud
1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Thomas Tanghus
4c638f101e Merge addressbooks. 2012-08-16 00:25:32 +02:00
Jenkins for ownCloud
da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Thomas Tanghus
a75870489c Use correct class. 2012-08-14 20:06:45 +02:00
Lukas Reschke
db5b995a6b Disable user enumeration 2012-08-14 17:23:26 +02:00
Michael Gapczynski
4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Jenkins for ownCloud
19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Thomas Tanghus
d303763d1f Automatically check radio when new addressbook fields get focus. 2012-08-13 15:07:15 +02:00
Bart Visscher
cb71996008 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Thomas Tanghus
7113e80184 Readded refresh param. 304 and ETag is still sent so shouldn't matter. 2012-08-12 17:30:09 +02:00
Jenkins for ownCloud
355a1adb3a [tx-robot] updated from transifex 2012-08-12 02:04:58 +02:00
Jenkins for ownCloud
39b9052c2f [tx-robot] updated from transifex 2012-08-11 02:05:58 +02:00
Lukas Reschke
d3427be5e4 Following the code guidelines makes Michael happy :-) 2012-08-10 22:20:32 +02:00
Lukas Reschke
85f2e737a4 Disable listening, instead checking the ACL to prevent DoS 2012-08-10 22:18:08 +02:00
Lukas Reschke
11895a86b0 Activate ACLs 2012-08-10 22:02:04 +02:00
Bart Visscher
6a95e4288e Contacts: Check format parameter 2012-08-10 14:40:43 +02:00
Bart Visscher
6d971d3b1d Contacts: Better parameter names in addressbook share backend 2012-08-10 14:32:54 +02:00
Thomas Tanghus
2c5ab91c7d Used wrong class. 2012-08-10 01:39:05 +02:00
Thomas Tanghus
26a9d7ea71 Fixed 3 - THREE - errors in one method call :-P 2012-08-09 23:16:07 +02:00
Michael Gapczynski
3b13051f7a Additional permission checks for editing and deleting contacts 2012-08-09 13:54:59 -04:00
Michael Gapczynski
78cd1153f0 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
 2012-08-09 11:38:22 -04:00
Thomas Tanghus
f9cec1426f Change parameter name and update docs. 2012-08-09 17:04:14 +02:00
Thomas Tanghus
39814edf81 Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
Thomas Tanghus
d24582503a Fix require statements. Fix for oc-1460. 2012-08-09 11:35:14 +02:00
Michael Gapczynski
b830b3e24b Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski
f4285a25ef Don't include shared addressbook if source not found 2012-08-08 19:12:59 -04:00
Jenkins for ownCloud
a9f894ce11 [tx-robot] updated from transifex 2012-08-07 02:07:50 +02:00
Thomas Tanghus
2eac79b782 Some UI improvements on the addressbooks settings. 2012-08-07 00:06:18 +02:00
Michael Gapczynski
3be4f5f2f1 Sharing backends for contacts and addressbooks 2012-08-06 16:11:03 -04:00
Michael Gapczynski
14d13a740f Load icons for addressbooks, fix statuses for types other than files 2012-08-06 15:24:08 -04:00
Michael Gapczynski
03d65af5dc Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible 2012-08-06 15:09:01 -04:00
Michael Gapczynski
ea23854328 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00