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 |
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Bart Visscher
|
9a66b869c0
|
Gallery: Use App storage instead of contructing our own path
|
2012-05-10 09:14:27 +02:00 |
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Frank Karlitschek
|
351740601a
|
port oc_response
|
2012-05-03 10:46:27 +02:00 |
|
Frank Karlitschek
|
8e99475886
|
first part of the config stuff
|
2012-05-02 13:28:56 +02:00 |
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
Bartek Przybylski
|
afcf965498
|
fixup: sharing gallery for loggedin users fail
|
2012-03-24 18:40:27 +01:00 |
|
Bartek Przybylski
|
cbdcb68c2b
|
gallery sharing, experimental version
|
2012-03-24 18:35:42 +01:00 |