summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-131-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-101-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-071-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-051-1/+1
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-031-0/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-271-0/+3
|
* kill zh_CN.GB2312Thomas Müller2013-08-271-10/+0
|
* Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-201-5/+5
|\ | | | | Fix some JSLint warnings
| * Merge branch 'master' into fix_jslint_kondoukondou2013-08-1857-89/+229
| |\ | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | Fix some JSLint warningskondou2013-07-311-5/+5
| | |
* | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-181-7/+8
|\ \ \ | | | | | | | | Enable user to decrypt files again after encryption app was disabled
| * \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1757-71/+216
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | | | check if app is enabledBjoern Schiessle2013-07-301-7/+8
| | | | |
* | | | | Add _many_ newlines at the end of fileskondou2013-08-182-2/+2
| |_|_|/ |/| | |
* | | | Merge pull request #4427 from owncloud/fix_4425Morris Jobke2013-08-171-9/+21
|\ \ \ \ | | | | | | | | | | use OC files API to create missing directory
| * | | | switched to dirname()Bjoern Schiessle2013-08-171-1/+1
| | | | |
| * | | | added missing parameter documentationBjoern Schiessle2013-08-171-1/+2
| | | | |
| * | | | added createMissingDirectories() methodBjoern Schiessle2013-08-171-26/+27
| | | | |
| * | | | also create root dir if it doesn't exist yetBjoern Schiessle2013-08-141-6/+13
| | | | |
| * | | | use OC files API to create missing directory which should handle special ↵Bjoern Schiessle2013-08-141-4/+7
| | | | | | | | | | | | | | | | | | | | chars in every environment correctly
* | | | | Merge pull request #4481 from owncloud/fix_versioning_size_checkBjörn Schießle2013-08-171-10/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | first check if file exists before checking the files size
| * | | | first check if file exists before checking the files sizeBjoern Schiessle2013-08-171-10/+9
| | | | |
* | | | | Merge pull request #4480 from owncloud/remove-ru_RU-masterThomas Müller2013-08-171-5/+0
|\ \ \ \ \ | | | | | | | | | | | | remove ru_RU - fixes #3135
| * | | | | remove ru_RU - fixes #3135Thomas Müller2013-08-171-5/+0
| |/ / / /
* | | | | Merge pull request #4193 from owncloud/versions_fix_cssMorris Jobke2013-08-172-9/+6
|\ \ \ \ \ | |/ / / / |/| | | | Versions fix css
| * | | | increase width of versions dialogBjoern Schiessle2013-08-171-0/+4
| | | | |
| * | | | css for button no longer neededBjörn Schießle2013-07-251-3/+0
| | | | |
| * | | | remove unused code; use jqueryBjörn Schießle2013-07-251-6/+2
| | | | |
| * | | | fix cssBjörn Schießle2013-07-251-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-162-3/+7
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-132-0/+6
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0953-53/+165
| | | |
* | | | Merge pull request #4243 from owncloud/no_empty_versionsBjörn Schießle2013-08-081-2/+5
|\ \ \ \ | | | | | | | | | | don't create empty versions
| * | | | don't create empty versionsBjoern Schiessle2013-07-301-2/+5
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-071-0/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-041-0/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-012-0/+6
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-303-0/+9
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-293-0/+7
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2825-21/+61
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2746-315/+48
|/
* 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
* fix array access and change variable names according to the coding styleBjörn Schießle2013-07-121-11/+13
|
* continue cleaning-up old versions if availableSpace=0. It's not necessary ↵Björn Schießle2013-07-121-1/+1
| | | | but gives us some additional free space, especially in the case of a hard quota
* fix some var names according to our style guideBjörn Schießle2013-07-121-7/+7
|
* adjust commentsBjörn Schießle2013-07-121-1/+1
|
* fix typo in commentBjörn Schießle2013-07-121-1/+1
|
* also expire versions on rename, to update the history more regularlyBjörn Schießle2013-07-121-0/+2
|
* it is enough to call the expire function onceBjörn Schießle2013-07-121-6/+1
|
* call expire function before writing the new version to make sure to have ↵Björn Schießle2013-07-121-63/+96
| | | | enough free space