summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* upload abortion detection only for PUTThomas Müller2013-10-042-9/+19
* Merge pull request #5085 from owncloud/versioning_previewBjörn Schießle2013-10-045-3/+65
|\
| * remove hover effect from preview imageBjoern Schiessle2013-10-041-0/+1
| * vertical align versions textMorris Jobke2013-10-041-1/+7
| * maxX and maxY should be a integerBjoern Schiessle2013-10-022-4/+4
| * add previews to versions dialogBjoern Schiessle2013-10-025-2/+57
* | Merge pull request #5087 from owncloud/templatefunction-relativedateVincent Petry2013-10-043-11/+228
|\ \
| * | Removed $fromTime argument from public template APIVincent Petry2013-10-041-2/+2
| * | Fixed missing default valuesVincent Petry2013-10-032-3/+3
| * | Added unit tests for relative_modified_date, changed method signatureVincent Petry2013-10-033-10/+204
| * | Removed stray debug log writeVincent Petry2013-10-021-1/+0
| * | Added dateOnly argument to relative_modified_dateVincent Petry2013-10-022-10/+34
* | | Merge pull request #5121 from owncloud/shareapi-syntaxerrorBjörn Schießle2013-10-041-1/+1
|\ \ \
| * | | Fixed array syntax to work with PHP 5.3Vincent Petry2013-10-041-1/+1
* | | | Merge pull request #4933 from owncloud/1376-filesappplussigninurlbugVincent Petry2013-10-041-2/+6
|\ \ \ \
| * | | | Replace plus sign with space in files app URL #4932Vincent Petry2013-09-201-2/+6
* | | | | Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etagMarkus Goetz2013-10-041-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | DAV: Use fileinfo_cache for ETagMarkus Goetz2013-10-031-1/+8
* | | | | Merge pull request #4689 from owncloud/sharing_mail_notification_masterBjörn Schießle2013-10-0413-30/+263
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0450-413/+1455
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #5107 from owncloud/user_skeletonThomas Müller2013-10-042-0/+35
|\ \ \ \ \ \
| * | | | | | add a real examplefile instead of an .gitignore which is a bit stupid hereFrank Karlitschek2013-10-042-4/+5
| * | | | | | ups. remove debugFrank Karlitschek2013-10-041-2/+0
| * | | | | | use Filesystem::isIgnoredDirFrank Karlitschek2013-10-041-1/+1
| * | | | | | fix typoFrank Karlitschek2013-10-041-1/+1
| * | | | | | add public staticFrank Karlitschek2013-10-041-1/+1
| * | | | | | make it possible to prepopulate a new user gome with a skeletonFrank Karlitschek2013-10-032-0/+36
* | | | | | | Merge pull request #4815 from owncloud/ldap_improve_testingMorris Jobke2013-10-0419-235/+1065
|\ \ \ \ \ \ \
| * | | | | | | remove outdated (thus failing) and anyway insufficient group tests - for nowArthur Schiwon2013-09-271-46/+0
| * | | | | | | give test file a proper nameArthur Schiwon2013-09-271-0/+0
| * | | | | | | added user_ldap tests via public api callsArthur Schiwon2013-09-271-14/+112
| * | | | | | | LDAP: don't throw exceptions in the wrapper, errors are handled in the code. ...Arthur Schiwon2013-09-271-3/+5
| * | | | | | | LDAP: coding styleArthur Schiwon2013-09-279-18/+34
| * | | | | | | LDAP: simple tests for the user backendArthur Schiwon2013-09-271-0/+313
| * | | | | | | LDAP: get rid of some PHP WarningsArthur Schiwon2013-09-271-1/+6
| * | | | | | | LDAP: make Access be a dependency to the user and group backend instead of in...Arthur Schiwon2013-09-2716-173/+225
| * | | | | | | WhitespacesArthur Schiwon2013-09-271-2/+0
| * | | | | | | LDAP: don't check var type when you can specify the type in the parameter listArthur Schiwon2013-09-271-7/+3
| * | | | | | | LDAP: use wrapper, not direct function callArthur Schiwon2013-09-271-1/+1
| * | | | | | | LDAP: add phpdocArthur Schiwon2013-09-271-0/+1
| * | | | | | | LDAP: establish wrapper interface to allow proper mockingArthur Schiwon2013-09-274-28/+275
| * | | | | | | LDAP: move is_resource check to ldap wrapper to make it mockableArthur Schiwon2013-09-273-8/+19
| * | | | | | | LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation a...Arthur Schiwon2013-09-273-11/+147
| * | | | | | | Resolve merge conflictArthur Schiwon2013-09-271-11/+12
* | | | | | | | Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617Björn Schießle2013-10-0415-50/+108
|\ \ \ \ \ \ \ \
| * | | | | | | | Shortened notification message that was too longVincent Petry2013-10-041-1/+1
| * | | | | | | | fix hidden fieled nameBjoern Schiessle2013-10-041-1/+1
| * | | | | | | | we don't know \OCA\Encryption\Session if the encryption app is not enabled, s...Bjoern Schiessle2013-10-041-2/+2
| * | | | | | | | revert changes in personal templateBjoern Schiessle2013-09-301-1/+1
| * | | | | | | | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-30197-1755/+9331
| |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 19:32:39 +0000