summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Increased upload error delay to 10 secondsVincent Petry2013-11-081-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-totaldirsnotfoundfixMorris Jobke2013-11-071-2/+2
|\ | | | | Fixed totalDirs JS error
| * Fixed totalDirs JS errorVincent Petry2013-11-071-2/+2
| |
* | Merge pull request #5682 from owncloud/fix5585blizzz2013-11-073-13/+21
|\ \ | |/ |/| LDAP: make buttons on Expert page work again, fixes #5585
| * LDAP Wizard: l10ned Save buttonArthur Schiwon2013-11-061-1/+1
| |
| * LDAP: improve design and placement of Save buttonArthur Schiwon2013-11-042-1/+9
| |
| * LDAP: make buttons on Expert page work again, fixes #5585Arthur Schiwon2013-11-042-13/+13
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0639-14/+118
| |
* | Merge pull request #5399 from frisco82/fixDownloadOverQuotaMorris Jobke2013-11-061-35/+30
|\ \ | | | | | | Do not count the size of shared folder on total
| * | Do not count the size of shared folder on totalRamiro Aparicio2013-11-061-35/+30
| | | | | | | | | | | | | | | | | | Changed all array access to dot notation Split comment in a second line
* | | LDAP: resolve namespace harakiri, fixes background jobArthur Schiwon2013-11-061-4/+4
| | |
* | | Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperationsMorris Jobke2013-11-064-14/+59
|\ \ \ | | | | | | | | Fixes for "max upload size" value showed in the UI
| * | | Fixed storage stats to be based on current directoryVincent Petry2013-11-063-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 uploadVincent Petry2013-11-063-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 storageVincent Petry2013-11-061-1/+1
|/ / / | | | | | | | | | Fixes #5713
* | | Merge pull request #5692 from miicha/patch-2VicDeo2013-11-051-1/+1
|\ \ \ | | | | | | | | allow empty user-dn and password
| * | | allows agent and password or neither agent nor passwordmiicha2013-11-051-1/+1
| | | | | | | | | | | | this contribution is MIT licensed
| * | | allow empty user-dn and passwordmiicha2013-11-051-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-masterThomas Müller2013-11-051-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üller2013-11-051-17/+19
| | | | | | | | | | | | | | | | requires a user to be logged in
* | | | Merge pull request #5695 from owncloud/fixing-dropbox-masterThomas Müller2013-11-051-1/+1
|\ \ \ \ | |/ / / |/| | | fixing dropbox require path
| * | | fixing dropbox require pathThomas Müller2013-11-051-1/+1
| | | |
* | | | Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-059-42/+75
|\ \ \ \ | |/ / / |/| | | Append file etag to preview URLs
| * | | Added missing comma to make the next diff cleanerVincent Petry2013-10-311-1/+1
| | | |
| * | | Fixed preview URL + size while dragging an existing fileVincent Petry2013-10-282-3/+5
| | | |
| * | | Append file etag to preview URLsVincent Petry2013-10-288-39/+70
| | | | | | | | | | | | | | | | Fixes #5534
* | | | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-041-0/+4
|\ \ \ \ | |_|/ / |/| | | Scanner enhancments master
| * | | use ===Thomas Müller2013-11-041-1/+1
| | | |
| * | | adding storage_mtime handling to SharedCacheThomas Müller2013-10-251-0/+4
| | |/ | |/|
* | | Merge pull request #5656 from owncloud/fix-wizard-typoAndreas Fischer2013-11-041-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in LDAP wizard * owncloud/fix-wizard-typo: Excpetion->Exception
| * | | Excpetion->ExceptionVicDeo2013-11-011-11/+11
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0312-6/+38
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-03110-137/+218
|/ / /
* | | Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermodeMorris Jobke2013-10-311-0/+3
|\ \ \ | | | | | | | | Corretly hide "no permissions" message in controls in viewer mode
| * | | Corretly hide "no permissions" message in controls in viewer modeVincent Petry2013-10-311-0/+3
| | | | | | | | | | | | | | | | Fixes #5622
* | | | prefer closest over parentJörn Friedrich Dreyer2013-10-311-1/+1
| | | | | | | | | | | | closest will search up the tree
* | | | use data-file to retrieve filenameJörn Friedrich Dreyer2013-10-311-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-fixsummaryVicDeo2013-10-301-6/+7
|\ \ \ | | | | | | | | Fixed summary visibility check
| * | | Fixed summary visibility checkVincent Petry2013-10-301-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-createdropdownstayswithrightclickVincent Petry2013-10-301-1/+5
|\ \ \ \ | | | | | | | | | | Prevent closing the create dropdown when right clicking in Firefox
| * | | | Prevent closing the create dropdown when right clicking in FirefoxVincent Petry2013-10-301-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_filesJörn Friedrich Dreyer2013-10-301-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 expectedJörn Friedrich Dreyer2013-10-301-38/+42
| | |_|/ | |/| |
* | | | Merge pull request #5549 from ↵Vincent Petry2013-10-301-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/encryption-insertmigrationentrywhenmissing Fixed encryption migration when entry is missing in DB
| * | | | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-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 variableBjoern Schiessle2013-10-301-2/+0
| | | | |
* | | | | if the database doesn't contain any information about the recovery mode than ↵Bjoern Schiessle2013-10-301-1/+1
| |_|/ / |/| | | | | | | | | | | we assume that it is disabled
* | | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-305-5/+6
|\ \ \ \ | | | | | | | | | | Fixing l10n master
| * | | | replacing ownCloud by theme-able name or avoid it's usageThomas Müller2013-10-293-3/+4
| | | | |
| * | | | avoid usage of brand name 'ownCloud'Thomas Müller2013-10-282-2/+2
| | |/ / | |/| |