41c6c44221
Disable versions app JS in public mode
...
Since the version JS code isn't used in public link mode, disable it to
prevent Chrome freezing bugs due to the t() call being synchronous.
Fixes #4545
2013-10-17 21:04:18 +02:00
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
e5b0c1e78b
remove unused code; use jquery
2013-07-25 11:15:24 +02:00
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 b91c682a94c55b
2013-07-25 10:35:19 +02:00
a319fa8d47
Fix window.location mistakes in previous code
...
Sorry guys, I commit the incomplete code. It should be window.location.assign(url);
However this is just tested in google chrome.
2013-02-28 11:26:42 +08:00
9b220d0b93
rename History to Versions
2013-02-27 15:46:49 +01:00
d9e75c2b92
remove admin settings for versions
2013-02-27 15:44:02 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
94e5de8fd0
Update apps/files_versions/js/versions.js
...
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
2013-02-20 11:14:24 +08:00
a7bb4b128f
personal settings removed, there is no need to expire versions manually
2012-12-17 13:34:17 +01:00
c1a0e809bf
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 15:50:17 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
e45f36c2d4
Sanitize user input
2012-10-12 14:09:58 +02:00
4a712bdd48
only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down
2012-10-10 13:46:51 +02:00
f29f1cad1d
Prevent Versions click handler from closing sharing dropdown
2012-10-09 13:00:33 +03:00
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
9bfdf47cd4
Fixed bug oc-1659 - history dialogue cannot be closed once opened
2012-09-12 14:10:12 +01:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
d5237c42bc
Util::formatDate() expect $timestamp as double
2012-06-27 15:05:40 +02:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
ea7456a06a
Forgot to actually call remove on the history dropdown
2012-05-18 10:53:58 -04:00
fcb4d2aaee
Remove the history dropdown before creating a new one
2012-05-18 10:42:49 -04:00
122d1efecf
Don't show the select form in the history dropdown if a file has no other versions
2012-05-18 10:39:43 -04:00
73a72054a3
fix call of all versions page
2012-05-18 12:00:35 +02:00
5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
d98d72aa99
improved url generation - made use of OC.linkTo() for linking to versions history page
2012-05-11 17:13:58 +01:00
03fad97764
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-11 13:17:37 +01:00
4ba527625f
don't try to register file actions when we're not in the files app
2012-05-02 23:26:57 +02:00
b20b30b6fe
Implement a basic versioning configuration. Only a on/off switch for now.
...
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
2012-04-30 19:18:00 +02:00
80c850d018
added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts
2012-04-27 13:19:16 +01:00
18a024e251
started implementing ajax file rollback
2012-04-26 18:45:17 +01:00
c693ee2adb
added available version names to files dropdown menu via new ajax script
2012-04-26 16:48:43 +01:00
b19fae392b
linked more button to history page
2012-04-26 13:54:38 +01:00
02c1127de3
changed function name to avoid clash with sharing dropdown
2012-04-26 13:41:22 +01:00
c00762b49b
added dropdown js menu for file versions, improved readability of history.php
2012-04-25 17:37:45 +01:00
a3dff248a1
fixed path to history script
2012-04-25 14:27:55 +01:00
8ae1430090
added script and loaded it for adding history button
2012-04-25 13:56:43 +01:00
4ea927a798
wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing.
2012-04-23 23:54:49 +02:00
Vincent Petry
Bjoern Schiessle
kondou
maelzx
Bart Visscher
Lukas Reschke
VicDeo
scambra
Sam Tuke
Jörn Friedrich Dreyer
Michael Gapczynski
Michael Gapczynski
Georg Ehrke
Tom Needham
Robin Appelman
Sam Tuke
Frank Karlitschek
Sam Tuke
Frank Karlitschek