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 |
Frank Karlitschek
|
a945fa10a6
|
update copyright
|
2012-05-26 19:14:24 +02:00 |
Robin Appelman
|
4ccfd27fa2
|
fix versioning for movable apps
|
2012-05-17 01:53:23 +02:00 |
Sam Tuke
|
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 |
|
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 |
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
Sam Tuke
|
d98d72aa99
|
improved url generation - made use of OC.linkTo() for linking to versions history page
|
2012-05-11 17:13:58 +01:00 |
|
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
|
Frank Karlitschek
|
31e32e3c10
|
ported checkLoggedIn and checkAdmin
|
2012-05-01 22:59:38 +02:00 |
|
Frank Karlitschek
|
e2fb094693
|
some more porting
|
2012-05-01 21:07:08 +02:00 |
|
Frank Karlitschek
|
e8ec999090
|
port to use the new public api
|
2012-05-01 09:49:22 +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
|
18a024e251
|
started implementing ajax file rollback
|
2012-04-26 18:45:17 +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 |
|
Sam Tuke
|
c00762b49b
|
added dropdown js menu for file versions, improved readability of history.php
|
2012-04-25 17:37:45 +01:00 |
|
Sam Tuke
|
81f549baee
|
made code a little more readable
|
2012-04-25 13:51:08 +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 |