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 |
Michael Gapczynski
|
5262cde6a6
|
Add additional error handling for emailing private links
|
2012-07-29 18:02:09 -04:00 |
Michael Gapczynski
|
e18639551d
|
Tweak appearance of undo delete notification
|
2012-07-29 18:02:08 -04:00 |
Jenkins for ownCloud
|
18f6552a08
|
[tx-robot] updated from transifex
|
2012-07-29 02:06:29 +02:00 |
Michael Gapczynski
|
7ff04be091
|
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
|
2012-07-28 11:06:36 -04:00 |
Michael Gapczynski
|
e02d8d7f7e
|
Remove delete tipsy if file is deleted, fixes bug oc-958
|
2012-07-27 21:28:41 -04:00 |
Jenkins for ownCloud
|
fa4052d6f1
|
[tx-robot] updated from transifex
|
2012-07-28 02:05:38 +02:00 |
Michael Gapczynski
|
dd4765ad16
|
Set filter to empty if not set by Ampache client
|
2012-07-27 18:10:40 -04:00 |
Michael Gapczynski
|
6a4c46e2c2
|
Set the user id when authenticating user for Ampache, fixes bug oc-219
|
2012-07-27 18:05:18 -04:00 |
Michael Gapczynski
|
df9f5b902a
|
Fix group detection for sharing in case username contains '@', fix for oc-1270
|
2012-07-27 15:34:51 -04:00 |
Bart Visscher
|
896d27de36
|
Chunked upload: Support reusing local chunks
|
2012-07-27 19:35:33 +02:00 |
Michael Gapczynski
|
48f33be848
|
Only call mkdir() if the root folder does not exist for FTP external storage
|
2012-07-27 12:32:03 -04:00 |
Georg Ehrke
|
bccd372565
|
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
|
2012-07-27 14:17:55 +02:00 |
Michael Gapczynski
|
cb21406e18
|
Implement CRUDS in share dropdown, and some clean-up
|
2012-07-26 21:56:22 -04:00 |
Jenkins for ownCloud
|
0a9c33e151
|
[tx-robot] updated from transifex
|
2012-07-27 02:04:26 +02:00 |
Georg Ehrke
|
d8aca0c78e
|
apply fix suggested in oc-1132 - bugfix for oc-1132
|
2012-07-26 18:40:12 +02:00 |
Arthur Schiwon
|
6fbed6a588
|
LDAP: add Test Configuration functionality in the settings
|
2012-07-26 18:11:12 +02:00 |
Arthur Schiwon
|
6c92a85d49
|
LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced.
|
2012-07-26 16:11:32 +02:00 |
Arthur Schiwon
|
e0121ea75e
|
LDAP: some cleanup
|
2012-07-26 16:11:32 +02:00 |
Arthur Schiwon
|
b893aa9567
|
code style
|
2012-07-26 16:11:32 +02:00 |
Georg Ehrke
|
8cff0d997f
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:48:00 +02:00 |
Georg Ehrke
|
f7155b4276
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:46:03 +02:00 |
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
Lukas Reschke
|
efbd7ca166
|
Updated packages
|
2012-07-26 01:16:22 +02:00 |
Lukas Reschke
|
95936024bc
|
Updated packages
|
2012-07-26 01:12:58 +02:00 |
Michael Gapczynski
|
add8f09355
|
No longer need hash() in shared storage, already implemented by the common file storage
|
2012-07-25 17:13:48 -04:00 |
Michael Gapczynski
|
30b58f5677
|
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
|
2012-07-25 17:08:18 -04:00 |
Michael Gapczynski
|
f25ccaff59
|
Fix filesystem hash, no longer using basicOperation()
|
2012-07-25 16:55:01 -04:00 |
Michael Gapczynski
|
4d17ed2f71
|
Make file actions permissions aware
|
2012-07-25 16:33:08 -04:00 |
Jenkins for ownCloud
|
37bccf54f2
|
[tx-robot] updated from transifex
|
2012-07-25 22:15:24 +02:00 |
Arthur Schiwon
|
b94631de0c
|
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
|
2012-07-25 18:40:48 +02:00 |
Arthur Schiwon
|
3c9919e475
|
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
|
2012-07-25 18:21:16 +02:00 |
Bart Visscher
|
d17eb2983f
|
OpenID: fix include path
|
2012-07-25 17:45:59 +02:00 |
Georg Ehrke
|
9b0870bb91
|
add some calendar sharing hooks in stable4 - bugfix for oc-1325
|
2012-07-25 17:02:24 +02:00 |
Arthur Schiwon
|
71b862e571
|
LDAP: replace deprecated constant
|
2012-07-25 15:11:58 +02:00 |
Arthur Schiwon
|
4a2295b75b
|
code style
|
2012-07-25 15:10:56 +02:00 |
Arthur Schiwon
|
6285cc2604
|
LDAP: remove debug output
|
2012-07-25 13:19:07 +02:00 |
Arthur Schiwon
|
ab1d9507a9
|
code style
|
2012-07-25 13:18:31 +02:00 |
Arthur Schiwon
|
edfd789a87
|
LDAP: remove obsolete require_once
|
2012-07-25 13:16:31 +02:00 |
Arthur Schiwon
|
8664729843
|
code style
|
2012-07-25 13:14:32 +02:00 |
Arthur Schiwon
|
15f7d838fa
|
code style
|
2012-07-25 13:13:01 +02:00 |
Arthur Schiwon
|
569e52b87c
|
remove unnecessary debug output
|
2012-07-25 13:11:42 +02:00 |
Arthur Schiwon
|
c8404a7bfa
|
code style
|
2012-07-25 13:10:59 +02:00 |
Arthur Schiwon
|
92f447ca50
|
code style
|
2012-07-25 13:09:51 +02:00 |
Arthur Schiwon
|
a6c5309e16
|
LDAP: adjust test after refactoring
|
2012-07-25 12:56:09 +02:00 |
Arthur Schiwon
|
b10f7aafb7
|
LDAP: silence warning, but handle the error
|
2012-07-25 12:56:09 +02:00 |
Arthur Schiwon
|
25ad1d5c3e
|
LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly.
|
2012-07-25 12:56:09 +02:00 |
Arthur Schiwon
|
d0aebf05bf
|
LDAP: group backend now implements the interface, does not inherit backend class
|
2012-07-25 12:56:08 +02:00 |
Arthur Schiwon
|
42492338fc
|
LDAP: put app under the OCA\user_ldap\ namespace
|
2012-07-25 12:56:08 +02:00 |
Arthur Schiwon
|
5888cb48b6
|
Support for OCA namespace
|
2012-07-25 12:56:08 +02:00 |