summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [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 totalRamiro Aparicio2013-11-061-35/+30
* | 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
|\ \
| * | Fixed storage stats to be based on current directoryVincent Petry2013-11-063-8/+33
| * | Update quota value in client after scan and uploadVincent Petry2013-11-063-13/+33
* | | Fixed folder icon for home storageVincent Petry2013-11-061-1/+1
|/ /
* | Merge pull request #5692 from miicha/patch-2VicDeo2013-11-051-1/+1
|\ \
| * | allows agent and password or neither agent nor passwordmiicha2013-11-051-1/+1
| * | allow empty user-dn and passwordmiicha2013-11-051-1/+1
* | | 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 call req...Thomas Müller2013-11-051-17/+19
* | | | Merge pull request #5695 from owncloud/fixing-dropbox-masterThomas Müller2013-11-051-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fixing dropbox require pathThomas Müller2013-11-051-1/+1
* | | | Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-059-42/+75
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-041-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \
| * | | 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 modeVincent Petry2013-10-311-0/+3
* | | | prefer closest over parentJörn Friedrich Dreyer2013-10-311-1/+1
* | | | use data-file to retrieve filenameJörn Friedrich Dreyer2013-10-311-1/+1
|/ / /
* | | Merge pull request #5628 from owncloud/files-fixsummaryVicDeo2013-10-301-6/+7
|\ \ \
| * | | Fixed summary visibility checkVincent Petry2013-10-301-6/+7
* | | | Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclickVincent Petry2013-10-301-1/+5
|\ \ \ \
| * | | | Prevent closing the create dropdown when right clicking in FirefoxVincent Petry2013-10-301-1/+5
* | | | | 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 expectedJörn Friedrich Dreyer2013-10-301-38/+42
| | |_|/ | |/| |
* | | | Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmis...Vincent Petry2013-10-301-1/+12
|\ \ \ \
| * | | | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-1/+12
* | | | | 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
| |_|/ / |/| | |
* | | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-305-5/+6
|\ \ \ \
| * | | | 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
| | |/ / | |/| |
* | | | Merge pull request #5603 from owncloud/fix_file_cache_updater_masterVincent Petry2013-10-302-21/+48
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-293-19/+22
| |\ \ \ \
| * | | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-292-21/+48
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-301-0/+2
* | | | | | Merge pull request #5468 from berendt/reworking_OC_Files_Storage_SwiftThomas Müller2013-10-29141-485/+8381
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | settings tags for optional parametersChristian Berendt2013-10-291-5/+5
| * | | | | extended parameter descriptions for SwiftChristian Berendt2013-10-291-8/+8