summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12624 from nazar-pc/stable7Vincent Petry2014-12-123-8/+11
|\
| * Merge pull request #11524 from nazar-pc/patch-1Vincent Petry2014-12-043-8/+11
* | Do not remove dir entry if it has the same name as the parentVincent Petry2014-12-111-4/+1
* | Merge pull request #12663 from zinks-/l10n-fr-backportMorris Jobke2014-12-107-30/+30
|\ \
| * | Patched french translation (backported from master)Thomas Imbreckx2014-12-057-30/+30
* | | Add js unit testRobin Appelman2014-12-101-7/+27
* | | Dont show the delete button for selected files if one of the selected files i...Robin Appelman2014-12-101-2/+12
* | | Check if files are deletable before trying to delete themRobin Appelman2014-12-101-1/+3
* | | translated saved message in files externalVolkan Gezer2014-12-101-2/+2
* | | Skip headers that can not be splitVictor Dubiniuk2014-12-101-0/+3
* | | remove duplicate loaded personal.js - fixes #12674Morris Jobke2014-12-101-1/+0
* | | add docArthur Schiwon2014-12-081-0/+1
* | | preserve an asterisk at the start when escaping a search termArthur Schiwon2014-12-082-3/+8
|/ /
* | Merge pull request #12623 from owncloud/fix-s2s-oc7Björn Schießle2014-12-041-1/+1
|\ \
| * | password column needs to allow null otherwise Oracle will break for empty pas...Bjoern Schiessle2014-12-041-1/+1
| |/
* | Merge pull request #12309 from owncloud/ldap-cache-user-countblizzz2014-12-041-0/+5
|\ \
| * | cache total user countArthur Schiwon2014-11-191-0/+5
* | | Merge pull request #12493 from owncloud/ldap_search_perfblizzz2014-12-043-1/+152
|\ \ \ | |_|/ |/| |
| * | LDAP search filter creation changes:Arthur Schiwon2014-11-281-1/+40
| * | add ldap-search command to occArthur Schiwon2014-11-283-0/+112
* | | Merge pull request #11747 from owncloud/storeCredentialsOnlyInSessionIfRequiredVincent Petry2014-12-011-3/+27
|\ \ \ | |/ / |/| |
| * | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-11-201-3/+27
* | | Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
* | | Merge pull request #12415 from owncloud/port-12262Morris Jobke2014-11-251-1/+1
|\ \ \
| * | | The "dir" key is used within the public sharing template to indicate in which...Lukas Reschke2014-11-251-1/+1
* | | | use login name to verify passwordBjoern Schiessle2014-11-251-1/+2
|/ / /
* | | Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefixVincent Petry2014-11-202-9/+58
|\ \ \ | |/ / |/| |
| * | Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-172-9/+58
* | | Show warning when invalid user was passedVincent Petry2014-11-201-0/+8
| |/ |/|
* | Correctly restore previous root mount point after testingJoas Schilling2014-11-191-2/+12
* | Fix single run of encryption tests and usages of uniqid() and fopen()Joas Schilling2014-11-1912-252/+375
* | Skip some more tests on Windows which just can not work at allJoas Schilling2014-11-192-3/+22
* | Hiding add to your own cloud if server2server sharing is not enabledClark Tomlinson2014-11-132-1/+9
* | user_ldap: Reimplement convertSID2Str() without BCMath dependency.Andreas Fischer2014-11-123-54/+57
|/
* Fix infinite loop if count and limit is 0Morris Jobke2014-11-111-1/+1
* dont fail with 500 if configured display name attribute is not setArthur Schiwon2014-11-112-3/+29
* JS unit tests fix - use toBeUndefined() instead of toEqual(null)Morris Jobke2014-11-071-7/+7
* check if the provided password is really the current log-in passwordBjoern Schiessle2014-11-061-15/+29
* adjust strings - fixed #11930Thomas Müller2014-11-051-3/+11
* Store curl error message directlyVincent Petry2014-11-041-5/+2
* Check for cert bundle existence before using itVincent Petry2014-11-041-1/+10
* Only rescan trash folder when checking deleted versionsVincent Petry2014-11-041-1/+1
* don't move versions if only the mount point was renamedBjoern Schiessle2014-11-032-0/+53
* Fix typoLukas Reschke2014-11-031-2/+2
* get the source path and owner in a pre hook and the target path and owner in aBjoern Schiessle2014-11-033-13/+124
* Merge pull request #11614 from owncloud/fix_files_external_s3_storage_id_migr...Lukas Reschke2014-10-312-3/+137
|\
| * test files external amazon s3 storage id migrationJörn Friedrich Dreyer2014-10-271-0/+117
| * fix files_external storage id migrationJörn Friedrich Dreyer2014-10-271-3/+20
* | on xp'ed mode and switching configurations: save raw mode instead of toggling...Arthur Schiwon2014-10-312-14/+10
* | Properly register sharing hooks and proxiesVincent Petry2014-10-301-1/+7