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 |
Michael Gapczynski
|
cbfbbe672c
|
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
apps/files/templates/index.php
|
2012-05-17 15:38:28 -04:00 |
|
Michael Gapczynski
|
6673375eeb
|
No multiple file sharing in this next release, sharing UI isn't ready for it :(
|
2012-05-15 11:45:59 -04:00 |
Sam Tuke
|
2ad6b5048e
|
fixed 'delete' label so it doesn't break translations
|
2012-05-15 16:24:06 +01:00 |
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
Jan-Christoph Borchardt
|
d1e5a56bc6
|
fixing upload icon color
|
2012-05-10 21:40:22 +02:00 |
Vitaly Kuznetsov
|
6f981738bb
|
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
|
2012-05-10 09:10:53 +00:00 |
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
|
Frank Karlitschek
|
e48f511606
|
port linkto and serverHost
|
2012-05-01 23:19:39 +02:00 |
|
Frank Karlitschek
|
1a2bbd2ee4
|
ported addSyript and other small stuff
|
2012-05-01 20:03:41 +02:00 |
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
3b9d283245
|
fix path in apps/files/templats/index.php
|
2012-04-23 16:25:07 +02:00 |
|
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Georg Ehrke
|
45de7ad221
|
move files to app folder
|
2012-04-18 17:27:34 +02:00 |