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 |
Robin Appelman
|
bfdb374a2c
|
allow reverting file from history dropdown
|
2012-05-17 02:16:33 +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
|
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
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02: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
|
70cea18cce
|
ported getUser
|
2012-05-01 18:50:31 +02:00 |
|
Frank Karlitschek
|
e409e7cd4c
|
forgot a file
|
2012-05-01 09:38:10 +02: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 |