wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4602 commits 157 branches 562 tags 714 MiB
Commit graph

54 commits

Author SHA1 Message Date
Frank Karlitschek
7e931575b4 comment out non working code 2012-06-05 09:28:51 +02:00
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
Bart Visscher
a33f580db1 Remove OC_App::register function 
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
 2012-05-31 13:01:30 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Sam Tuke
27f7dae932 removed closing php tag 2012-05-22 13:42:55 +01: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
f750da1802 Fix revert link on history page of file versions 2012-05-18 22:07:48 -04:00
Michael Gapczynski
89f5701d1a Fix versioning of shared files 2012-05-18 22:07:48 -04:00
Michael Gapczynski
ea7456a06a Forgot to actually call remove on the history dropdown 2012-05-18 10:53:58 -04:00
Michael Gapczynski
fcb4d2aaee Remove the history dropdown before creating a new one 2012-05-18 10:42:49 -04:00
Michael Gapczynski
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
Frank Karlitschek
9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Georg Ehrke
73a72054a3 fix call of all versions page 2012-05-18 12:00:35 +02:00
Michael Gapczynski
5b42325b01 History dropdown clean-up 2012-05-17 18:57:52 -04:00
Tom Needham
74d49920f2 Close history dropdown on success. Avoids confusion. 2012-05-17 21:22:48 +00:00
Robin Appelman
bfdb374a2c allow reverting file from history dropdown 2012-05-17 02:16:33 +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
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
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
Robin Appelman
6779f28af4 cache app types during install or update 2012-05-14 22:49:31 +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
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
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
1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Frank Karlitschek
9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Frank Karlitschek
43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Robin Appelman
4ba527625f don't try to register file actions when we're not in the files app 2012-05-02 23:26:57 +02:00
Frank Karlitschek
8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek
2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +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
1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Frank Karlitschek
70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek
e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Frank Karlitschek
e409e7cd4c forgot a file 2012-05-01 09:38:10 +02:00
Frank Karlitschek
f425b80deb one todo less 2012-04-30 19:21:29 +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
Frank Karlitschek
b862c49ae6 enable by default. at least during oC4 testing 2012-04-29 21:18:28 +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
b19fae392b linked more button to history page 2012-04-26 13:54:38 +01:00
Sam Tuke
02c1127de3 changed function name to avoid clash with sharing dropdown 2012-04-26 13:41:22 +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