summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7556 from owncloud/enc_dont_create_files_folderVincent Petry2014-03-051-1/+0
|\
| * don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
* | Merge pull request #7012 from owncloud/display-share-owner-masterVincent Petry2014-03-054-13/+30
|\ \ | |/ |/|
| * Merge branch 'master' into display-share-owner-masterThomas Müller2014-02-2832-150/+831
| |\
| * | Improve jQuery element selectorMorris Jobke2014-02-201-1/+1
| * | uppercase text and fix dialog popupThomas Müller2014-02-201-4/+4
| * | show share owner within shared folders as wellThomas Müller2014-02-201-0/+3
| * | remove duplicate selectors and declarationThomas Müller2014-02-201-7/+6
| * | update share ownerThomas Müller2014-02-201-0/+8
| * | store the share owner in a data-attribute instead of a separate spanThomas Müller2014-02-201-5/+9
| * | adding share owner information to the file listThomas Müller2014-02-202-5/+8
* | | Merge pull request #7508 from owncloud/ldap-configkeycasingVincent Petry2014-03-041-1/+1
|\ \ \
| * | | Fixed configkey casing for PostgreSQLVincent Petry2014-03-031-1/+1
* | | | Merge pull request #7525 from owncloud/fix_S3stringThomas Müller2014-03-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix https://github.com/owncloud/core/issues/6825Frank Karlitschek2014-03-041-1/+1
* | | | remove remaining testing artefactArthur Schiwon2014-03-031-1/+1
* | | | intendetion. where did the whitespaces come from?Arthur Schiwon2014-03-031-2/+2
* | | | LDAP: let proxy for multiple server access methods from AccessArthur Schiwon2014-03-031-4/+13
| |_|/ |/| |
* | | Merge pull request #7455 from owncloud/rawlist-fileinfoicewind19912014-02-281-31/+28
|\ \ \
| * | | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-31/+28
* | | | Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\ \ \ \
| * | | | remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
| |/ / /
* | | | Fixed wrong field nameVincent Petry2014-02-271-1/+1
* | | | Merge pull request #7446 from owncloud/etag_assert_fixesThomas Müller2014-02-271-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | use assertSame and assertNotSame for etag checksJörn Friedrich Dreyer2014-02-271-2/+2
* | | | Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_allVincent Petry2014-02-272-0/+16
|\ \ \ \
| * | | | close encryption session after decryption was finishedBjoern Schiessle2014-02-262-0/+16
| |/ / /
* | | | Merge pull request #7421 from owncloud/password-inputThomas Müller2014-02-261-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | disable autocomplete for shared link password input, fix #7419Jan-Christoph Borchardt2014-02-261-1/+4
* | | | Merge pull request #7393 from owncloud/fix_path_in_sharing_resultsBjörn Schießle2014-02-262-0/+69
|\ \ \ \
| * | | | fix path in sharing results if it is a file in the Shared folderBjoern Schiessle2014-02-252-0/+69
* | | | | Merge pull request #7416 from owncloud/share_api_7311Thomas Müller2014-02-261-6/+6
|\ \ \ \ \
| * | | | | only add "received_from" if a share was foundBjoern Schiessle2014-02-261-6/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-22/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-22/+0
* | | | | coding style fixes, cut long lines, comments not on same lines, curly bracesJan-Christoph Borchardt2014-02-261-8/+11
* | | | | Merge pull request #7335 from owncloud/fix-7333Vincent Petry2014-02-251-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed mount config pathVincent Petry2014-02-241-3/+4
| * | | | Fix code to search for mount.json in custom data foldersLukas Reschke2014-02-201-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #6299 from leo-b/ldap_nested_groupsVicDeo2014-02-253-10/+72
|\ \ \ \
| * | | | replace spaces with tabsroot2014-02-211-5/+5
| * | | | fix coding style to blizzz happy.. ;-)root2014-02-121-8/+10
| * | | | fix indentationroot2013-12-111-42/+42
| * | | | remove debug outputroot2013-12-101-3/+0
| * | | | Merge remote branch 'upstream/master' into ldap_nested_groupsroot2013-12-1073-118/+133
| |\ \ \ \
| * | | | | move nested group checkbox to directory settingsroot2013-12-101-1/+1
| * | | | | combineFilterWithAnd recently moved to Accessroot2013-12-081-3/+3
| * | | | | add support for nested groupsroot2013-12-063-10/+73
* | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keysBjörn Schießle2014-02-253-4/+138
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 10:17:07 +0000