aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixes after review from @DeepDiver1975Florin Peter2013-05-2313-876/+752
|
* added l10n support in apps/files_encryption/ajax/adminrecovery.phpFlorin Peter2013-05-231-2/+4
|
* code clean up; nicer solution to solve the public link share problem if a ↵Björn Schießle2013-05-232-25/+6
| | | | user is logged in
* fix public link share if a user is logged inBjörn Schießle2013-05-233-7/+32
|
* Merge branch 'master' into files_encryptionBjörn Schießle2013-05-2319-73/+85
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-2317-71/+84
| |
| * Merge pull request #3457 from owncloud/fix-share-linksMichael Gapczynski2013-05-222-2/+1
| |\ | | | | | | Fix public links
| | * RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links insteadMichael Gapczynski2013-05-222-2/+1
| |/
* | added trash bin testsFlorin Peter2013-05-221-0/+269
| |
* | added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-222-5/+12
| |
* | revert changes to .gitmodules, they were applied by accidentBjörn Schießle2013-05-221-1/+1
| |
* | revert submodule changesBjörn Schießle2013-05-221-0/+0
| |
* | settings clean-up; There is no blacklist in the new encryption appBjörn Schießle2013-05-222-34/+1
| |
* | improved error messagesBjörn Schießle2013-05-222-6/+12
| |
* | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-2228-361/+324
|\| | | | | | | | | Conflicts: lib/files/cache/cache.php
| * Merge pull request #3337 from owncloud/oracle_fixesThomas Müller2013-05-227-20/+45
| |\ | | | | | | Oracle fixes
| | * cleanup codestyleJörn Friedrich Dreyer2013-05-222-4/+4
| | |
| | * use to_char only for oracle, whitespaceJörn Friedrich Dreyer2013-05-223-9/+18
| | |
| | * add debug outputJörn Friedrich Dreyer2013-05-226-15/+30
| | |
| | * allow install when only oracle is availableJörn Friedrich Dreyer2013-05-221-1/+2
| |/
| * Merge pull request #3406 from owncloud/oc_dialogs_oc_templateMorris Jobke2013-05-226-322/+255
| |\ | | | | | | Use js templates in OC.dialogs etc.
| | * Remove more obsolete code.Thomas Tanghus2013-05-201-20/+4
| | |
| | * Don't set image path in template.Thomas Tanghus2013-05-202-2/+2
| | |
| | * Dialogs: Home folder icon instead of '/'.Thomas Tanghus2013-05-172-3/+8
| | |
| | * Dialogs: Fix method names.Thomas Tanghus2013-05-171-65/+52
| | |
| | * Dialogs: Cleanup.Thomas Tanghus2013-05-171-101/+26
| | |
| | * Dialogs: Loose up-button.Thomas Tanghus2013-05-173-16/+0
| | |
| | * Dialogs: Make slug show last dir emphasized.Thomas Tanghus2013-05-172-5/+6
| | |
| | * Various cleanups in OC.dialogsThomas Tanghus2013-05-174-148/+118
| | |
| | * Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into ↵Thomas Tanghus2013-05-160-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | oc_dialogs_oc_template Conflicts: core/js/oc-dialogs.js
| | | * Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-165-140/+216
| | | | | | | | | | | | | | | | Also load octemplate per default.
| | * | Line length etc.Thomas Tanghus2013-05-161-2/+3
| | | |
| | * | Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-165-140/+216
| | | | | | | | | | | | | | | | Also load octemplate per default.
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2215-19/+23
| | | |
* | | | fix pgsql errorFlorin Peter2013-05-221-2/+5
| | | |
* | | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-2214-16/+541
|\| | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| * | | Merge pull request #3266 from owncloud/hooksThomas Müller2013-05-215-0/+453
| |\ \ \ | | | | | | | | | | New hook system
| | * \ \ Merge branch 'master' into hooksThomas Mueller2013-05-15280-3935/+5198
| | |\ \ \
| | * | | | fix typoRobin Appelman2013-05-093-11/+11
| | | | | |
| | * | | | New hook systemRobin Appelman2013-05-075-0/+453
| | | | | |
| * | | | | Merge pull request #1586 from owncloud/filecache_mtimeThomas Müller2013-05-219-15/+85
| |\ \ \ \ \ | | | | | | | | | | | | | | Emulate touch() for backends that don't support it
| | * \ \ \ \ merge master into filecache_mtimeRobin Appelman2013-05-211551-36980/+65298
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3335 from owncloud/prevent-scan-loopJörn Friedrich Dreyer2013-05-211-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent backgroundScan() from looping
| | * | | | | | Prevent backgroundScan() from looping if opendir() is failing for the same pathMichael Gapczynski2013-05-131-1/+3
| | | | | | | |
| | | * | | | | Merge branch 'master' into filecache_mtimeMichael Gapczynski2013-03-081108-24118/+36055
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/view.php lib/util.php tests/lib/files/cache/cache.php
| | | * \ \ \ \ \ merge master into filecache_mtimeRobin Appelman2013-02-15764-13905/+58775
| | | |\ \ \ \ \ \
| | | * | | | | | | Emulate touch() for backends that don't support itRobin Appelman2013-02-102-8/+42
| | | | | | | | | |
| | | * | | | | | | Cache: bookkeeping of storage_mtimeRobin Appelman2013-02-106-10/+40
| | | | | | | | | |
| | | * | | | | | | Cache: add seccond mtime fieldRobin Appelman2013-02-102-1/+9
| | | | | | | | | |
* | | | | | | | | | improved testsFlorin Peter2013-05-226-388/+301
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 05:50:32 +0000