Commit Graph

12686 Commits

Author SHA1 Message Date
Michael Gapczynski 1faac6108c Use query to calculate folder size 2013-07-29 10:22:44 -04:00
Victor Dubiniuk 97f2c393c1 Allow apps to have own 404 content, closes #3225 2013-07-29 16:54:19 +03:00
Thomas Müller 954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache
Also clean PHP 5.5 opcache
2013-07-29 04:40:01 -07:00
Jenkins for ownCloud 0fde473cb7 [tx-robot] updated from transifex 2013-07-29 01:57:04 -04:00
Jörn Friedrich Dreyer b8bd1e5a81 check type, assertgreaterthan 2013-07-29 02:17:09 +02:00
Jörn Friedrich Dreyer 05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Jörn Friedrich Dreyer 7e5ae8d780 test lastinsertid 2013-07-29 01:57:30 +02:00
icewind1991 3d76530628 Merge pull request #4218 from owncloud/newdata
Fix potential undefined variable in Scanner
2013-07-28 16:31:48 -07:00
Michael Gapczynski dd4e33fe6b Fix calculating size for empty folders 2013-07-28 16:14:49 -04:00
Michael Gapczynski c8e60900fc Move check so the variable will never be undefined 2013-07-28 15:32:48 -04:00
kondou 8cd671c207 Also clean PHP 5.5 opcache 2013-07-28 16:33:03 +02:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Robin Appelman e1e7b6a940 Cache: don't check if the parent exists in the cache if we are already sure it does 2013-07-27 11:36:27 +02:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Robin Appelman 59bdba9bac fix scanner hooks, cant use inside closures in php 5.3 2013-07-26 15:43:10 +02:00
Björn Schießle 0a9bb8ba73 reduce time for auto expire to 30 days by default 2013-07-26 15:15:47 +02:00
Björn Schießle efd8ad6696 found some more places where we can disable buttons while performing a action 2013-07-26 14:54:27 +02:00
Jörn Friedrich Dreyer 98e76b8978 Merge pull request #4199 from owncloud/login-cleanup
Login cleanup IE8 fixes
2013-07-26 05:15:02 -07:00
Björn Schießle 9d24b9c7e8 Hide Delete Permanently button when Restore happens 2013-07-26 13:17:09 +02:00
Bart Visscher e4132a61c9 Merge pull request #4093 from owncloud/storage-test-cleanup
Remove outdated unit tests for storage backend
2013-07-26 03:18:39 -07:00
Björn Schießle a5d9b985c3 make 'restored' extension translatable 2013-07-26 12:01:45 +02:00
Björn Schießle 3354249691 fix typo 2013-07-26 11:51:18 +02:00
Björn Schießle 0182a503a6 expire trash bin if trash bin exceeds max size after a new file was added to ownCloud 2013-07-26 11:45:38 +02:00
Björn Schießle a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
Jörn Friedrich Dreyer a0f574ccd7 IE8 login/install screen cleartype fixes and input box borders 2013-07-26 10:00:07 +02:00
Björn Schießle 96e175ffbf don't move empty folders to the trash bin 2013-07-25 16:27:40 +02:00
Björn Schießle bf668eb14f nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored' 2013-07-25 16:20:06 +02:00
Robin Appelman 1b50154c95 functions in OCP should be static 2013-07-25 15:25:17 +02:00
blizzz 63d55fdde5 Merge pull request #4184 from owncloud/login_cleanup_oracle
Login cleanup oracle
2013-07-25 03:37:40 -07:00
Jörn Friedrich Dreyer 9762a4dd95 Merge pull request #4191 from owncloud/autotest-show-skipped-tests
Add verbose to autotest phpunit, so we see skipped and incomplete tests.
2013-07-25 03:14:43 -07:00
Björn Schießle 9394fc5d4a 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
2013-07-25 10:35:19 +02:00
Andreas Fischer 75e93d041d 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
2013-07-25 03:48:26 +02:00
Andreas Fischer 763afa5064 Add verbose to autotest phpunit, so we see skipped and incomplete tests. 2013-07-25 02:43:50 +02:00
Bart Visscher 25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
icewind1991 ff86b6f134 Merge pull request #4183 from owncloud/fix-group-id
Fix group id naming fid->gid
2013-07-24 11:09:47 -07:00
Jörn Friedrich Dreyer 284fb86258 show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids 2013-07-24 19:56:57 +02:00
Jörn Friedrich Dreyer 18c565666e force dbs to stay in one line 2013-07-24 19:56:57 +02:00
icewind1991 1986416248 Merge pull request #3898 from owncloud/sabre-objecttree
WebDAV performance improvements
2013-07-24 10:46:27 -07:00
icewind1991 9f01d00c65 Merge pull request #4181 from owncloud/irods-ob
use output buffering when including the irods libraries
2013-07-24 10:11:37 -07:00
Jan-Christoph Borchardt 4b8e464f01 Merge pull request #4173 from owncloud/login-cleanup
Login cleanup
2013-07-24 10:04:06 -07:00
Bart Visscher 4e3bfd8ddd Fix group id naming fid->gid 2013-07-24 17:54:31 +02:00
Thomas Müller 9a97875977 update 3rdparty repo 2013-07-24 17:29:56 +02:00
Jörn Friedrich Dreyer 5c00804c61 force dbs to stay in one line 2013-07-24 17:06:52 +02:00
Jan-Christoph Borchardt 9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Robin Appelman 79832e9382 use output buffering when including the irods libraries 2013-07-24 16:10:14 +02:00
Jan-Christoph Borchardt 876309a215 Merge pull request #4175 from owncloud/remember-checked
check remember log in by default, ref #3918
2013-07-24 07:05:41 -07:00
Robin Appelman ad266a4253 Merge branch 'master' into sabre-objecttree 2013-07-24 15:53:48 +02:00
Björn Schießle 651479322b Merge pull request #4177 from owncloud/move_defaults_to_template_constructor
Move defaults to template constructor
2013-07-24 06:42:52 -07:00
icewind1991 98858e6f00 Merge pull request #3995 from owncloud/groups
Refactoring of group management code
2013-07-24 06:13:05 -07:00
Jan-Christoph Borchardt aae26ef5e5 slight dark inset text shadow for warnings to increase legibility 2013-07-24 12:41:09 +02:00