summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Replace OC.Router.generate() with OC.generateUrl()Thomas Müller2014-03-023-3/+6
* 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
| * | | | | don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-4/+13
* | | | | | Merge pull request #7285 from owncloud/mimeicons-svgMorris Jobke2014-02-245-18/+31
|\ \ \ \ \ \
| * | | | | | rename url parameterRobin Appelman2014-02-241-1/+1
| * | | | | | Add url parameter to control whether previews should return 404 when the mime...Robin Appelman2014-02-211-0/+1
| * | | | | | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-212-3/+169
| |\ \ \ \ \ \
| * | | | | | | Make unit tests expect the svg iconsRobin Appelman2014-02-201-2/+6
| * | | | | | | Merge branch 'master' into mimeicons-svgRobin Appelman2014-02-2019-146/+317
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Fix svg icons for public shares and external/shared filesRobin Appelman2014-02-192-4/+5
| * | | | | | | Show svg mime icons when no preview is availableRobin Appelman2014-02-193-13/+20
* | | | | | | | Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1Morris Jobke2014-02-242-3/+61
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into GuillaumeAmat-patch-1Robin Appelman2014-02-215-8/+178
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | code style: else on same lineJan-Christoph Borchardt2014-02-211-2/+1
| * | | | | | | fix intendationMorris Jobke2014-02-201-3/+3
| * | | | | | | Fixed trashbin titleVincent Petry2014-02-202-22/+46
| * | | | | | | Fixed title formatVincent Petry2014-02-201-1/+8
| * | | | | | | Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-pa...Vincent Petry2014-02-201-3/+31
| |\ \ \ \ \ \ \
| | * | | | | | | Uses OC.basename instead of custom codeGuillaume AMAT2014-02-191-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 21:13:12 +0000