| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5804 from owncloud/files-selectionsummary | Morris Jobke | 2013-11-11 | 1 | -1/+1 |
| |\ | | | | | Selection summary is now displayed properly | ||||
| | * | Selection summary is now displayed properly | Vincent Petry | 2013-11-11 | 1 | -1/+1 |
| | | | | | | | | | Fixes #5775 | ||||
| * | | Merge pull request #5707 from owncloud/fixwrongfilesizeintests | Morris Jobke | 2013-11-11 | 1 | -0/+3 |
| |\ \ | | | | | | | Fixed filesize issue in watchr test | ||||
| | * | | Fixed filesize issue in watchr test | Vincent Petry | 2013-11-05 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | Added clearstatcache to make sure we get the correct file size after re-writing into the same file. This failed on openSUSE 12.3 x86_64 | ||||
| * | | | Merge pull request #5769 from owncloud/files-changedirjsevent | Morris Jobke | 2013-11-11 | 1 | -0/+6 |
| |\ \ \ | | | | | | | | | Added JS event for when the user changes the directory | ||||
| | * | | | Added JS event for when the user changes the directory | Vincent Petry | 2013-11-08 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | This enables apps to detect directory changes which might be caused by the user using the browser back button. | ||||
| * | | | | Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes | Morris Jobke | 2013-11-11 | 6 | -114/+341 |
| |\ \ \ \ | | | | | | | | | | | Fixed watcher to also update the owner's folder sizes | ||||
| | * | | | | Fixed unit tests for files sharing watcher | Vincent Petry | 2013-11-06 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Added unit tests for shared files watcher | Vincent Petry | 2013-11-05 | 4 | -108/+317 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added base class for sharing unit tests - Added unit tests for shared files watched to check for folder size propagation | ||||
| | * | | | | Removed unused method | Vincent Petry | 2013-11-05 | 1 | -18/+0 |
| | | | | | | |||||
| | * | | | | Fixed watcher to also update the owner's folder sizes | Vincent Petry | 2013-11-05 | 3 | -7/+43 |
| | | |/ / | |/| | | | | | | | | | | Note that the root folder size is mandatory for quota calculation. | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-11 | 439 | -3661/+3757 |
| | |_|/ |/| | | |||||
| * | | | Merge pull request #5687 from owncloud/fixing-5659-master | Thomas Müller | 2013-11-09 | 1 | -8/+3 |
| |\ \ \ | | | | | | | | | display the exception instead of meaningless message | ||||
| | * | | | display the exception instead of meaningless message | Thomas Müller | 2013-11-04 | 1 | -8/+3 |
| | | | | | |||||
| * | | | | Merge pull request #5759 from owncloud/fixing-5757-master | Thomas Müller | 2013-11-09 | 1 | -2/+13 |
| |\ \ \ \ | | | | | | | | | | | adding proper htaccess commands for Apache 2.4 | ||||
| | * | | | | implementing solution using <ifModule mod_authz_core> | Thomas Müller | 2013-11-08 | 1 | -4/+8 |
| | | | | | | |||||
| | * | | | | adding proper htaccess commands for Apache 2.4 | Thomas Müller | 2013-11-08 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-09 | 145 | -361/+3976 |
| | | | | | | |||||
| * | | | | | Merge pull request #5763 from owncloud/fixing-sharing-ocs-api-master | Thomas Müller | 2013-11-08 | 1 | -0/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | the filesystem has to be initialized once we know the user | ||||
| | * | | | | | the filesystem has to be initialized once we know the user | Thomas Müller | 2013-11-08 | 1 | -0/+8 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #5762 from owncloud/files-uploaderrordelay | Jan-Christoph Borchardt | 2013-11-08 | 1 | -6/+5 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Increased upload error delay to 10 seconds | ||||
| | * | | | | Increased upload error delay to 10 seconds | Vincent Petry | 2013-11-08 | 1 | -6/+5 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #5662 Also made it use OC.Notification instead of directly access the notification HTML element. | ||||
| * | | | | Merge pull request #5747 from owncloud/scanner-post-hooks | Morris Jobke | 2013-11-07 | 1 | -0/+5 |
| |\ \ \ \ | |/ / / |/| | | | Add post hooks for filesystem scanner | ||||
| | * | | | Add post hooks for filesystem scanner | Robin Appelman | 2013-11-07 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Now removing stray old cookies from 5.0.12 | Vincent Petry | 2013-11-07 | 1 | -0/+5 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies from 5.0.12 seemed to have an extra slash in the path. Firefox doesn't allow to remove them if the trailing slash isn't there, thus making it impossible to logout correctly. This fix adds extra code to delete such stray cookies. Ported from stable5 branch 99e5c6f7eb58404be2cc5448ec380f29c9a71225 | ||||
| * | | | Merge pull request #5737 from owncloud/files-totaldirsnotfoundfix | Morris Jobke | 2013-11-07 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Fixed totalDirs JS error | ||||
| | * | | | Fixed totalDirs JS error | Vincent Petry | 2013-11-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #5682 from owncloud/fix5585 | blizzz | 2013-11-07 | 3 | -13/+21 |
| |\ \ \ \ | |/ / / |/| | | | LDAP: make buttons on Expert page work again, fixes #5585 | ||||
| | * | | | LDAP Wizard: l10ned Save button | Arthur Schiwon | 2013-11-06 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | LDAP: improve design and placement of Save button | Arthur Schiwon | 2013-11-04 | 2 | -1/+9 |
| | | | | | |||||
| | * | | | LDAP: make buttons on Expert page work again, fixes #5585 | Arthur Schiwon | 2013-11-04 | 2 | -13/+13 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-06 | 236 | -1711/+1700 |
| | | | | | |||||
| * | | | | ownCloud 6 beta 3v6.0.0beta3 | Frank Karlitschek | 2013-11-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #5399 from frisco82/fixDownloadOverQuota | Morris Jobke | 2013-11-06 | 1 | -35/+30 |
| |\ \ \ \ | | | | | | | | | | | Do not count the size of shared folder on total | ||||
| | * | | | | Do not count the size of shared folder on total | Ramiro Aparicio | 2013-11-06 | 1 | -35/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed all array access to dot notation Split comment in a second line | ||||
| * | | | | | Merge pull request #5718 from owncloud/fixLdapBgJob | Vincent Petry | 2013-11-06 | 1 | -4/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | LDAP: resolve namespace harakiri, fixes background job | ||||
| | * | | | | | LDAP: resolve namespace harakiri, fixes background job | Arthur Schiwon | 2013-11-06 | 1 | -4/+4 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations | Morris Jobke | 2013-11-06 | 4 | -14/+59 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixes for "max upload size" value showed in the UI | ||||
| | * | | | | | Fixed storage stats to be based on current directory | Vincent Petry | 2013-11-06 | 3 | -8/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the storage statistics were always for the root dir. This means that the upload button would always show the limit for the root dir, even when uploading to a shared dir or external storage. This fix adds a "dir" argument to getstoragestats.php. | ||||
| | * | | | | | Update quota value in client after scan and upload | Vincent Petry | 2013-11-06 | 3 | -13/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After uploading, the quota value wasn't refreshed. This fix refreshes the quota value after files have been scanned or uploaded. | ||||
| * | | | | | | Merge pull request #5717 from owncloud/files-foldericonforhomestorage | Vincent Petry | 2013-11-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed folder icon for home storage | ||||
| | * | | | | | | Fixed folder icon for home storage | Vincent Petry | 2013-11-06 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Fixes #5713 | ||||
| * | | | | | | Merge pull request #5716 from owncloud/full-name | Vincent Petry | 2013-11-06 | 3 | -5/+5 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | change 'Display Name' to more understandable 'Full Name', fix #5612 | ||||
| | * | | | | | change 'Display Name' to more understandable 'Full Name', fix #5612 | Jan-Christoph Borchardt | 2013-11-06 | 3 | -5/+5 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #5692 from miicha/patch-2 | VicDeo | 2013-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | allow empty user-dn and password | ||||
| | * | | | | | allows agent and password or neither agent nor password | miicha | 2013-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | this contribution is MIT licensed | ||||
| | * | | | | | allow empty user-dn and password | miicha | 2013-11-05 | 1 | -1/+1 |
| | | |_|/ / | |/| | | | | | | | | help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings... | ||||
| * | | | | | Merge pull request #5691 from owncloud/switch-to-oc6-documentation | blizzz | 2013-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | move to oc6 documentation | ||||
| | * | | | | | move to oc6 documentation | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #5696 from owncloud/fixing-5670-master | Andreas Fischer | 2013-11-05 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decode arguments as array * owncloud/fixing-5670-master: decode arguments as array | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |