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
|
5f4132d6ba
|
more fixes
|
2012-05-31 21:16:36 +02:00 |
|
Frank Karlitschek
|
57a56299d8
|
more fixes
i don´t understand why this worked before.
|
2012-05-31 21:10:03 +02:00 |
Michael Gapczynski
|
35bd601215
|
Fix check for when to store a new version of a file
|
2012-05-18 22:27:43 -04:00 |
|
Michael Gapczynski
|
89f5701d1a
|
Fix versioning of shared files
|
2012-05-18 22:07:48 -04: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
|
fefa4412c4
|
added phpdoc comment
|
2012-05-16 15:17:51 +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 |
Klaas Freitag
|
1fc74ea174
|
Add ctmp extension to blacklist to make sync test files not versioned.
|
2012-05-14 10:51:41 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
|
Frank Karlitschek
|
70cea18cce
|
ported getUser
|
2012-05-01 18:50:31 +02:00 |
|
Frank Karlitschek
|
f425b80deb
|
one todo less
|
2012-04-30 19:21:29 +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
|
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 |