summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
|/
* 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
| | |
* | | 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
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2124-64/+104
| | | | | | |
* | | | | | | Merge pull request #3430 from owncloud/vcategory_renameThomas Müller2013-05-202-0/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add rename() method to OC_VCategories.
| * | | | | | | Add test for renaming non-existing category.Thomas Tanghus2013-05-201-0/+1
| | | | | | | |
| * | | | | | | Remove debug outputThomas Tanghus2013-05-201-1/+0
| | | | | | | |
| * | | | | | | Add rename() method to OC_VCategories.Thomas Tanghus2013-05-202-0/+42
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2039-161/+248
| | | | | | |
* | | | | | | Merge pull request #3399 from owncloud/fix_js_for_ieBernhard Posselt2013-05-191-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | cleanup after people who don't test in ie
| * | | | | | | cleanup after people who don't test in ieJörn Friedrich Dreyer2013-05-171-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #3421 from owncloud/pre_login_passwordMichael Gapczynski2013-05-191-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add password to pre_login
| * | | | | | | | Add password to pre_loginLukas Reschke2013-05-191-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I need this to intercept passwords for my WIP multi-factor authentication app.
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1917-31/+45
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-18395-1737/+1878
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #3375 from ↵FlorinPeter2013-05-171-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_for_SQLite3Result_object_in_post_addToGroup fix for SQLite3Result::fetchArray() on setup
| * | | | | | | only connect share hooks if installation OC is installedFlorin Peter2013-05-171-4/+6
| | | | | | | |
| * | | | | | | revert changesFlorin Peter2013-05-171-28/+25
| | | | | | | |
| * | | | | | | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been ↵Florin Peter2013-05-151-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly initialised in post_addToGroup
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1799-5101/+11469
| | | | | | | |
* | | | | | | | Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuidblizzz2013-05-169-4/+143
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Ldap configurable username n uuid
| * | | | | | | Merge branch 'master' into ldap_configurable_username_n_uuidArthur Schiwon2013-05-13156-1103/+1717
| |\ \ \ \ \ \ \
| * | | | | | | | LDAP: fix display of numerical display namesArthur Schiwon2013-05-081-1/+1
| | | | | | | | |