Commit Graph

11116 Commits

Author SHA1 Message Date
Jenkins for ownCloud 698862519d [tx-robot] updated from transifex 2013-05-23 02:00:27 +02:00
Michael Gapczynski 1cfc9d269e Merge pull request #3457 from owncloud/fix-share-links
Fix public links
2013-05-22 15:20:15 -07:00
Michael Gapczynski 9b622bdeed RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 2013-05-22 15:02:11 -04:00
Thomas Müller 26732ecaa6 Merge pull request #3337 from owncloud/oracle_fixes
Oracle fixes
2013-05-22 05:20:04 -07:00
Jörn Friedrich Dreyer 1f1abe595d cleanup codestyle 2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer 1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Jenkins for ownCloud d590064fdf [tx-robot] updated from transifex 2013-05-22 02:19:52 +02:00
Thomas Müller e2444ec9c5 Merge pull request #3266 from owncloud/hooks
New hook system
2013-05-21 15:21:25 -07:00
Thomas Müller 4bb6ac3aa7 Merge pull request #1586 from owncloud/filecache_mtime
Emulate touch() for backends that don't support it
2013-05-21 15:17:08 -07:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
Jenkins for ownCloud afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Thomas Müller 54d3b381a8 Merge pull request #3430 from owncloud/vcategory_rename
Add rename() method to OC_VCategories.
2013-05-20 08:08:15 -07:00
Thomas Tanghus 946740a71f Add test for renaming non-existing category. 2013-05-20 13:57:18 +02:00
Thomas Tanghus c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +02:00
Jenkins for ownCloud 6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Bernhard Posselt 71668cf08a Merge pull request #3399 from owncloud/fix_js_for_ie
cleanup after people who don't test in ie
2013-05-19 11:25:39 -07:00
Michael Gapczynski 67729f5f9f Merge pull request #3421 from owncloud/pre_login_password
Add password to pre_login
2013-05-19 10:09:24 -07:00
Lukas Reschke 7ec36c5bbb Add password to pre_login
I need this to intercept passwords for my WIP multi-factor
authentication app.
2013-05-19 13:33:33 +02:00
Jenkins for ownCloud 694f42dfd5 [tx-robot] updated from transifex 2013-05-19 02:01:55 +02:00
Jenkins for ownCloud 9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +02:00
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +02:00
Jörn Friedrich Dreyer 800c39fef1 cleanup after people who don't test in ie 2013-05-17 12:47:32 +02:00
FlorinPeter 0f314c1404 Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
fix for SQLite3Result::fetchArray() on setup
2013-05-17 01:55:28 -07:00
Thomas Tanghus ba9849a1aa Dialogs: Fix method names. 2013-05-17 08:42:15 +02:00
Thomas Tanghus 2f91606e35 Dialogs: Cleanup. 2013-05-17 07:14:43 +02:00
Thomas Tanghus a0b79f5649 Dialogs: Loose up-button. 2013-05-17 06:48:24 +02:00
Thomas Tanghus e60d86bdd1 Dialogs: Make slug show last dir emphasized. 2013-05-17 06:16:51 +02:00
Thomas Tanghus 152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +02:00
Jenkins for ownCloud 6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +02:00
Florin Peter a92dead754 only connect share hooks if installation OC is installed 2013-05-17 01:20:02 +02:00
Florin Peter 469d6028ad revert changes 2013-05-17 01:17:55 +02:00
Thomas Tanghus 4a8db293ec Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into oc_dialogs_oc_template
Conflicts:
	core/js/oc-dialogs.js
2013-05-16 18:21:56 +02:00
Thomas Tanghus 913941d894 Line length etc. 2013-05-16 18:19:28 +02:00
blizzz 2d51eefcb8 Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
Ldap configurable username n uuid
2013-05-16 05:40:31 -07:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
Jenkins for ownCloud 966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +02:00
Thomas Tanghus f355d797ff Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 00:23:05 +02:00
Thomas Müller 0b2bfe6186 Merge pull request #3371 from owncloud/fix-3353
Fix finding mount in background watcher, fixes #3353
2013-05-15 15:02:01 -07:00
Thomas Mueller 3c779b0632 Merge branch 'master' into hooks 2013-05-15 23:49:41 +02:00
Thomas Mueller 5dcec346e5 Merge branch 'master' into fix-3353 2013-05-15 23:43:46 +02:00
Thomas Müller dfddaf8fbf Merge pull request #3374 from owncloud/vobject_compound_property
Add Compound property to avoid double escaping values.
2013-05-15 14:34:16 -07:00
Thomas Mueller 990980392c No unit test coverage reports for pgsql - this causes issues on Jenkins. 2013-05-15 22:44:15 +02:00
Thomas Müller 4b3c58c2ca Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point
fix for disappearing root mount point on lib/files/filesystem.php
2013-05-15 12:34:32 -07:00