Jörn Friedrich Dreyer
|
bb56581192
|
add php-doc
|
2012-11-12 13:04:00 +01:00 |
Jörn Friedrich Dreyer
|
43bfabf68f
|
add bmp support
|
2012-11-12 13:04:00 +01:00 |
blizzz
|
e0fdb8272b
|
Merge pull request #371 from butonic/sql_and_error_log_fixes
add missing sql backticks, check sharing for error and add log
|
2012-11-12 03:37:43 -08:00 |
Jörn Friedrich Dreyer
|
ba91f9a237
|
add missing sql backticks, check sharing for error and add log
|
2012-11-12 12:04:46 +01:00 |
Jörn Friedrich Dreyer
|
bbef5b377e
|
add i18n for cancel button
|
2012-11-12 10:52:28 +01:00 |
Thomas Tanghus
|
82e010c51c
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-11-12 00:37:40 +01:00 |
Jenkins for ownCloud
|
09d6d843f7
|
[tx-robot] updated from transifex
|
2012-11-12 00:02:24 +01:00 |
Thomas Tanghus
|
9ae6876884
|
Merge pull request #361 from owncloud/cruds_consts_2
Implement "Move CRUDS permission consts to OC(P) namespace" take 2
|
2012-11-11 14:31:50 -08:00 |
Thomas Tanghus
|
56239df2e7
|
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
|
2012-11-11 23:10:23 +01:00 |
Thomas Tanghus
|
7f0c69eb0e
|
Added CRUDS permissions to the OCP namespace. Implements issue #345
|
2012-11-11 23:09:54 +01:00 |
Thomas Tanghus
|
fd709fc021
|
Merge branch 'master' of github.com:owncloud/core into vcategories_db
|
2012-11-11 20:20:09 +01:00 |
Thomas Müller
|
3be21cf665
|
Merge pull request #354 from michielbdejong/master
add /.well-known/host-meta.json to .htaccess (for /apps/unhosted_apps)
|
2012-11-10 21:17:13 -08:00 |
Michiel de Jong
|
e37dd7aa82
|
add /.well-known/host-meta.json to .htaccess
|
2012-11-10 20:00:28 -06:00 |
Jenkins for ownCloud
|
9f8cc09642
|
[tx-robot] updated from transifex
|
2012-11-11 00:02:42 +01:00 |
Bart Visscher
|
04aa029cd3
|
Disable loading apps before starting tests
The tests it self should load the app if needed
|
2012-11-10 21:15:05 +01:00 |
Thomas Müller
|
a7f26b6b40
|
Merge pull request #346 from diederikdehaas/patch-checkstyle-build1341
Patch checkstyle issues from jenkins build1341
|
2012-11-10 02:22:28 -08:00 |
Diederik de Haas
|
eff13a28c1
|
Fixed new checkstyle issues in apps.php from build #1341.
|
2012-11-10 01:03:54 +01:00 |
Diederik de Haas
|
1b7c0c2b62
|
Fixed new checkstyle issues in ocs.php from build #1341.
|
2012-11-10 01:02:47 +01:00 |
Diederik de Haas
|
f6daddadf5
|
Fixed new checkstyle issues in util.php from build #1341.
|
2012-11-10 00:58:03 +01:00 |
Diederik de Haas
|
20541c610e
|
Fixed new checkstyle issues in migrate.php from build #1341.
|
2012-11-10 00:53:28 +01:00 |
Diederik de Haas
|
6e6df6e410
|
Fixed new checkstyle issues in ftp.php from build #1341.
|
2012-11-10 00:46:50 +01:00 |
Diederik de Haas
|
3cc6df489f
|
Fixed new checkstyle issues in swift.php from build #1341.
|
2012-11-10 00:45:49 +01:00 |
Diederik de Haas
|
051635412d
|
Fixed new checkstyle issues from build #1341.
|
2012-11-10 00:40:32 +01:00 |
Jenkins for ownCloud
|
7ec0efe5c2
|
[tx-robot] updated from transifex
|
2012-11-10 00:02:29 +01:00 |
Thomas Müller
|
6dbdc16287
|
Merge pull request #340 from butonic/fix_quota_zero_cornercase
fix quota off by one error
|
2012-11-09 05:54:50 -08:00 |
Jörn Friedrich Dreyer
|
c5ba4f476a
|
fix quota off by one error
|
2012-11-09 14:34:15 +01:00 |
Thomas Müller
|
e23a11ab2f
|
Merge pull request #337 from seidler2547/master
Fix problem with apache2+fcgid install, e.g. on Debian Squeeze
|
2012-11-09 05:31:22 -08:00 |
Stefan Seidel
|
8f669880bc
|
Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze + mod_fcgid installs.
|
2012-11-09 13:30:07 +01:00 |
Thomas Müller
|
c053863644
|
Merge pull request #330 from owncloud/check_connection
add a check and a warning if the ownCloud server is not able to establis...
|
2012-11-09 02:11:24 -08:00 |
Jenkins for ownCloud
|
b33a443088
|
[tx-robot] updated from transifex
|
2012-11-09 10:07:45 +01:00 |
Thomas Mueller
|
127a5a3ecd
|
l10n support for user_webdavauth
|
2012-11-09 09:59:27 +01:00 |
Jenkins for ownCloud
|
cb57a20ec2
|
[tx-robot] updated from transifex
|
2012-11-09 00:03:49 +01:00 |
Brice Maron
|
4c06c25c6c
|
Fix delete link when new user is added
|
2012-11-08 20:17:16 +00:00 |
Frank Karlitschek
|
55f75c6d8e
|
add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
|
2012-11-08 18:08:44 +01:00 |
Georg Ehrke
|
84084b9430
|
Merge pull request #261 from owncloud/fix_opera_file_delete
fix file delete in opera - fixes #188
|
2012-11-08 08:55:19 -08:00 |
Thomas Müller
|
2d52365606
|
Merge pull request #326 from owncloud/add_credits
add credits to personal page too so that non admins can see what they run
|
2012-11-08 05:50:09 -08:00 |
Frank Karlitschek
|
fef2d07873
|
add credits to personal page too so that non admins can see what they run.
|
2012-11-08 14:12:49 +01:00 |
Thomas Müller
|
2b6b5269e1
|
Merge pull request #324 from owncloud/fix_image
fix the broken image path on the apps page
|
2012-11-08 04:44:14 -08:00 |
Frank Karlitschek
|
f799e48f7e
|
fix the broken image path on the apps page
|
2012-11-08 13:34:00 +01:00 |
Tom Needham
|
8396c0478e
|
Migration: Allow for no app data cases; handle file copying better
|
2012-11-08 11:37:27 +00:00 |
Tom Needham
|
0833be9d4e
|
Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley
Remove obsolete method
Dont count '.' and '..' as directories when importing.
|
2012-11-08 11:37:27 +00:00 |
Brice Maron
|
fbc3123d8e
|
Correct more data vs attr to fix #189
|
2012-11-07 23:51:00 +00:00 |
Jenkins for ownCloud
|
c8f24fa3c9
|
[tx-robot] updated from transifex
|
2012-11-08 00:03:43 +01:00 |
Robin Appelman
|
ae74c54d65
|
normalize filepaths in OC_Files::getFileInfo
|
2012-11-07 22:54:10 +01:00 |
Robin Appelman
|
37fe9800b6
|
add actions to newly created files and folders
closes #231
|
2012-11-07 22:13:52 +01:00 |
Robin Appelman
|
42935c5564
|
reuse jquery object when adding files to the file list
|
2012-11-07 22:06:05 +01:00 |
Robin Appelman
|
e14054610f
|
Revert "fix blocking drag & drop upload of folders"
Fixes #150
This reverts commit 5b2f3c7f72 .
|
2012-11-07 21:59:18 +01:00 |
Björn Schießle
|
250f40fe40
|
check if $path is a empty string
|
2012-11-07 17:35:07 +01:00 |
icewind1991
|
5cad2d7ccc
|
Merge pull request #307 from owncloud/etag-function-overwrite
Allow apps to change the way etags are generated
|
2012-11-07 08:02:59 -08:00 |
Björn Schießle
|
311b04f609
|
backport from approved patch in stable45:
make root the default parameter for getAbsolutePath()
|
2012-11-07 16:54:42 +01:00 |