Björn Schießle
|
c2a49b5c1f
|
the old path no longer exists after rename, update the parent folder instead
|
2013-03-25 14:21:06 +01:00 |
Arthur Schiwon
|
8b3dd87846
|
LDAP: fix wrong return value
|
2013-03-25 12:33:10 +01:00 |
Björn Schießle
|
abd48496d2
|
fix indention
|
2013-03-25 12:33:03 +01:00 |
Björn Schießle
|
102120f105
|
skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares
|
2013-03-25 12:32:56 +01:00 |
Björn Schießle
|
5924d1d95c
|
add backticks around table names
|
2013-03-25 12:29:13 +01:00 |
Jenkins for ownCloud
|
4f6e13e673
|
[tx-robot] updated from transifex
|
2013-03-23 00:06:16 +01:00 |
Jenkins for ownCloud
|
3b1c7de459
|
[tx-robot] updated from transifex
|
2013-03-21 00:04:36 +01:00 |
Björn Schießle
|
b91bcf5f60
|
Merge pull request #2324 from owncloud/html_video_tag
use html video tag to preview videos for public shares
|
2013-03-20 02:27:53 -07:00 |
Jenkins for ownCloud
|
63e3f978ab
|
[tx-robot] updated from transifex
|
2013-03-20 00:02:44 +01:00 |
Arthur Schiwon
|
aa3973d365
|
LDAP: user exists check on getHome, otherwise check will be performed with wrong configs on a multi LDAP server setup.
|
2013-03-19 14:40:36 +01:00 |
Arthur Schiwon
|
0f4e02b6fc
|
LDAP: avoid irritating log output
|
2013-03-19 14:40:30 +01:00 |
Arthur Schiwon
|
50d0f48ee4
|
LDAP: check whether user exists for before trying to determine displayname
|
2013-03-19 14:40:23 +01:00 |
Arthur Schiwon
|
18fccf6612
|
LDAP: check first whether group exists in this backend before doing other operations
|
2013-03-19 14:40:15 +01:00 |
Arthur Schiwon
|
504f5f229f
|
LDAP: remove unnecessary func call, was a leftover from earlier refactor
|
2013-03-19 14:40:05 +01:00 |
Arthur Schiwon
|
f38932fb80
|
LDAP: specify appid when selecting from appconfig
|
2013-03-19 14:39:56 +01:00 |
Jenkins for ownCloud
|
63ca84e7bc
|
[tx-robot] updated from transifex
|
2013-03-19 00:05:52 +01:00 |
Bernhard Posselt
|
5b1f857907
|
Merge pull request #2363 from owncloud/uploadsize
Improve behaviour when max upload size is unknown
|
2013-03-18 08:18:27 -07:00 |
Björn Schießle
|
4a1a23ce1b
|
add some error logs to the trash bin app
|
2013-03-18 12:08:34 +01:00 |
Jenkins for ownCloud
|
2a48aa322d
|
[tx-robot] updated from transifex
|
2013-03-18 00:06:55 +01:00 |
Jenkins for ownCloud
|
1427af4a22
|
[tx-robot] updated from transifex
|
2013-03-16 22:18:26 +01:00 |
sherbrecher
|
ec45a8433d
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
apps/files_external/templates/settings.php
|
2013-03-15 17:50:02 +01:00 |
Robin Appelman
|
319e3f162c
|
Don't block uploads if the max upload size is unknown
|
2013-03-15 16:40:36 +01:00 |
Robin Appelman
|
32b8fd8fb7
|
Improve handeling of unlimited max upload size
|
2013-03-15 16:31:35 +01:00 |
sherbrecher
|
d2b3a9fb3b
|
Update settings.php
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
|
2013-03-15 15:09:55 +01:00 |
Björn Schießle
|
418fb98c40
|
remove backticks around table names
|
2013-03-15 12:10:21 +01:00 |
Björn Schießle
|
e37e884d7a
|
add backtick for db queries to prevent postgresql errors
|
2013-03-15 12:10:07 +01:00 |
Björn Schießle
|
23fe98a562
|
Merge pull request #2336 from eMerzh/fix_trashpg
Add backtick for trash app to prevent pg errors
|
2013-03-15 03:17:54 -07:00 |
Frank Karlitschek
|
92a8676350
|
Merge pull request #2317 from owncloud/create_version_on_upload
create new version if the same file is uploaded again over the web interface
|
2013-03-15 01:18:20 -07:00 |
Jenkins for ownCloud
|
0c123ebf9d
|
[tx-robot] updated from transifex
|
2013-03-15 00:06:36 +01:00 |
Brice Maron
|
1631aa2434
|
Add backtick for trash app to prevent pg errors
|
2013-03-15 00:03:37 +01:00 |
Björn Schießle
|
285d328ef1
|
use html video tag to preview videos for public shares
|
2013-03-14 20:10:21 +01:00 |
Björn Schießle
|
f78594c0ae
|
fix var name
|
2013-03-14 17:09:48 +01:00 |
Björn Schießle
|
93b2ada6f6
|
fix var name
|
2013-03-14 17:08:16 +01:00 |
Björn Schießle
|
0cf50d63bf
|
create new version if the same file is uploaded again over the web interface
|
2013-03-14 16:47:59 +01:00 |
Jenkins for ownCloud
|
9a0cb2ccaa
|
[tx-robot] updated from transifex
|
2013-03-14 00:06:29 +01:00 |
Bernhard Posselt
|
7d748a6b06
|
Merge pull request #2277 from owncloud/fix_sharing_hooks
listen to the pre delete hook in the sharing app [master]
|
2013-03-13 10:15:57 -07:00 |
Björn Schießle
|
c3ba49f384
|
Merge pull request #2265 from owncloud/no_share_option_for_shared_folder
don't add share action to the Shared folder
|
2013-03-13 08:23:35 -07:00 |
Björn Schießle
|
30831b6b55
|
we need to listen to the pre delete hook, otherwise the file is already gone
|
2013-03-13 15:39:39 +01:00 |
Björn Schießle
|
e5f40ddaae
|
only prevent shared action for the Shared folder in the root dir
|
2013-03-13 11:33:20 +01:00 |
Jenkins for ownCloud
|
f3a2daaa9d
|
[tx-robot] updated from transifex
|
2013-03-13 00:06:21 +01:00 |
Frank Karlitschek
|
43d15066f9
|
Merge pull request #2234 from owncloud/fix_ldap_edirectory
LDAP: compatibility with Novell eDirectory UUID
|
2013-03-12 10:21:49 -07:00 |
Björn Schießle
|
b2da2f769a
|
don't add share action to the Shared folder
|
2013-03-12 17:28:36 +01:00 |
Jenkins for ownCloud
|
569c7ab138
|
[tx-robot] updated from transifex
|
2013-03-12 00:14:05 +01:00 |
Arthur Schiwon
|
1e07801c95
|
LDAP: compatibility with Novell eDirectory UUID
|
2013-03-11 13:30:06 +01:00 |
Bernhard Posselt
|
049a4df259
|
Merge pull request #1786 from owncloud/shared-folder-etags
Include etags for the root of the shared folder
|
2013-03-11 02:38:50 -07:00 |
Arthur Schiwon
|
07f88424c8
|
LDAP: fancy version for release, no code change
|
2013-03-10 18:34:56 +01:00 |
Lukas Reschke
|
3c06020e3e
|
Merge pull request #2217 from owncloud/mountconfig-location
Store the global mount configuration file in the datadir
|
2013-03-10 00:25:10 -08:00 |
Robin Appelman
|
be4806d031
|
Store the global mount configuration file in the datadir
|
2013-03-10 02:25:03 +01:00 |
Tom Needham
|
dfbf57207d
|
Merge pull request #1584 from owncloud/ocs_multiple_methods
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
|
2013-03-09 16:59:13 -08:00 |
Jenkins for ownCloud
|
6bdb84ab28
|
[tx-robot] updated from transifex
|
2013-03-10 00:06:53 +01:00 |