Bart Visscher
|
ceec5e593c
|
Remove redundant loadApps
|
2012-09-07 16:19:08 +02:00 |
|
Bart Visscher
|
5eba579827
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
|
2012-09-07 15:51:44 +02:00 |
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
|
Bart Visscher
|
785aa751bb
|
Whitespace fixes
|
2012-09-07 14:10:43 +02:00 |
|
Bart Visscher
|
285c198c36
|
EOL fixes
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
|
2012-09-07 14:10:00 +02:00 |
|
Bart Visscher
|
5e55b4d6e7
|
Whitespace fixes in lib
|
2012-09-07 14:08:29 +02:00 |
|
Bart Visscher
|
386d1ac49f
|
Fix setEtagHeader function
|
2012-09-07 13:42:22 +02:00 |
|
Bart Visscher
|
cd4b8dbacd
|
Change caching checks for minimized files
Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
|
2012-09-07 13:42:22 +02:00 |
|
Bart Visscher
|
ff42da58b9
|
Global file cache should also be able to clear with prefix
|
2012-09-07 13:42:22 +02:00 |
|
Bart Visscher
|
9ea7817a40
|
Remove core.{css,js} cache on upgrade
|
2012-09-07 13:42:22 +02:00 |
Michael Gapczynski
|
73d726d1b2
|
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
|
2012-09-07 00:02:22 -04:00 |
|
Michael Gapczynski
|
17dadd5c8a
|
Don't show the delete all action if delete permission is not granted
|
2012-09-07 00:02:22 -04:00 |
|
Jenkins for ownCloud
|
a94b56b57b
|
[tx-robot] updated from transifex
|
2012-09-07 02:07:22 +02:00 |
Frank Karlitschek
|
294cff27a7
|
add check for zlib
|
2012-09-07 01:39:11 +02:00 |
Robin Appelman
|
d4fd47d43f
|
clear user filecache after the user mount configuration has changed
|
2012-09-06 23:14:43 +02:00 |
|
Robin Appelman
|
2144b2f37a
|
clear the filecache if the mount configuration has changed
|
2012-09-06 23:10:33 +02:00 |
|
Bart Visscher
|
39577495e1
|
Add a directory separator to filter app directories with the same
prefix.
Fixes: oc-1663
|
2012-09-06 22:27:56 +02:00 |
|
Michael Gapczynski
|
d936590f77
|
Don't pass content for a new text file from UI, fixes bug oc-1660
|
2012-09-06 16:01:51 -04:00 |
Jan-Christoph Borchardt
|
90462b2dcf
|
make icons look good on bright and dark backgrounds
|
2012-09-06 13:47:07 +02:00 |
|
Michael Gapczynski
|
837eb1871d
|
Don't delete the file anymore to replace it in the UI, just overwrite it
|
2012-09-05 22:13:50 -04:00 |
|
Michael Gapczynski
|
a5211e31bc
|
Add permissions to new files/folders, bug fix for oc-1649
|
2012-09-05 21:47:09 -04:00 |
|
Jenkins for ownCloud
|
af3e767489
|
[tx-robot] updated from transifex
|
2012-09-06 02:06:37 +02:00 |
|
Thomas Mueller
|
ebb28412ca
|
no more require_once()
|
2012-09-05 23:28:59 +02:00 |
|
Thomas Mueller
|
daf41885e5
|
jquery added to ignorelist for l10n
|
2012-09-05 22:53:48 +02:00 |
|
Bart Visscher
|
e0db35fac0
|
Fix name for OCCategories
|
2012-09-05 22:26:09 +02:00 |
|
Bart Visscher
|
a8de0af273
|
Add 'var' before some global js vars
|
2012-09-05 22:26:09 +02:00 |
|
Bart Visscher
|
9329af921d
|
Add missing ; to js code
|
2012-09-05 22:26:09 +02:00 |
|
Robin Appelman
|
9f1c76beef
|
fix running test cases in multiply app dirs
|
2012-09-05 19:42:26 +02:00 |
|
Robin Appelman
|
aa8cee1afa
|
I don't think this file was meant to be commited
|
2012-09-05 19:42:26 +02:00 |
Brice Maron
|
5fc4c78106
|
Merge branch 'master' of git://github.com/owncloud/core
|
2012-09-05 16:16:36 +00:00 |
|
Brice Maron
|
a928b4cd66
|
Add more language name instead of codes for the setting choice
|
2012-09-05 16:16:19 +00:00 |
Thomas Tanghus
|
e2ead7db86
|
Changed oc_preferences configvalue back to clob as it will give us bug reports in calendar, contacts and tasks if less.
|
2012-09-05 17:22:03 +02:00 |
|
Thomas Tanghus
|
f2fd228801
|
Revert commit 8cf0e853686a5c4f9f082d8e47832277f50ea6c0.
|
2012-09-05 17:22:03 +02:00 |
|
Thomas Tanghus
|
1edab438d1
|
Added possibility to get permissions for shared item with ajax call.
|
2012-09-05 17:22:03 +02:00 |
|
Thomas Tanghus
|
a2b6a92107
|
Disable asking to save password when adding users.
|
2012-09-05 17:22:03 +02:00 |
|
Thomas Müller
|
24977d0fd0
|
Respect coding style
|
2012-09-05 15:49:42 +03:00 |
|
Thomas Müller
|
e5cb638c09
|
Respect coding style
|
2012-09-05 15:42:06 +03:00 |
|
Thomas Müller
|
d5fd5cd584
|
Respect coding style
|
2012-09-05 15:40:21 +03:00 |
|
Thomas Müller
|
9eccc0121a
|
Respect coding style
|
2012-09-05 13:22:38 +03:00 |
|
Michael Gapczynski
|
a26ea6d65c
|
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
|
2012-09-05 00:12:25 -04:00 |
|
Jenkins for ownCloud
|
e8fcc71129
|
[tx-robot] updated from transifex
|
2012-09-05 02:05:39 +02:00 |
|
Thomas Mueller
|
685f03edf6
|
fixing translation - thx eMerzh
|
2012-09-04 23:49:43 +02:00 |
|
Thomas Mueller
|
66c2a391cb
|
underline link to the app store
|
2012-09-04 23:42:49 +02:00 |
|
Thomas Mueller
|
02f9de55a3
|
add translation string
|
2012-09-04 23:42:49 +02:00 |
|
Thomas Mueller
|
1e2d582123
|
fixing button to add additional site
|
2012-09-04 23:42:49 +02:00 |
|
Bart Visscher
|
f188f6cc2f
|
Fix some jslint warnings
|
2012-09-04 21:27:37 +02:00 |
|
Bart Visscher
|
41f135daee
|
Remove () from return statement
|
2012-09-04 21:27:36 +02:00 |
|
Thomas Mueller
|
ae8d2d029f
|
Adding missing translation
|
2012-09-04 20:48:10 +02:00 |
|
Thomas Müller
|
69ee842521
|
Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617
|
2012-09-04 17:13:34 +03:00 |
Georg Ehrke
|
745f279fbc
|
make use of OC_User::getHome in files_external app
|
2012-09-04 15:56:00 +02:00 |