summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* only set the values we need and make sure that we write the file info for bothBjoern Schiessle2014-11-071-3/+7
* also try to get file info from part fileBjoern Schiessle2014-11-071-2/+2
* Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_...Lukas Reschke2014-11-074-2/+15
|\
| * throw exception if private key is missingBjoern Schiessle2014-11-053-0/+14
| * still try to encrypt files, even if the session is not initialized. The strea...Bjoern Schiessle2014-11-041-2/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-07100-100/+80
* | Fix sharing testsRobin Appelman2014-11-063-2/+15
* | Setup shared mounts for the correct user when setting up the filesystem for t...Robin Appelman2014-11-063-6/+33
* | Dont make real users in testsRobin Appelman2014-11-061-3/+5
* | check if the provided password is really the current log-in passwordBjoern Schiessle2014-11-061-1/+15
* | manage select2 via bowerMorris Jobke2014-11-061-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0678-280/+86
* | unbold labels and foldersJan-Christoph Borchardt2014-11-051-1/+0
* | Merge pull request #11962 from owncloud/fix-server-sharing-stringsThomas Müller2014-11-051-3/+11
|\ \
| * | adjust strings - fixed #11930Thomas Müller2014-11-051-3/+11
* | | Merge pull request #11853 from owncloud/close-session-for-trashbinVincent Petry2014-11-055-0/+6
|\ \ \ | |/ / |/| |
| * | Close session for files_trashbinLukas Reschke2014-10-295-0/+6
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-054-0/+20
* | | Store curl error message directlyVincent Petry2014-11-041-5/+2
* | | Check for cert bundle existence before using itVincent Petry2014-11-041-1/+11
| |/ |/|
* | Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolderVincent Petry2014-11-041-1/+1
|\ \
| * | Only rescan trash folder when checking deleted versionsVincent Petry2014-11-041-1/+1
* | | Merge pull request #11362 from mark0n/rm_ldap_conf_cliblizzz2014-11-043-3/+45
|\ \ \
| * | | Add a CLI command that deletes an LDAP configMartin Konrad2014-09-303-3/+45
* | | | JS unit tests fix - use toBeUndefined() instead of toEqual(null)Morris Jobke2014-11-041-7/+7
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-044-0/+12
* | | Merge pull request #11172 from owncloud/user-ldap-no-bcmathblizzz2014-11-033-54/+57
|\ \ \
| * | | user_ldap: Reimplement convertSID2Str() without BCMath dependency.Andreas Fischer2014-11-033-54/+57
* | | | Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folderBjörn Schießle2014-11-033-13/+177
|\ \ \ \
| * | | | don't move versions if only the mount point was renamedBjoern Schiessle2014-10-312-0/+53
| * | | | Fix typoLukas Reschke2014-10-291-2/+2
| * | | | get the source path and owner in a pre hook and the target path and owner in aBjoern Schiessle2014-10-293-13/+124
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-022-0/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-028-4/+16
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0122-2/+22
* | | | | test files external amazon s3 storage id migrationJörn Friedrich Dreyer2014-10-311-0/+117
* | | | | fix files_external storage id migrationJörn Friedrich Dreyer2014-10-311-3/+20
* | | | | Merge pull request #11876 from owncloud/remove-pointless-requiresLukas Reschke2014-10-3127-110/+45
|\ \ \ \ \
| * | | | | remove unnecessary require calls - the ownCloud class loader is supposed to t...Thomas Müller2014-10-3027-110/+45
* | | | | | Merge pull request #11850 from owncloud/fix-11848Vincent Petry2014-10-312-14/+10
|\ \ \ \ \ \
| * | | | | | on xp'ed mode and switching configurations: save raw mode instead of toggling...Arthur Schiwon2014-10-292-14/+10
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-312-2/+4
* | | | | | Merge pull request #11659 from jknockaert/masterVincent Petry2014-10-301-38/+54
|\ \ \ \ \ \
| * | | | | | initialisation of cipherjknockaert2014-10-281-1/+1
| * | | | | | small fixjknockaert2014-10-201-0/+1
| * | | | | | bugfixesjknockaert2014-10-201-5/+6
| * | | | | | ok; still some bugs that had to be fixedjknockaert2014-10-201-39/+35
| * | | | | | small fixjknockaert2014-10-191-1/+2
| * | | | | | rework getFileSizejknockaert2014-10-191-28/+45
* | | | | | | Merge pull request #11867 from owncloud/settings-sidebar-adminJan-Christoph Borchardt2014-10-301-2/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |