summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into oc_previewThomas Müller2013-07-301950-29266/+107570
|\ | | | | | | | | | | Conflicts: 3rdparty lib/template.php
| * Merge pull request #4213 from owncloud/scanning-performanceicewind19912013-07-291-3/+4
| |\ | | | | | | Cache: don't check if the parent exists in the cache if we are already sure it does
| | * better variable namingRobin Appelman2013-07-291-3/+3
| | |
| | * Cache: don't check if the parent exists in the cache if we are already sure ↵Robin Appelman2013-07-271-3/+4
| | | | | | | | | | | | it does
| * | Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-299-50/+135
| |\ \ | | | | | | | | Trashbin improvements
| | * | remove whitespacesBjoern Schiessle2013-07-291-1/+1
| | | |
| | * | reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-262-3/+3
| | | |
| | * | found some more places where we can disable buttons while performing a actionBjörn Schießle2013-07-261-6/+18
| | | |
| | * | Hide Delete Permanently button when Restore happensBjörn Schießle2013-07-261-0/+4
| | | |
| | * | make 'restored' extension translatableBjörn Schießle2013-07-261-2/+3
| | | |
| | * | fix typoBjörn Schießle2013-07-261-1/+1
| | | |
| | * | expire trash bin if trash bin exceeds max size after a new file was added to ↵Björn Schießle2013-07-262-7/+34
| | | | | | | | | | | | | | | | ownCloud
| | * | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-266-7/+36
| | | |
| | * | don't move empty folders to the trash binBjörn Schießle2013-07-251-0/+5
| | | |
| | * | nicer format of unique names, use 'file (restored).txt' instead of ↵Björn Schießle2013-07-251-32/+39
| | | | | | | | | | | | | | | | 'files.txt.restored'
| * | | Merge pull request #4216 from owncloud/clean_php55_opcacheThomas Müller2013-07-291-0/+4
| |\ \ \ | | | | | | | | | | Also clean PHP 5.5 opcache
| | * | | Also clean PHP 5.5 opcachekondou2013-07-281-0/+4
| | | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2932-88/+135
| | | | |
| * | | | Merge pull request #4218 from owncloud/newdataicewind19912013-07-281-3/+3
| |\ \ \ \ | | | | | | | | | | | | Fix potential undefined variable in Scanner
| | * | | | Move check so the variable will never be undefinedMichael Gapczynski2013-07-281-3/+3
| |/ / / /
| * / / / [tx-robot] updated from transifexJenkins for ownCloud2013-07-28169-427/+572
| |/ / /
| * | / [tx-robot] updated from transifexJenkins for ownCloud2013-07-27647-17134/+15201
| | |/ | |/|
| * | Merge pull request #4199 from owncloud/login-cleanupJörn Friedrich Dreyer2013-07-261-0/+21
| |\ \ | | | | | | | | Login cleanup IE8 fixes
| | * | IE8 login/install screen cleartype fixes and input box bordersJörn Friedrich Dreyer2013-07-261-0/+21
| | | |
| | * | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| | | |
| * | | Merge pull request #4093 from owncloud/storage-test-cleanupBart Visscher2013-07-261-50/+3
| |\ \ \ | | | | | | | | | | Remove outdated unit tests for storage backend
| | * \ \ Merge branch 'master' into storage-test-cleanupThomas Müller2013-07-241447-13959/+89742
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/storage/storage.php
| | * | | | Storage: remove some unneeded strict tests of mtime behaviourRobin Appelman2013-07-161-21/+2
| | | | | |
| | * | | | Storage: remove tests for searchRobin Appelman2013-07-161-29/+1
| | | | | |
| * | | | | functions in OCP should be staticRobin Appelman2013-07-251-1/+1
| | | | | |
| * | | | | Merge pull request #4184 from owncloud/login_cleanup_oracleblizzz2013-07-253-32/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | Login cleanup oracle
| | * | | | | show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary ↵Jörn Friedrich Dreyer2013-07-242-31/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | js & html ids
| | * | | | | force dbs to stay in one lineJörn Friedrich Dreyer2013-07-241-1/+1
| | | | | | |
| * | | | | | Merge pull request #4191 from owncloud/autotest-show-skipped-testsJörn Friedrich Dreyer2013-07-251-0/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Add verbose to autotest phpunit, so we see skipped and incomplete tests.
| | * | | | | Add verbose to autotest phpunit, so we see skipped and incomplete tests.Andreas Fischer2013-07-251-0/+1
| | | | | | |
| * | | | | | new version drop downBjörn Schießle2013-07-259-211/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge pull request #3887 from owncloud/apc_user_cacheAndreas Fischer2013-07-254-1/+55
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The APC User Cache doesn't return the cache_list anymore * owncloud/apc_user_cache: Add ACPu memory cache
| | * | | | | Add ACPu memory cacheBart Visscher2013-07-244-1/+55
| | | | | | |
| * | | | | | Merge pull request #4183 from owncloud/fix-group-idicewind19912013-07-241-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Fix group id naming fid->gid
| | * | | | | Fix group id naming fid->gidBart Visscher2013-07-241-1/+1
| | |/ / / /
| * | | | | Merge pull request #3898 from owncloud/sabre-objecttreeicewind19912013-07-243-4/+106
| |\ \ \ \ \ | | | | | | | | | | | | | | WebDAV performance improvements
| | * \ \ \ \ Merge branch 'master' into sabre-objecttreeRobin Appelman2013-07-241919-23655/+108991
| | |\ \ \ \ \
| | * | | | | | style fixRobin Appelman2013-07-191-1/+1
| | | | | | | |
| | * | | | | | improved copy operation for objecttreeRobin Appelman2013-06-301-0/+29
| | | | | | | |
| | * | | | | | use new ObjectTree in sabredavRobin Appelman2013-06-301-3/+4
| | | | | | | |
| | * | | | | | improved move operation for sabre's objecttreeRobin Appelman2013-06-301-0/+24
| | | | | | | |
| | * | | | | | make use of the fact that rmdir is already recursiveRobin Appelman2013-06-301-1/+0
| | | | | | | |
| | * | | | | | overwrite Sabre_DAV_ObjectTree with a faster getNodeForPathRobin Appelman2013-06-301-0/+49
| | | | | | | |
| * | | | | | | Merge pull request #4181 from owncloud/irods-obicewind19912013-07-241-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use output buffering when including the irods libraries
| | * | | | | | | use output buffering when including the irods librariesRobin Appelman2013-07-241-0/+2
| | | |/ / / / / | | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 01:07:14 +0000