kondou
|
235638e5ab
|
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
|
2013-08-31 23:48:23 +02:00 |
|
kondou
|
0869f9b655
|
Fix #4258, clean up \OC_Image and improve its unittest
|
2013-08-30 21:08:37 +02:00 |
|
Georg Ehrke
|
8ef40277b2
|
Merge master into oc_preview
|
2013-08-30 18:11:18 +02:00 |
|
Jan-Christoph Borchardt
|
0f5df181a3
|
Merge pull request #4661 from owncloud/separate-app-styles
Move CSS for apps and browser-specific fixes out of main styles.css
|
2013-08-30 09:08:25 -07:00 |
|
Jenkins for ownCloud
|
dbc78b1a58
|
[tx-robot] updated from transifex
|
2013-08-30 09:38:20 -04:00 |
|
Stephane Martin
|
95f42d6544
|
Merge pull request #4578 from houbaastef/master
fixes #4574
|
2013-08-30 06:20:07 -07:00 |
|
Arthur Schiwon
|
7d398ba622
|
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
|
2013-08-30 11:45:16 +02:00 |
|
Jan-Christoph Borchardt
|
9c23ed580a
|
move CSS for browser-specific fixes out of styles.css into new fixes.css
|
2013-08-30 11:42:32 +02:00 |
|
Jan-Christoph Borchardt
|
cc8e19ad11
|
move CSS for apps out of styles.css into new apps.css
|
2013-08-30 11:38:49 +02:00 |
|
Thomas Müller
|
0104d3df96
|
Merge pull request #4592 from owncloud/fix-logic
fix weird logical behaviour
|
2013-08-29 08:40:33 -07:00 |
|
Georg Ehrke
|
728fc7f123
|
fix parameter missing warning
|
2013-08-29 16:13:16 +02:00 |
|
Robin Appelman
|
1fa29b4c11
|
also emmit create hook when creating new files using touch()
|
2013-08-29 15:31:03 +02:00 |
|
Thomas Müller
|
301cce54cc
|
webdav quota information contains the values for used and free - not total
|
2013-08-29 12:34:48 +02:00 |
|
Georg Ehrke
|
b7758d0f8d
|
Merge master into oc_preview
|
2013-08-29 10:50:55 +02:00 |
|
Georg Ehrke
|
70b6e2161e
|
invert logic of disable_previews
|
2013-08-29 10:08:53 +02:00 |
|
Morris Jobke
|
d4952bd9df
|
fix typo
|
2013-08-28 18:36:32 +02:00 |
|
Bart Visscher
|
3fd2df4088
|
Only enable logrotate when configured. Also rotate size is settable.
|
2013-08-28 17:41:27 +02:00 |
|
Bart Visscher
|
42f3ecb60f
|
Check for installed state before registering the logrotate background job
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
62560ef859
|
Add description to log rotate class
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
594a2af75a
|
Review fixes
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
b5e2842e00
|
Very simple log rotation
|
2013-08-28 17:11:43 +02:00 |
|
Bart Visscher
|
45076edf4f
|
Merge pull request #3891 from owncloud/fix_loadAppScriptFile
Check if the app is enabled and the app path is found before trying to l...
|
2013-08-28 06:10:06 -07:00 |
|
Thomas Tanghus
|
9843c8e838
|
Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
|
2013-08-28 03:59:43 -07:00 |
|
Jenkins for ownCloud
|
3e7ddbc9d9
|
[tx-robot] updated from transifex
|
2013-08-28 06:24:14 -04:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
Morris Jobke
|
e91edabe0f
|
add documentation
|
2013-08-27 16:07:25 +02: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 |
|
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 |
|
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
|
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 |
|
Stephane Martin
|
81a45cfcf1
|
fixes #4574
|
2013-08-26 15:16:41 +02:00 |
|
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02: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 |
|
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
|
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 |
|
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
|
fbc23c4a01
|
Merge branch 'master' of github.com:owncloud/core
|
2013-08-22 00:18:14 +02:00 |
|