Björn Schießle
|
38084aba2a
|
Merge pull request #4596 from owncloud/fix_isEmpty_trash
trash bin: fix isEmpty() function
|
2013-08-27 06:40:39 -07:00 |
Tom Needham
|
273f162b26
|
Code style
|
2013-08-27 15:39:47 +02:00 |
|
Tom Needham
|
f14ce1efdc
|
Add quota to core api
|
2013-08-27 15:39:43 +02:00 |
Bjoern Schiessle
|
316d9bfed6
|
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
|
2013-08-27 14:39:43 +02:00 |
Jörn Friedrich Dreyer
|
13514fd1ad
|
Merge pull request #4348 from owncloud/fixing-4343-master
fixes #4343
|
2013-08-27 04:26:51 -07:00 |
blizzz
|
163269805a
|
Merge pull request #4507 from owncloud/existingusersfromgroup
return only existing users in group
|
2013-08-27 03:47:56 -07:00 |
Morris Jobke
|
ea446544ef
|
Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
|
2013-08-27 02:00:48 -07:00 |
|
Morris Jobke
|
6e8bc13aa3
|
fix weird logical behaviour
|
2013-08-27 10:58:17 +02:00 |
Thomas Müller
|
d3d91ce347
|
revert debugging code which accidentially entered this pull request
|
2013-08-27 10:49:10 +02:00 |
|
Morris Jobke
|
c09cfe4fb9
|
Merge pull request #4585 from owncloud/fixing-4385-master
Fixing 4385 master
|
2013-08-27 01:40:50 -07:00 |
|
Morris Jobke
|
02b4ceed3c
|
Merge pull request #4584 from owncloud/fixing-4575-master
adding translations to update events
|
2013-08-27 01:26:16 -07:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Thomas Müller
|
8cf9336bcb
|
storage information is path specific
|
2013-08-27 00:59:58 +02:00 |
|
Thomas Müller
|
1e4ebf47e2
|
webdav quota now displays the same values as the web interface does
|
2013-08-27 00:57:28 +02:00 |
|
Thomas Müller
|
9909b8b726
|
adding translations to update events
|
2013-08-27 00:26:44 +02:00 |
|
Thomas Müller
|
d1a6d2bc8f
|
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
|
2013-08-26 20:21:16 +02:00 |
|
Morris Jobke
|
7d141656ee
|
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
Conflicts:
lib/helper.php
|
2013-08-26 18:04:49 +02:00 |
|
Arthur Schiwon
|
1f5a55ddff
|
consolidate validity check for users in group class
|
2013-08-26 17:46:31 +02:00 |
Georg Ehrke
|
b16a018da9
|
use random string as id for checkbox
|
2013-08-26 16:33:51 +02:00 |
Stephane Martin
|
81a45cfcf1
|
fixes #4574
|
2013-08-26 15:16:41 +02:00 |
|
Georg Ehrke
|
d538a566ac
|
fix background size in filelist.js
|
2013-08-26 14:36:18 +02:00 |
Bart Visscher
|
29c28a45ca
|
Merge pull request #4292 from owncloud/add_appconfig_unittest
Add \OC_Appconfig Unittest
|
2013-08-26 04:07:18 -07:00 |
|
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02:00 |
|
Georg Ehrke
|
46cbd7cd3b
|
fix preview issue when uploading a file with parentheses
|
2013-08-26 12:16:51 +02:00 |
|
Morris Jobke
|
653bc9a477
|
Merge pull request #4281 from owncloud/ie8-multiselect
Better ie8 multiselect
|
2013-08-26 02:59:31 -07:00 |
|
Morris Jobke
|
a5873a96fa
|
Merge pull request #4542 from owncloud/fixing-4504-master
remove duplicate code
|
2013-08-26 02:19:32 -07:00 |
|
Morris Jobke
|
438e816941
|
Merge pull request #4519 from owncloud/style-fixes
fix minor style issue in the app navigation
|
2013-08-26 00:47:34 -07:00 |
|
Morris Jobke
|
ec0808ce75
|
fix reviewers concerns
|
2013-08-26 09:44:21 +02:00 |
Pellaeon Lin
|
cd41de839f
|
Fix "select all" checkbox displacement when checked
|
2013-08-26 10:57:14 +08:00 |
|
Jenkins for ownCloud
|
d587146a5a
|
[tx-robot] updated from transifex
|
2013-08-25 19:21:52 -04:00 |
Christopher
|
b8965c6107
|
Merge pull request #4331 from owncloud/improve_app-management
Improve app-management
|
2013-08-25 11:56:56 -07:00 |
|
kondou
|
fbe7a68ce8
|
Use personal-password for the password name in personal.php
Fix #4491
|
2013-08-24 14:31:32 +02:00 |
|
Jenkins for ownCloud
|
596ac40b7f
|
[tx-robot] updated from transifex
|
2013-08-23 20:17:08 -04:00 |
|
Georg Ehrke
|
58c727a495
|
fix return value of method
|
2013-08-23 23:27:36 +02:00 |
|
Georg Ehrke
|
13e34649bf
|
move path generation for previews to dedicated function
|
2013-08-23 23:19:21 +02:00 |
|
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
|
Georg Ehrke
|
1dab076750
|
make it possible to disable previews
|
2013-08-23 23:05:44 +02:00 |
|
kondou
|
8dd93c8c02
|
Fix some phpdoc and camelcase
|
2013-08-23 07:30:42 +02:00 |
dampfklon
|
87c3f34a93
|
Make group suffix in share dialog translatable
|
2013-08-22 19:52:08 +02:00 |
|
Thomas Müller
|
9e1016f7d2
|
Merge branch 'master' into fixing-4343-master
Conflicts:
lib/connector/sabre/quotaplugin.php
|
2013-08-22 17:59:39 +02:00 |
|
Jenkins for ownCloud
|
02b2b5a808
|
[tx-robot] updated from transifex
|
2013-08-22 10:37:23 -04:00 |
|
Thomas Müller
|
582b33bdf1
|
Merge pull request #4537 from owncloud/no-realpath
Do not use realpath() on includes.
|
2013-08-22 01:50:31 -07:00 |
|
Thomas Müller
|
1c258087c9
|
fixing typos
|
2013-08-22 01:20:28 +02:00 |
|
Thomas Müller
|
fbc23c4a01
|
Merge branch 'master' of github.com:owncloud/core
|
2013-08-22 00:18:14 +02:00 |
|
Thomas Müller
|
f1eec74f70
|
additional readdir check in mappedlocal
|
2013-08-22 00:17:08 +02:00 |
|
Thomas Müller
|
101cfa2359
|
remove duplicate code
|
2013-08-22 00:09:43 +02:00 |
|
Arthur Schiwon
|
958130e8fe
|
Sharing: only determine path root if owner is available
|
2013-08-22 00:00:40 +02:00 |
|
Arthur Schiwon
|
c482512e23
|
LDAP: fix wrong hook name
|
2013-08-22 00:00:33 +02:00 |
|
kondou
|
0ce35af02a
|
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
|
2013-08-21 19:20:25 +02:00 |
|
Georg Ehrke
|
224b80f906
|
move isMimeSupported out of template files
|
2013-08-21 15:55:59 +02:00 |