Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 | 39 | -14/+118 |
| | | |||||
* | | 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 | ||||
* | | | 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. | ||||
* | | | | Fixed folder icon for home storage | Vincent Petry | 2013-11-06 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Fixes #5713 | ||||
* | | | 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 #5699 from owncloud/fixing-4606-master | Thomas Müller | 2013-11-05 | 1 | -17/+19 |
|\ \ \ | | | | | | | | | calling getstoragestats.php only if a user is logged in because this cal... | ||||
| * | | | calling getstoragestats.php only if a user is logged in because this call ↵ | Thomas Müller | 2013-11-05 | 1 | -17/+19 |
| | | | | | | | | | | | | | | | | requires a user to be logged in | ||||
* | | | | Merge pull request #5695 from owncloud/fixing-dropbox-master | Thomas Müller | 2013-11-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | fixing dropbox require path | ||||
| * | | | fixing dropbox require path | Thomas Müller | 2013-11-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5582 from owncloud/files-previewcaching | Thomas Müller | 2013-11-05 | 9 | -42/+75 |
|\ \ \ \ | |/ / / |/| | | | Append file etag to preview URLs | ||||
| * | | | Added missing comma to make the next diff cleaner | Vincent Petry | 2013-10-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed preview URL + size while dragging an existing file | Vincent Petry | 2013-10-28 | 2 | -3/+5 |
| | | | | |||||
| * | | | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 8 | -39/+70 |
| | | | | | | | | | | | | | | | | Fixes #5534 | ||||
* | | | | Merge pull request #5540 from owncloud/scanner-enhancments-master | Thomas Müller | 2013-11-04 | 1 | -0/+4 |
|\ \ \ \ | |_|/ / |/| | | | Scanner enhancments master | ||||
| * | | | use === | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | adding storage_mtime handling to SharedCache | Thomas Müller | 2013-10-25 | 1 | -0/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #5656 from owncloud/fix-wizard-typo | Andreas Fischer | 2013-11-04 | 1 | -11/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in LDAP wizard * owncloud/fix-wizard-typo: Excpetion->Exception | ||||
| * | | | Excpetion->Exception | VicDeo | 2013-11-01 | 1 | -11/+11 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 12 | -6/+38 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 110 | -137/+218 |
|/ / / | |||||
* | | | Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode | Morris Jobke | 2013-10-31 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Corretly hide "no permissions" message in controls in viewer mode | ||||
| * | | | Corretly hide "no permissions" message in controls in viewer mode | Vincent Petry | 2013-10-31 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Fixes #5622 | ||||
* | | | | prefer closest over parent | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | closest will search up the tree | ||||
* | | | | use data-file to retrieve filename | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 |
|/ / / | | | | | | | | | | forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163 trust me, I know what I'm doing | ||||
* | | | Merge pull request #5628 from owncloud/files-fixsummary | VicDeo | 2013-10-30 | 1 | -6/+7 |
|\ \ \ | | | | | | | | | Fixed summary visibility check | ||||
| * | | | Fixed summary visibility check | Vincent Petry | 2013-10-30 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | Now using the integer values to check whether to show the summary parts instead of trying to parse the html code. | ||||
* | | | | Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick | Vincent Petry | 2013-10-30 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Prevent closing the create dropdown when right clicking in Firefox | ||||
| * | | | | Prevent closing the create dropdown when right clicking in Firefox | Vincent Petry | 2013-10-30 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firefox sends a click event on the document when right clicking which makes pasting with right click into the field impossible. Fixes #5498 | ||||
* | | | | | Merge pull request #5626 from owncloud/fix_search_in_shared_files | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 |
|\ \ \ \ \ | |/ / / / |/| | | | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected | ||||
| * | | | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5549 from ↵ | Vincent Petry | 2013-10-30 | 1 | -1/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/encryption-insertmigrationentrywhenmissing Fixed encryption migration when entry is missing in DB | ||||
| * | | | | Fixed encryption migration when entry is missing in DB | Vincent Petry | 2013-10-25 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resetting the DB and some users still have encrypted files, the migration state isn't read properly becaue the migration entries are missing. This causes the wrong file size to be returned. This fix inserts the missing migration entry when this condition is met. Fixes #5541 | ||||
* | | | | | remove unused variable | Bjoern Schiessle | 2013-10-30 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | if the database doesn't contain any information about the recovery mode than ↵ | Bjoern Schiessle | 2013-10-30 | 1 | -1/+1 |
| |_|/ / |/| | | | | | | | | | | | we assume that it is disabled | ||||
* | | | | Merge pull request #5616 from owncloud/fixing-l10n-master | Vincent Petry | 2013-10-30 | 5 | -5/+6 |
|\ \ \ \ | | | | | | | | | | | Fixing l10n master | ||||
| * | | | | replacing ownCloud by theme-able name or avoid it's usage | Thomas Müller | 2013-10-29 | 3 | -3/+4 |
| | | | | | |||||
| * | | | | avoid usage of brand name 'ownCloud' | Thomas Müller | 2013-10-28 | 2 | -2/+2 |
| | |/ / | |/| | |