]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMove check so the variable will never be undefined
Michael Gapczynski [Sun, 28 Jul 2013 19:32:48 +0000 (15:32 -0400)]
Move  check so the variable will never be undefined

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Jul 2013 05:58:28 +0000 (01:58 -0400)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 27 Jul 2013 06:03:03 +0000 (02:03 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #4199 from owncloud/login-cleanup
Jörn Friedrich Dreyer [Fri, 26 Jul 2013 12:15:02 +0000 (05:15 -0700)]
Merge pull request #4199 from owncloud/login-cleanup

Login cleanup IE8 fixes

11 years agoMerge pull request #4093 from owncloud/storage-test-cleanup
Bart Visscher [Fri, 26 Jul 2013 10:18:39 +0000 (03:18 -0700)]
Merge pull request #4093 from owncloud/storage-test-cleanup

Remove outdated unit tests for storage backend

11 years agoIE8 login/install screen cleartype fixes and input box borders
Jörn Friedrich Dreyer [Fri, 26 Jul 2013 08:00:07 +0000 (10:00 +0200)]
IE8 login/install screen cleartype fixes and input box borders

11 years agofunctions in OCP should be static
Robin Appelman [Thu, 25 Jul 2013 13:25:17 +0000 (15:25 +0200)]
functions in OCP should be static

11 years agoMerge pull request #4184 from owncloud/login_cleanup_oracle
blizzz [Thu, 25 Jul 2013 10:37:40 +0000 (03:37 -0700)]
Merge pull request #4184 from owncloud/login_cleanup_oracle

Login cleanup oracle

11 years agoMerge pull request #4191 from owncloud/autotest-show-skipped-tests
Jörn Friedrich Dreyer [Thu, 25 Jul 2013 10:14:43 +0000 (03:14 -0700)]
Merge pull request #4191 from owncloud/autotest-show-skipped-tests

Add verbose to autotest phpunit, so we see skipped and incomplete tests.

11 years agonew version drop down
Björn Schießle [Thu, 25 Jul 2013 08:35:19 +0000 (10:35 +0200)]
new version drop down

Squashed commit of the following:

commit 0dc404a557fa8253e3a87c7babefba6de8e6dab5
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 25 10:26:48 2013 +0200

    fix 'more versions' button for IE8

commit 5836e652857204d68dfdfa8b3318de8e2fe02493
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:56:46 2013 +0200

    clean-up some unused code

commit ac83e53fa24073783a165796fc3016dc7beca293
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:49:03 2013 +0200

    fix order of the versions, newest version should come first

commit f150a88843af316ff505728941287406f25a0751
Merge: bc713c7 b8e399b
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 16:19:36 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit bc713c7b0c3207d00d2f19b10a905a82724c0709
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 16:11:07 2013 +0200

    fix position of more versions button

commit b8e399b1754ae7656c3cb8cef2c53f6976a83d61
Merge: 24825b0 7b6e39d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:04:08 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit 24825b02004efa953197e72b470b9b033030aeee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 16:02:53 2013 +0200

    umark previous row if a new row gets selected

commit 7b6e39d2939f1b3bba4fff37ca9087dbc7795f03
Merge: 5bfb0ac 7b54644
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 15:37:19 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit 5bfb0ac5c102bdfd3b27a37cea8c792f69b3b803
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 15:37:09 2013 +0200

    more style adjustments for version dropdown

commit 7b54644d3036ffba448f0525ca09f6e8898b9950
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 15:12:53 2013 +0200

    remove debug output

commit a75662bcfdce34d4f14020a539172c7ef1b894d3
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 15:12:26 2013 +0200

    reword Revert to Restore

commit e784644daeac12bc6fa6844f24214a039266ae86
Merge: d07abfd 9978c96
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 15:00:11 2013 +0200

    Merge branch 'new_versions_dropdown' of github.com:owncloud/core into new_versions_dropdown

commit d07abfdbb49778a8be30b2a6adbe326e1b1f238f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 14:59:17 2013 +0200

    if another drop-down is already open, always close it first

commit 9978c967a6ecbd2d0e5003df3cf4cdba09dab468
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:49:47 2013 +0200

    more style improvements for versions

commit a13355f16e6172c02069930a60a49aba4ebfa227
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:44:13 2013 +0200

    position fixes for versioning

commit 02c1d6b5eabc4075749c2a7a852c9ed7bbb3644d
Merge: c5a9462 203f544
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:31:16 2013 +0200

    merge versions style changes

commit c5a946231a3d011748248db13b6b95ce51eb3e4c
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:29:56 2013 +0200

    bigger clickable area for versions

commit 203f544825bd49b168f2316cf2a04caca75438c8
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 14:15:38 2013 +0200

    changes visual changes, as suggested by Jan

commit 90b1e93676d235a61f318768661b25e5815a9784
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Wed Jul 24 14:12:23 2013 +0200

    remove superfluous selector from ID

commit 9768254fe3b2469293fca23151e54cde69bd4661
Merge: c961278 b91c682
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 12:28:06 2013 +0200

    Merge branch 'master' into new_versions_dropdown

commit c9612781e10a4de9e9405244f87c4e29428a0d3f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 11:05:25 2013 +0200

    replace modal dialog with a OC.Notification

commit 3dc7508a4c271818247afbaed0ce0b03706a8db6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Wed Jul 24 10:33:05 2013 +0200

    use image path without extension for proper svg to png fallback

commit 23ea7ad46c73fa4b86021070eb58a3b92bc8362e
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 17:53:58 2013 +0200

    some css fixes

commit 8d01499ae17e43a7d7960841a7c2127fa6de5a56
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 17:40:16 2013 +0200

    small fixes and improvements according to @Kondou-ger comments

commit 985b6461e81035967959659fab8ea59c733e00eb
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 15:58:19 2013 +0200

    replace == with ===

commit bc8fc3b4a664db2d819e0a7091f31207ffcfe44a
Merge: c1da183 a94c55b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 13:55:45 2013 +0200

    Merge branch 'master' into new_versions_dropdown

commit c1da183d13b8098eb33e708d4fdd04111bdc33a5
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 13:53:37 2013 +0200

    translate timestamps into strings like "X minutes ago" for the versions drop-down

commit c78d2b4bfb0a6800ab8516ac115ba42268be019a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 12:52:44 2013 +0200

    download versions directly from the versions drop-down

commit 14aaf9907625fc76bc153cd846704b7efd15db46
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 23 11:01:21 2013 +0200

    only show 'more versions' button of necessary

commit a0d8cb46b2255be3d9b3f9bd5f835a173c9665b8
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:49:17 2013 +0200

    remove unneeded code

commit 47eec0679ce16ece0b7890e9b41bf28d7613b131
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:44:58 2013 +0200

    add title for revert and download action

commit df87ccb24327b5c2770f7c23c97e41b143d65ec3
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:36:40 2013 +0200

    add download button to versions drop-down

commit 622c87ec37c14b7b3237bc9ca980b7f35689a933
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 22 17:36:08 2013 +0200

    adapt css file for the new versions drop-down

commit 300699024fe74a9f0f998c1cce4024484311f50c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jun 7 17:28:34 2013 +0200

    revert on click

commit 6673ae6ed45bbda1e0d962e9b32e943afc7123c0
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Fri Jun 7 16:50:08 2013 +0200

    new versions list, show the latest 5 with a button to retrieve more versions if needed

11 years agoMerge pull request #3887 from owncloud/apc_user_cache
Andreas Fischer [Thu, 25 Jul 2013 01:48:26 +0000 (03:48 +0200)]
Merge pull request #3887 from owncloud/apc_user_cache

The APC User Cache doesn't return the cache_list anymore

* owncloud/apc_user_cache:
  Add ACPu memory cache

11 years agoAdd verbose to autotest phpunit, so we see skipped and incomplete tests.
Andreas Fischer [Thu, 25 Jul 2013 00:43:50 +0000 (02:43 +0200)]
Add verbose to autotest phpunit, so we see skipped and incomplete tests.

11 years agoAdd ACPu memory cache
Bart Visscher [Wed, 24 Jul 2013 19:50:15 +0000 (21:50 +0200)]
Add ACPu memory cache

11 years agoMerge pull request #4183 from owncloud/fix-group-id
icewind1991 [Wed, 24 Jul 2013 18:09:47 +0000 (11:09 -0700)]
Merge pull request #4183 from owncloud/fix-group-id

Fix group id naming fid->gid

11 years agoshow tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js &...
Jörn Friedrich Dreyer [Wed, 24 Jul 2013 16:02:36 +0000 (18:02 +0200)]
show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids

11 years agoforce dbs to stay in one line
Jörn Friedrich Dreyer [Wed, 24 Jul 2013 15:06:52 +0000 (17:06 +0200)]
force dbs to stay in one line

11 years agoMerge pull request #3898 from owncloud/sabre-objecttree
icewind1991 [Wed, 24 Jul 2013 17:46:27 +0000 (10:46 -0700)]
Merge pull request #3898 from owncloud/sabre-objecttree

WebDAV performance improvements

11 years agoMerge pull request #4181 from owncloud/irods-ob
icewind1991 [Wed, 24 Jul 2013 17:11:37 +0000 (10:11 -0700)]
Merge pull request #4181 from owncloud/irods-ob

use output buffering when including the irods libraries

11 years agoMerge pull request #4173 from owncloud/login-cleanup
Jan-Christoph Borchardt [Wed, 24 Jul 2013 17:04:06 +0000 (10:04 -0700)]
Merge pull request #4173 from owncloud/login-cleanup

Login cleanup

11 years agoFix group id naming fid->gid
Bart Visscher [Wed, 24 Jul 2013 15:54:31 +0000 (17:54 +0200)]
Fix group id naming fid->gid

11 years agoupdate 3rdparty repo
Thomas Müller [Wed, 24 Jul 2013 15:29:56 +0000 (17:29 +0200)]
update 3rdparty repo

11 years agoforce dbs to stay in one line
Jörn Friedrich Dreyer [Wed, 24 Jul 2013 15:06:52 +0000 (17:06 +0200)]
force dbs to stay in one line

11 years agomerge master
Jan-Christoph Borchardt [Wed, 24 Jul 2013 14:31:01 +0000 (16:31 +0200)]
merge master

11 years agouse output buffering when including the irods libraries
Robin Appelman [Wed, 24 Jul 2013 14:10:14 +0000 (16:10 +0200)]
use output buffering when including the irods libraries

11 years agoMerge pull request #4175 from owncloud/remember-checked
Jan-Christoph Borchardt [Wed, 24 Jul 2013 14:05:41 +0000 (07:05 -0700)]
Merge pull request #4175 from owncloud/remember-checked

check remember log in by default, ref #3918

11 years agoMerge branch 'master' into sabre-objecttree
Robin Appelman [Wed, 24 Jul 2013 13:53:48 +0000 (15:53 +0200)]
Merge branch 'master' into sabre-objecttree

11 years agoMerge pull request #4177 from owncloud/move_defaults_to_template_constructor
Björn Schießle [Wed, 24 Jul 2013 13:42:52 +0000 (06:42 -0700)]
Merge pull request #4177 from owncloud/move_defaults_to_template_constructor

Move defaults to template constructor

11 years agoMerge pull request #3995 from owncloud/groups
icewind1991 [Wed, 24 Jul 2013 13:13:05 +0000 (06:13 -0700)]
Merge pull request #3995 from owncloud/groups

Refactoring of group management code

11 years agoslight dark inset text shadow for warnings to increase legibility
Jan-Christoph Borchardt [Wed, 24 Jul 2013 10:41:09 +0000 (12:41 +0200)]
slight dark inset text shadow for warnings to increase legibility

11 years agoMerge branch 'master' into remember-checked
Jan-Christoph Borchardt [Wed, 24 Jul 2013 10:26:05 +0000 (12:26 +0200)]
Merge branch 'master' into remember-checked

11 years agouse OC_Defaults directly from the template
Björn Schießle [Wed, 24 Jul 2013 10:04:18 +0000 (12:04 +0200)]
use OC_Defaults directly from the template

11 years agoMerge branch 'master' into move_defaults_to_template_constructor
Björn Schießle [Wed, 24 Jul 2013 09:58:11 +0000 (11:58 +0200)]
Merge branch 'master' into move_defaults_to_template_constructor

11 years agoinitialize OC_Defaults in template constructorX
Björn Schießle [Wed, 24 Jul 2013 09:51:21 +0000 (11:51 +0200)]
initialize OC_Defaults in template constructorX

11 years agoMerge pull request #4176 from owncloud/fixing-broken-master
Thomas Müller [Wed, 24 Jul 2013 09:27:41 +0000 (02:27 -0700)]
Merge pull request #4176 from owncloud/fixing-broken-master

fix php syntax

11 years agofix php syntax
Thomas Müller [Wed, 24 Jul 2013 08:49:33 +0000 (10:49 +0200)]
fix php syntax

11 years agocheck remember log in by default, ref #3918
Jan-Christoph Borchardt [Wed, 24 Jul 2013 08:01:56 +0000 (10:01 +0200)]
check remember log in by default, ref #3918

11 years agoMerge pull request #4171 from owncloud/fix-config
Morris Jobke [Wed, 24 Jul 2013 07:48:43 +0000 (00:48 -0700)]
Merge pull request #4171 from owncloud/fix-config

Fix config

11 years agoMerge pull request #4030 from owncloud/more-themable-strings
Jan-Christoph Borchardt [Wed, 24 Jul 2013 07:36:40 +0000 (00:36 -0700)]
Merge pull request #4030 from owncloud/more-themable-strings

More themable strings

11 years agoMerge branch 'master' into more-themable-strings
Thomas Müller [Wed, 24 Jul 2013 07:35:33 +0000 (09:35 +0200)]
Merge branch 'master' into more-themable-strings

Conflicts:
lib/template.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Jul 2013 05:57:21 +0000 (01:57 -0400)]
[tx-robot] updated from transifex

11 years agoMerge branch 'master' into groups
Thomas Müller [Tue, 23 Jul 2013 23:11:12 +0000 (01:11 +0200)]
Merge branch 'master' into groups

11 years agoMerge branch 'master' into storage-test-cleanup
Thomas Müller [Tue, 23 Jul 2013 23:01:36 +0000 (01:01 +0200)]
Merge branch 'master' into storage-test-cleanup

Conflicts:
tests/lib/files/storage/storage.php

11 years agoMerge pull request #4090 from owncloud/cleanup-some-template-functions
Thomas Müller [Tue, 23 Jul 2013 22:53:43 +0000 (15:53 -0700)]
Merge pull request #4090 from owncloud/cleanup-some-template-functions

Cleanup some template functions

11 years agoMerge branch 'master' into groups
Robin Appelman [Tue, 23 Jul 2013 20:06:03 +0000 (22:06 +0200)]
Merge branch 'master' into groups

11 years agoBring the Noise
Jan-Christoph Borchardt [Tue, 23 Jul 2013 19:33:15 +0000 (21:33 +0200)]
Bring the Noise

11 years agoremove superfluous important
Jan-Christoph Borchardt [Tue, 23 Jul 2013 19:25:07 +0000 (21:25 +0200)]
remove superfluous important

11 years agoMerge pull request #3392 from owncloud/googledrive
Bart Visscher [Tue, 23 Jul 2013 19:23:08 +0000 (12:23 -0700)]
Merge pull request #3392 from owncloud/googledrive

Switch to using Google Drive SDK, closes #2047

11 years agofix browser rendering issues
Jan-Christoph Borchardt [Tue, 23 Jul 2013 16:14:37 +0000 (18:14 +0200)]
fix browser rendering issues

11 years agolarger log in and installation buttons
Jan-Christoph Borchardt [Tue, 23 Jul 2013 15:17:29 +0000 (17:17 +0200)]
larger log in and installation buttons

11 years agobetter whitespace for footer
Jan-Christoph Borchardt [Tue, 23 Jul 2013 15:13:03 +0000 (17:13 +0200)]
better whitespace for footer

11 years agocleaner look and code for primary button
Jan-Christoph Borchardt [Tue, 23 Jul 2013 15:10:36 +0000 (17:10 +0200)]
cleaner look and code for primary button

11 years agoinput fields work on any background now
Jan-Christoph Borchardt [Tue, 23 Jul 2013 15:03:44 +0000 (17:03 +0200)]
input fields work on any background now

11 years agoadd some padding to footer
Jan-Christoph Borchardt [Tue, 23 Jul 2013 14:00:28 +0000 (16:00 +0200)]
add some padding to footer

11 years agoadjust labels and input field groups
Jan-Christoph Borchardt [Tue, 23 Jul 2013 13:47:07 +0000 (15:47 +0200)]
adjust labels and input field groups

11 years agoshorten wording on config directory errors
Jan-Christoph Borchardt [Mon, 22 Jul 2013 13:05:28 +0000 (15:05 +0200)]
shorten wording on config directory errors

11 years agomore beautiful warnings
Jan-Christoph Borchardt [Mon, 22 Jul 2013 12:55:39 +0000 (14:55 +0200)]
more beautiful warnings

11 years agofix and checkstyle for show password toggle
Jan-Christoph Borchardt [Mon, 22 Jul 2013 12:20:32 +0000 (14:20 +0200)]
fix and checkstyle for show password toggle

11 years agoincrease button size, adjust remember checkbox
Jan-Christoph Borchardt [Mon, 22 Jul 2013 11:53:00 +0000 (13:53 +0200)]
increase button size, adjust remember checkbox

11 years agomove log in button CSS to appropriate place
Jan-Christoph Borchardt [Mon, 22 Jul 2013 11:50:35 +0000 (13:50 +0200)]
move log in button CSS to appropriate place

11 years agoadjust text colors for remember and footer
Jan-Christoph Borchardt [Mon, 22 Jul 2013 11:44:26 +0000 (13:44 +0200)]
adjust text colors for remember and footer

11 years agolarger clickable area for remember log in
Jan-Christoph Borchardt [Mon, 22 Jul 2013 11:28:30 +0000 (13:28 +0200)]
larger clickable area for remember log in

11 years agosticky footer
Jan-Christoph Borchardt [Mon, 22 Jul 2013 11:16:01 +0000 (13:16 +0200)]
sticky footer

11 years agoprimary button adjustments
Jan-Christoph Borchardt [Mon, 22 Jul 2013 10:46:46 +0000 (12:46 +0200)]
primary button adjustments

11 years agoinput field adjustments for new full-color background on log in
Jan-Christoph Borchardt [Mon, 22 Jul 2013 10:40:28 +0000 (12:40 +0200)]
input field adjustments for new full-color background on log in

11 years agofix general reset CSS issue which caused gradient background to cut off
Jan-Christoph Borchardt [Mon, 22 Jul 2013 10:01:49 +0000 (12:01 +0200)]
fix general reset CSS issue which caused gradient background to cut off

11 years agorip out unneeded #login div, replace with existing body-login
Jan-Christoph Borchardt [Mon, 22 Jul 2013 09:58:26 +0000 (11:58 +0200)]
rip out unneeded #login div, replace with existing body-login

11 years agoinitial WIP for cleaner log in page
Jan-Christoph Borchardt [Tue, 9 Jul 2013 16:02:51 +0000 (18:02 +0200)]
initial WIP for cleaner log in page

11 years agouse $defaults->getName() as webdav REALM
Jörn Friedrich Dreyer [Tue, 23 Jul 2013 16:14:05 +0000 (18:14 +0200)]
use $defaults->getName() as webdav REALM

11 years agoignore config read failures
Bart Visscher [Tue, 23 Jul 2013 15:38:37 +0000 (17:38 +0200)]
ignore config read failures

11 years agoRevert "fix failing master branch - Test_Config::testWriteData"
Bart Visscher [Tue, 23 Jul 2013 15:36:08 +0000 (17:36 +0200)]
Revert "fix failing master branch - Test_Config::testWriteData"

This reverts commit 8f93490ac45fbd74bd0e9697a685fd43bb34239b.

11 years agoMerge pull request #4150 from owncloud/better-error-handling
Jörn Friedrich Dreyer [Tue, 23 Jul 2013 15:30:02 +0000 (08:30 -0700)]
Merge pull request #4150 from owncloud/better-error-handling

Better error handling

11 years agoMerge pull request #4159 from owncloud/Fixing-share-sj-error
Jörn Friedrich Dreyer [Tue, 23 Jul 2013 15:23:15 +0000 (08:23 -0700)]
Merge pull request #4159 from owncloud/Fixing-share-sj-error

Fixing share JS error

11 years agoRemove root option from Google Drive storage, because it is only used for testing...
Michael Gapczynski [Tue, 23 Jul 2013 14:50:14 +0000 (10:50 -0400)]
Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing

11 years agoCreate an array entry before filling it
Victor Dubiniuk [Mon, 22 Jul 2013 18:02:56 +0000 (21:02 +0300)]
Create an array entry before filling it

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 23 Jul 2013 06:03:19 +0000 (02:03 -0400)]
[tx-robot] updated from transifex

11 years agoMerge pull request #4126 from owncloud/parallel-autotest.sh-master
Thomas Müller [Mon, 22 Jul 2013 21:48:49 +0000 (14:48 -0700)]
Merge pull request #4126 from owncloud/parallel-autotest.sh-master

Parallel autotest.sh master

11 years agoFixed review issues
Bart Visscher [Mon, 22 Jul 2013 21:04:14 +0000 (23:04 +0200)]
Fixed review issues

11 years agoShow generic error when there is no error
Victor Dubiniuk [Mon, 22 Jul 2013 18:02:18 +0000 (21:02 +0300)]
Show generic error when there is no error

11 years agoMerge pull request #4156 from owncloud/fix_oc_image_reference
Andreas Fischer [Mon, 22 Jul 2013 17:19:01 +0000 (19:19 +0200)]
Merge pull request #4156 from owncloud/fix_oc_image_reference

* owncloud/fix_oc_image_reference:
  need to use \OC_Image to escape OCP namespace

11 years agoneed to use \OC_Image to escape OCP namespace
Jörn Friedrich Dreyer [Mon, 22 Jul 2013 15:25:55 +0000 (17:25 +0200)]
need to use \OC_Image to escape OCP namespace

11 years agoMerge pull request #4154 from owncloud/return-ocl10n
Kondou [Mon, 22 Jul 2013 15:05:32 +0000 (08:05 -0700)]
Merge pull request #4154 from owncloud/return-ocl10n

return result from getL10N

11 years agoMerge pull request #4071 from owncloud/fix_return_value_search_principals
VicDeo [Mon, 22 Jul 2013 14:16:47 +0000 (07:16 -0700)]
Merge pull request #4071 from owncloud/fix_return_value_search_principals

OC_Connector_Sabre_Principal::searchPrincipals - return empty array instead of 0

11 years agoreturn result from getL10N
Robin Appelman [Mon, 22 Jul 2013 13:52:02 +0000 (15:52 +0200)]
return result from getL10N

11 years agoMerge branch 'master' into fix_return_value_search_principals
Georg Ehrke [Mon, 22 Jul 2013 13:30:57 +0000 (15:30 +0200)]
Merge branch 'master' into fix_return_value_search_principals

11 years agoMerge pull request #3142 from owncloud/ext-fs-irods-master
Thomas Müller [Mon, 22 Jul 2013 12:16:49 +0000 (05:16 -0700)]
Merge pull request #3142 from owncloud/ext-fs-irods-master

Ext fs irods master

11 years agoMerge pull request #4045 from owncloud/disable-anon-upload-master
Thomas Müller [Mon, 22 Jul 2013 11:04:59 +0000 (04:04 -0700)]
Merge pull request #4045 from owncloud/disable-anon-upload-master

Disable anon upload master

11 years agoMerge branch 'master' into disable-anon-upload-master
Thomas Müller [Mon, 22 Jul 2013 09:55:20 +0000 (11:55 +0200)]
Merge branch 'master' into disable-anon-upload-master

Conflicts:
settings/templates/admin.php

11 years agoMerge branch 'master' into ext-fs-irods-master
Thomas Müller [Mon, 22 Jul 2013 09:40:28 +0000 (11:40 +0200)]
Merge branch 'master' into ext-fs-irods-master

11 years agoMerge branch 'master' into parallel-autotest.sh-master
Thomas Müller [Mon, 22 Jul 2013 09:39:27 +0000 (11:39 +0200)]
Merge branch 'master' into parallel-autotest.sh-master

11 years agoMerge branch 'master' into disable-anon-upload-master
Thomas Müller [Mon, 22 Jul 2013 09:36:52 +0000 (11:36 +0200)]
Merge branch 'master' into disable-anon-upload-master

11 years agoMerge pull request #2980 from owncloud/===_and_!==_in_settings
Morris Jobke [Mon, 22 Jul 2013 09:32:40 +0000 (02:32 -0700)]
Merge pull request #2980 from owncloud/===_and_!==_in_settings

Use !== and === in settings.

11 years agoMerge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
Thomas Müller [Mon, 22 Jul 2013 09:19:27 +0000 (02:19 -0700)]
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3

reworking of \OC\Files\Storage\AmazonS3

11 years agoif the file doesn't exists; create a new one. We use this to create new text files...
Björn Schießle [Fri, 12 Jul 2013 11:25:37 +0000 (13:25 +0200)]
if the file doesn't exists; create a new one. We use this to create new text files in the web interface

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 22 Jul 2013 06:03:23 +0000 (02:03 -0400)]
[tx-robot] updated from transifex

11 years agoOnly display call trace in debug mode
Bart Visscher [Sun, 21 Jul 2013 20:56:21 +0000 (22:56 +0200)]
Only display call trace in debug mode

11 years agoIn debug mode uncaught exceptions should display a nice page
Bart Visscher [Sun, 21 Jul 2013 20:40:35 +0000 (22:40 +0200)]
In debug mode uncaught exceptions should display a nice page

11 years agoDRY use OC_Template::printErrorPage
Bart Visscher [Sun, 21 Jul 2013 20:30:32 +0000 (22:30 +0200)]
DRY use OC_Template::printErrorPage

11 years agoChange exit calls to throwing an exception
Bart Visscher [Sun, 21 Jul 2013 20:29:50 +0000 (22:29 +0200)]
Change exit calls to throwing an exception

This way the error won't be fatal in a unit test

11 years agoChange to use !== and ===
Bart Visscher [Fri, 19 Jul 2013 15:40:07 +0000 (17:40 +0200)]
Change to use !== and ===

11 years agofixing typos, PHPDoc and missing namespace \
Thomas Müller [Wed, 17 Jul 2013 21:27:25 +0000 (23:27 +0200)]
fixing typos, PHPDoc and missing namespace \