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

3575 commits

Author SHA1 Message Date
Bart Visscher
5e9f92e5dd Calendar: remove double html encoding 2012-08-24 14:54:17 +02:00
Bart Visscher
646bc1fc24 Contacts: Fix no active Addressbooks 2012-08-24 14:54:16 +02:00
Arthur Schiwon
2af7473651 LDAP: sanitize base, user and group trees. fixes oc-1302 2012-08-24 14:54:16 +02:00
Thomas Tanghus
46d6fd15e4 Implemented sharing api for CalDAV. 2012-08-24 14:26:06 +02:00
Thomas Tanghus
d1421ca5ab White-space. 2012-08-24 13:49:56 +02:00
Thomas Tanghus
b716296203 Forgot to reenable the export plugin. 2012-08-24 05:04:45 +02:00
Thomas Tanghus
953f9d95f8 Implemented sharing api for CardDAV. Next step CalDAV. 2012-08-24 04:56:21 +02:00
Jenkins for ownCloud
07a889631e [tx-robot] updated from transifex 2012-08-24 02:07:18 +02:00
Thomas Tanghus
2cffcfbc03 Permission checking for shared addressbooks/contacts. 2012-08-23 22:03:36 +02:00
Thomas Tanghus
f568ba9c8c Removed redundant __CLASS__ in logging. 2012-08-23 22:03:36 +02:00
Thomas Tanghus
fdb4c820d3 Fix for deleting queued contacts. 2012-08-23 22:03:35 +02:00
Thomas Tanghus
394617e0b6 Missing IM variable assignments. 2012-08-23 22:03:35 +02:00
Thomas Tanghus
069d16fdd4 Use correct js class in first-run template. 2012-08-23 22:03:35 +02:00
Thomas Tanghus
a3af9f4773 Used non-existing variable. 2012-08-23 22:03:35 +02:00
Thomas Tanghus
d5127b14be Return newly created addressbook. 2012-08-23 22:03:35 +02:00
Arthur Schiwon
d5c111a984 LDAP: identify (map) users with their directory UUID. Fixes the issue, that usernames for owncloud will change, when the DN changes (which happens rarely, but it happens). 2012-08-23 18:29:43 +02:00
Thomas Tanghus
2d97164f80 Limit styles so they don't interfere with sharing dropdown. 2012-08-23 05:02:30 +02:00
Thomas Tanghus
6941266e7b Remove obsolete closure. 2012-08-23 05:02:30 +02:00
Jenkins for ownCloud
082ed4ab71 [tx-robot] updated from transifex 2012-08-23 02:07:35 +02:00
Thomas Tanghus
99d17c5190 Don't add empty property parameters. 2012-08-23 01:18:59 +02:00
Thomas Tanghus
1df596e758 CSS fix for Windows. 2012-08-23 00:40:10 +02:00
Juan Carlos Cornejo
0944b4455b Moves the lastAction=null outside the if so it can include the undo requests from replace 2012-08-22 17:08:10 -04:00
Juan Carlos Cornejo
24a207a8fa Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented. 
Essentially, just set FileLists.lastAction = null when one clicks undo.
 2012-08-22 16:56:00 -04:00
Thomas Tanghus
61c7700ce6 Add support for IMPP properties. 2012-08-22 18:51:17 +02:00
Michael Gapczynski
885b8c481b Check if files_sharing app is enabled, move file specific javascript to files_sharing app 2012-08-22 12:32:07 -04:00
Michael Gapczynski
3debb67458 Move share CSS to core, add script and style from inside Share API 2012-08-22 11:57:58 -04:00
Michael Gapczynski
25d474579a Removing most of files_sharing, the Share API implemented the majority of it 2012-08-22 11:57:58 -04:00
Arthur Schiwon
536fbb9189 LDAP: fix potentially unavailable LDAP resource, which can prevent successful login 2012-08-22 15:22:52 +02:00
Arthur Schiwon
63c454c7b2 LDAP: make refreshInterval for background jobs configurable in the DB 2012-08-22 12:44:46 +02:00
Arthur Schiwon
056d9adb23 LDAP: bg jobs: sane default refresh interval 2012-08-22 12:44:46 +02:00
Arthur Schiwon
c48732987e LDAP: permanantly watch group members. Emit post_addToGroup resp. post_removeFromGroup on membership changes, so that Sharing App can take care of files shared within the groups. Requires and relies on background jobs. 2012-08-22 12:44:46 +02:00
Arthur Schiwon
2b8a2e16ed LDAP: don't pass -1 as length to array slice, when no limit is given. It cuts off the last item. 2012-08-22 12:44:46 +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
Michael Gapczynski
53350b2f19 Remove unnecessary file 2012-08-21 10:33:20 -04:00
Frank Karlitschek
1cfa831239 A first basic presentation app based on the amazing impress.js. 
You have to put a presentation file that contains the presentation defined in html into your ownCloud with the file extension .impress
Then you can use this app to play it. It also contains a demo presentation that you can use to learn.
Help is welcome to improve this app. :-)
 2012-08-21 14:44:23 +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
Michael Gapczynski
68f5dc2a44 Remove unnecessary files 2012-08-20 21:22:23 -04: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
Arthur Schiwon
ef3eebfd3e Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534. 2012-08-20 17:24:10 +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
Robin Appelman
a4e840f4f1 improve hasUpdated for archive storage backend 2012-08-19 06:29:57 +02:00
Robin Appelman
758ebe0446 don't report ctime in the archive storage backend since it isn't reliable 2012-08-19 06:18:40 +02:00
Robin Appelman
7f6a037b8c small fix for normalizing paths in archives 2012-08-19 06:15:33 +02:00
Robin Appelman
808d6c58fe ensure proper result format when using opendir on the archive storage backend 2012-08-19 05:45:55 +02:00
Robin Appelman
2ea46ee1ca better file_get_contents, file_put_contents and toTmpFile for archive storage backend 2012-08-19 05:05:55 +02:00
Lukas Reschke
d54390b1a0 Optimized image size 2012-08-18 13:56:04 +02:00
Lukas Reschke
6ef5edf5ea Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde. 2012-08-18 09:30:01 +02:00
Jenkins for ownCloud
f1cabdd8e0 [tx-robot] updated from transifex 2012-08-18 02:04:07 +02:00
Georg Ehrke
41639f0517 fix fail in sql query of isDuplicate method of OC_Calendar_Import 2012-08-17 21:29:26 +02:00
Georg Ehrke
44272b9889 increase margin top of calendar import's color picker 2012-08-17 20:48:47 +02:00
Robin Appelman
53a888cc81 more path normalization 2012-08-17 01:22:54 +02:00
Jenkins for ownCloud
70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Michael Gapczynski
df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04: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
Bart Visscher
dd3208fe6f Fix webfinger documentation 2012-08-15 14:50:25 +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
Arthur Schiwon
62e4f55f72 LDAP: adjust usersInGroup to updated interface 2012-08-14 14:30:03 +02:00
Arthur Schiwon
3c1380b093 LDAP: adjust getGroups to updated interface 2012-08-14 14:22:05 +02:00
Arthur Schiwon
452f55e163 adjust LDAP to updated interface 2012-08-14 14:14:20 +02:00
Jenkins for ownCloud
19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Michael Gapczynski
830676b475 Improve usability for configuring Dropbox and Google Drive external storage 2012-08-13 17:10:58 -04:00
Michael Gapczynski
d3bdab286b Suggest mount point name, don't reload custom javascript file 2012-08-13 17:10:58 -04:00
Michael Gapczynski
98c7d40fcd Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct 2012-08-13 17:10:58 -04:00
Michael Gapczynski
7f12a65c24 Show access granted label immediately after granting access 2012-08-13 17:10:58 -04:00
Michael Gapczynski
0e6d22e25f Prevent editing Dropbox configuration input after access granted 2012-08-13 17:10:58 -04:00
Michael Gapczynski
b6b2f8826b Show access granted label next to Google Drive and Dropbox storage in configuration 2012-08-13 17:10:58 -04:00
Michael Gapczynski
be32625fcc Fix remove button display for external storage 2012-08-13 17:10:58 -04:00
Thomas Mueller
53f117c01a l10n directories have been missing 2012-08-13 23:10:10 +02:00
Thomas Tanghus
d303763d1f Automatically check radio when new addressbook fields get focus. 2012-08-13 15:07:15 +02:00
Bart Visscher
758f476fe3 Calendar: remove not used style rules 2012-08-12 22:40:36 +02:00
Bart Visscher
73b1b68fff Rewrite remoteStorage settings, remove block echo 2012-08-12 22:30:13 +02:00
Bart Visscher
ab8e7f1da3 Remove unused gallery template 2012-08-12 22:30:13 +02:00
Bart Visscher
cb71996008 Change image links to use imagePath function 2012-08-12 22:30:13 +02:00
Thomas Tanghus
329bc28d06 Commented out unused(?) class that interfered with appsettings. 2012-08-12 18:44:18 +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
Lukas Reschke
5b16c7a25d This is unnessecary because we already run htmlentities() over the template engine 2012-08-11 20:53:56 +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
fb493c45dd Calendar: update share backend using contacts backend as template 2012-08-10 14:40:48 +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
Lukas Reschke
e73292339f Check if webfinger is enabled 2012-08-10 10:01:56 +02:00
Thomas Tanghus
2c5ab91c7d Used wrong class. 2012-08-10 01:39:05 +02:00
Lukas Reschke
2dfc485149 XSRF checks 2012-08-10 00:44:35 +02:00
Thomas Tanghus
26a9d7ea71 Fixed 3 - THREE - errors in one method call :-P 2012-08-09 23:16:07 +02:00
Lukas Reschke
5f51366435 Sanitzing user input 2012-08-09 22:14:09 +02:00
Arthur Schiwon
7780e37f38 LDAP: don't give Test Connection button red background on fail, it is becoming unreadable 2012-08-09 21:42:35 +02:00
Michael Gapczynski
3b13051f7a Additional permission checks for editing and deleting contacts 2012-08-09 13:54:59 -04:00
Georg Ehrke
7955120aed remove debug code from calendar - thanks michael for pointing that out :) 2012-08-09 17:39:16 +02: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
Georg Ehrke
00d7ae8319 move calendar settings from personal settings to in app settings 2012-08-09 12:37:26 +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
Bart Visscher
10cfcd4ff0 Remove useless setting of RUNTIME_NOAPPS 2012-08-08 22:42:50 +02:00
Bart Visscher
7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Michael Gapczynski
05648dac61 Don't return file handle if the mode supports writing and the file is not writable 2012-08-08 11:25:24 -04:00
Bart Visscher
35a1738a39 Use new sharing API in OC_Calendar_Share::allSharedwithuser 2012-08-07 23:31:06 +02:00
Bart Visscher
1e644b5a53 Add Event share backend 2012-08-07 23:27:06 +02:00
Michael Gapczynski
9580d0ef29 Initial calendar sharing backend 2012-08-07 14:57:52 -04:00
Bart Visscher
95031cb139 remoteStorage: Use OCP\\Util for redirecting for login and generating link 2012-08-07 20:43:00 +02:00
Bart Visscher
4e6b4b265b remoteStorage: split auth allow template 2012-08-07 20:43:00 +02: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
de7f48b050 Check if New and Upload buttons exist before adding their width to the total breadcrumbs width 2012-08-06 17:37:10 -04:00
Michael Gapczynski
7c0a5d4a59 Check if New and Upload buttons exist before adding their width to the total breadcrumbs width 2012-08-06 17:35:22 -04: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
83117445ac Fix offset for folder detection, no longer including '/Shared' in file target path 2012-08-06 14:33:47 -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
Michael Gapczynski
ba0cf98175 Remove extra line, caused 'headers already sent' issues 2012-08-06 13:33:53 -04:00
Bart Visscher
fe6450002d Change hardcoded urls to use linkTo function 2012-08-06 18:51:41 +02:00
Michael Gapczynski
3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Arthur Schiwon
e6759a980b LDAP: layout settings form. Hope it is now a bit clearer and prettier. 2012-08-06 17:25:59 +02:00
Jenkins for ownCloud
9ca8d20a99 [tx-robot] updated from transifex 2012-08-06 02:02:50 +02:00
Arthur Schiwon
95c33e466c LDAP: offer option to disable SSL certificate checks. Works around problems with self-signed certificates, for example. However, the best and right way to solve it is always to import the LDAP server cert to the owncloud server, so you it for testing only. 
Like to hear wether it works, instead appending LDAPTLS_REQCERT=never to ldap.conf.
 2012-08-05 23:00:47 +02:00
Arthur Schiwon
6fd48675e6 remove accidentally added blank lines 2012-08-05 22:03:47 +02:00
Arthur Schiwon
c10010e410 LDAP: check for always available attribute on userExists, fixes oc-1440 2012-08-05 22:02:34 +02:00
Arthur Schiwon
c3cbb463e3 add missing \ 2012-08-05 21:35:37 +02:00
Arthur Schiwon
d546718179 LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302 2012-08-05 21:28:59 +02:00
Thomas Tanghus
80ca883d4c Correct path to ajax file. 2012-08-05 03:36:16 +02:00
Michael Gapczynski
002ad4ba16 Tweak users delete notification 2012-08-04 16:44:26 -04:00
Michael Gapczynski
086397d8a1 Fix condition checking for resizing breadcrumbs 2012-08-04 15:57:49 -04:00
Michael Gapczynski
207ca3ec06 Dynamically resize breadcrumbs, fix for bug oc-468 2012-08-04 15:50:32 -04:00
Georg Ehrke
da4057ecfd fix label for versioning in admin settings 2012-08-04 18:51:09 +02:00
Jenkins for ownCloud
d7e77f6426 [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Thomas Tanghus
bef63527ce Reorganize ajax scripts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
3610975bc1 Some fixes for keyboard shortcuts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
e3de746bb6 FF complained about missing charset. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
578e074c00 White space. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
98057dba5b Revert "Removed text/plain header." 
This reverts commit fa6d26b53c.
 2012-08-03 21:32:27 +02:00
Michael Gapczynski
09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Bart Visscher
b12ed88794 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Bart Visscher
599741bdd6 audit: update appinfo to OC4 2012-08-03 16:05:48 +02:00
Bart Visscher
e36e00dc00 Merge branch 'chunked_upload' 2012-08-03 15:58:17 +02:00
Jenkins for ownCloud
7dc799c167 [tx-robot] updated from transifex 2012-08-03 02:04:12 +02:00
Thomas Tanghus
7dda5527f1 Return properly formatted jsondata. 2012-08-02 19:03:45 +02:00
Thomas Tanghus
d07f4a5ea8 Correct namespace usage. 2012-08-02 19:03:06 +02:00
Thomas Tanghus
40d2bb70d7 Remove logging 2012-08-02 19:01:55 +02:00
Thomas Tanghus
8f3357c305 I was a bit too fast in removing methods yesterday... 2012-08-02 18:57:03 +02:00
Thomas Tanghus
a484ee817c If first addressbook was empty it was seen as if there where no contacts at all. 2012-08-02 18:50:20 +02:00
Thomas Tanghus
a1239a37aa Line length... 2012-08-02 05:02:36 +02:00
Thomas Tanghus
30c3a783d9 Remove onunload handler when delete is cancelled. 2012-08-02 05:01:54 +02:00
Thomas Tanghus
20f8971222 Use popup class style for ninja-mode help. 2012-08-02 04:18:44 +02:00
Thomas Tanghus
f84e92e6e3 More files to delete \o/ 2012-08-02 04:18:44 +02:00
Thomas Tanghus
937058cdec Updated JS namespace. 2012-08-02 04:18:44 +02:00
Jenkins for ownCloud
91e828c6ce [tx-robot] updated from transifex 2012-08-02 02:06:16 +02:00
Thomas Tanghus
f159f607de And then the missing files ;) 2012-08-02 00:02:07 +02:00
Thomas Tanghus
a8faae4f42 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
Jörn Friedrich Dreyer
e13f381189 add limit support to OC_DB & OCP/DB 2012-08-01 14:59:08 +02:00
Jenkins for ownCloud
274d1ef87f [tx-robot] updated from transifex 2012-08-01 02:02:35 +02:00
Jenkins for ownCloud
36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
jfd
3aff7a298c use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want) 2012-07-31 19:00:54 +02:00
jfd
727f4357fb remove superflous index (already indexed with primary key derived from <autoincrement> by MDB2), oracle will bark on this 2012-07-31 18:54:24 +02:00
jfd
ede464f058 escape all identifiers with backticks 2012-07-31 18:53:05 +02:00
Thomas Tanghus
5eed59bd54 Changed fix parameter to OC.appSettings(). 2012-07-31 14:18:32 +02:00
Thomas Tanghus
90a1b5a758 Unregister from personal settings. 2012-07-31 12:23:22 +02:00
Thomas Tanghus
19c55e2d44 Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
Michael Gapczynski
dfae77dec1 Add notifications and undo support for replacing files when renaming 2012-07-30 12:22:11 -04:00
Arthur Schiwon
b465fc84ae LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:42:33 +02:00
Arthur Schiwon
b523366acd LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:30:11 +02:00
Michael Gapczynski
29dab0846e Remove another accidently added 3rdparty app 2012-07-30 10:37:54 -04:00
Michael Gapczynski
530e7f03cd Remove accidently added 3rd party apps 2012-07-30 10:34:12 -04:00
Michael Gapczynski
b9bd54bd98 Add additional error handling for emailing private links 2012-07-30 10:07:20 -04:00
Michael Gapczynski
dab708b625 Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270' 2012-07-30 10:07:20 -04:00
Michael Gapczynski
519eb39422 Remove delete tipsy if file is deleted, fixes bug oc-958 2012-07-30 10:07:19 -04:00
Michael Gapczynski
3e183b2eea Set filter to empty if not set by Ampache client 
Conflicts:
	apps/media/lib_ampache.php
 2012-07-30 10:07:19 -04:00
Michael Gapczynski
d07b8448d1 Set the user id when authenticating user for Ampache, fixes bug oc-219 2012-07-30 10:07:19 -04:00
Michael Gapczynski
7d17c59a51 Fix group detection for sharing in case username contains '@', fix for oc-1270 2012-07-30 10:07:19 -04:00
Michael Gapczynski
f378415377 Only call mkdir() if the root folder does not exist for FTP external storage 2012-07-30 10:07:19 -04:00
Michael Gapczynski
f328f53ec1 Fix filesystem hash, no longer using basicOperation() 
Conflicts:
	lib/filesystemview.php
 2012-07-30 10:07:19 -04:00
Thomas Tanghus
01f25119d5 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-07-30 12:28:40 +02:00
Thomas Tanghus
f91783e9ab Fix errors when no addressbook. 2012-07-30 12:28:10 +02:00
Thomas Tanghus
fa62ff62d2 Remove deprecated code. 2012-07-30 05:31:48 +02:00
Thomas Tanghus
d614c3b1d5 Code style. 2012-07-30 05:31:06 +02:00
Thomas Tanghus
118d9e17b6 Check if the are contacts marked as deleted and warn if so. 2012-07-30 04:57:14 +02:00
Thomas Tanghus
b25b73b5b4 Fixed potential error in logging. 2012-07-30 04:57:14 +02:00
Thomas Tanghus
fa6d26b53c Removed text/plain header. 2012-07-30 04:57:14 +02:00
Jenkins for ownCloud
3430dcd367 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00