Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2324 from owncloud/html_video_tag | Björn Schießle | 2013-03-20 | 1 | -1/+8 |
|\ | | | | | use html video tag to preview videos for public shares | ||||
| * | use html video tag to preview videos for public shares | Björn Schießle | 2013-03-14 | 1 | -1/+8 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-20 | 4 | -4/+20 |
| | | |||||
* | | LDAP: user exists check on getHome, otherwise check will be performed with ↵ | Arthur Schiwon | 2013-03-19 | 1 | -0/+5 |
| | | | | | | | | wrong configs on a multi LDAP server setup. | ||||
* | | LDAP: avoid irritating log output | Arthur Schiwon | 2013-03-19 | 1 | -1/+4 |
| | | |||||
* | | LDAP: check whether user exists for before trying to determine displayname | Arthur Schiwon | 2013-03-19 | 1 | -0/+4 |
| | | |||||
* | | LDAP: check first whether group exists in this backend before doing other ↵ | Arthur Schiwon | 2013-03-19 | 1 | -0/+9 |
| | | | | | | | | operations | ||||
* | | LDAP: remove unnecessary func call, was a leftover from earlier refactor | Arthur Schiwon | 2013-03-19 | 1 | -1/+0 |
| | | |||||
* | | LDAP: specify appid when selecting from appconfig | Arthur Schiwon | 2013-03-19 | 1 | -1/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-19 | 3 | -1/+9 |
| | | |||||
* | | Merge pull request #2363 from owncloud/uploadsize | Bernhard Posselt | 2013-03-18 | 2 | -1/+3 |
|\ \ | | | | | | | Improve behaviour when max upload size is unknown | ||||
| * | | Don't block uploads if the max upload size is unknown | Robin Appelman | 2013-03-15 | 1 | -0/+2 |
| | | | |||||
| * | | Improve handeling of unlimited max upload size | Robin Appelman | 2013-03-15 | 1 | -1/+1 |
| | | | |||||
* | | | add some error logs to the trash bin app | Björn Schießle | 2013-03-18 | 2 | -0/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-18 | 3 | -1/+56 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-16 | 6 | -2/+56 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' | sherbrecher | 2013-03-15 | 643 | -5393/+44385 |
|\| | | | | | | | | | | | | | | Conflicts: apps/files_external/templates/settings.php | ||||
| * | | remove backticks around table names | Björn Schießle | 2013-03-15 | 1 | -3/+3 |
| | | | |||||
| * | | add backtick for db queries to prevent postgresql errors | Björn Schießle | 2013-03-15 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #2336 from eMerzh/fix_trashpg | Björn Schießle | 2013-03-15 | 2 | -12/+12 |
| |\ \ | | | | | | | | | Add backtick for trash app to prevent pg errors | ||||
| | * | | Add backtick for trash app to prevent pg errors | Brice Maron | 2013-03-15 | 2 | -12/+12 |
| | |/ | |||||
| * | | Merge pull request #2317 from owncloud/create_version_on_upload | Frank Karlitschek | 2013-03-15 | 1 | -3/+10 |
| |\ \ | | | | | | | | | create new version if the same file is uploaded again over the web interface | ||||
| | * | | fix var name | Björn Schießle | 2013-03-14 | 1 | -2/+2 |
| | | | | |||||
| | * | | fix var name | Björn Schießle | 2013-03-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | create new version if the same file is uploaded again over the web interface | Björn Schießle | 2013-03-14 | 1 | -3/+10 |
| | |/ | |||||
| * / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-15 | 11 | -4/+39 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-14 | 7 | -0/+31 |
| | | |||||
| * | Merge pull request #2277 from owncloud/fix_sharing_hooks | Bernhard Posselt | 2013-03-13 | 1 | -1/+1 |
| |\ | | | | | | | listen to the pre delete hook in the sharing app [master] | ||||
| | * | we need to listen to the pre delete hook, otherwise the file is already gone | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2265 from owncloud/no_share_option_for_shared_folder | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | don't add share action to the Shared folder | ||||
| | * | only prevent shared action for the Shared folder in the root dir | Björn Schießle | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
| | * | don't add share action to the Shared folder | Björn Schießle | 2013-03-12 | 1 | -1/+1 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-13 | 7 | -3/+13 |
| | | | |||||
| * | | Merge pull request #2234 from owncloud/fix_ldap_edirectory | Frank Karlitschek | 2013-03-12 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | LDAP: compatibility with Novell eDirectory UUID | ||||
| | * | LDAP: compatibility with Novell eDirectory UUID | Arthur Schiwon | 2013-03-11 | 1 | -2/+2 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-12 | 5 | -13/+42 |
| |/ | |||||
| * | Merge pull request #1786 from owncloud/shared-folder-etags | Bernhard Posselt | 2013-03-11 | 5 | -39/+181 |
| |\ | | | | | | | Include etags for the root of the shared folder | ||||
| | * | Fix correctFolders and retrieve the correct storage cache | Michael Gapczynski | 2013-03-08 | 2 | -17/+17 |
| | | | |||||
| | * | not only files can be reshared but also folders | Björn Schießle | 2013-03-08 | 1 | -1/+1 |
| | | | |||||
| | * | Fix share hook for updater | Michael Gapczynski | 2013-03-08 | 1 | -2/+14 |
| | | | |||||
| | * | use pre_unshare hook, otherwise the share is already removed. Which means ↵ | Björn Schießle | 2013-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | that we have no chance to determine which folder has to be updated | ||||
| | * | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-07 | 19 | -32/+140 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php | ||||
| | * | | itemSource parameter should be fileSource | Michael Gapczynski | 2013-03-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Update Shared folders ETags of users with reshares | Michael Gapczynski | 2013-03-06 | 1 | -5/+11 |
| | | | | |||||
| | * | | Move hook connectors from shared storage to app.php, add post_unshare hook | Michael Gapczynski | 2013-03-05 | 2 | -4/+5 |
| | | | | |||||
| | * | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-03-05 | 172 | -522/+696 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/appinfo/app.php | ||||
| | * | | | Fix variable name in Shared_Updater | Michael Gapczynski | 2013-03-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update ETag when file is shared | Michael Gapczynski | 2013-03-02 | 2 | -0/+11 |
| | | | | | |||||
| | * | | | Merge branch 'master' into shared-folder-etags | Michael Gapczynski | 2013-02-28 | 230 | -1122/+1681 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/sharedstorage.php | ||||
| | * | | | | Fix target path and reuse mtime | Michael Gapczynski | 2013-02-26 | 1 | -4/+4 |
| | | | | | |