Commit Graph

13 Commits

Author SHA1 Message Date
Bart Visscher 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
Michael Gapczynski f750da1802 Fix revert link on history page of file versions 2012-05-18 22:07:48 -04:00
Sam Tuke c0df40084a added recognition of which version is 'current' - which is currently live and in use on history page 2012-05-16 15:00:36 +01:00
Sam Tuke 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
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Sam Tuke 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
Frank Karlitschek 8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek 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
Sam Tuke 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
Sam Tuke c693ee2adb added available version names to files dropdown menu via new ajax script 2012-04-26 16:48:43 +01:00
Sam Tuke 6312067ab5 improved styling, called css file in history.php 2012-04-26 14:32:29 +01:00
Frank Karlitschek 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