Jenkins for ownCloud
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
Christopher
36424580b0
Merge pull request #4329 from owncloud/fix_4258
...
Fix #4258 and improve unittest
2013-09-01 08:46:27 -07:00
Vincent Petry
307b673b79
Fixed public upload error that prevents upload
...
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.
This fix sets the variable scope to the window to make it accessible
outside.
2013-09-01 16:14:46 +02:00
kondou
2d6a400381
Check for $this->fileInfo and @depend on testData()
2013-09-01 15:50:58 +02:00
Frank Karlitschek
c54994d2e9
fixing this obvious typo directly
2013-09-01 08:23:11 +02:00
kondou
235638e5ab
Merge branch 'master' into fix_4258
...
Conflicts:
lib/image.php
2013-08-31 23:48:23 +02:00
kondou
ebcd2a6b4d
Fit filesummary for \OC\Preview's ne mimetype-icons
2013-08-31 19:21:51 +02:00
Frank Karlitschek
f1836a997f
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
2013-08-31 18:14:46 +02:00
Frank Karlitschek
a5633bb155
remove the config option that is no longer needed
2013-08-31 18:03:10 +02:00
Frank Karlitschek
58e036e304
remove knowledgebase calls that are no longer used in ownCloud 5/6
2013-08-31 18:00:53 +02:00
Alessandro Cosentino
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
Alessandro Cosentino
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
Thomas Müller
92e90c8eb9
Merge pull request #4022 from owncloud/oc_preview
...
\OC\Preview
2013-08-31 03:41:29 -07:00
Georg Ehrke
668c4c2652
fix issue with filetable background
2013-08-30 22:05:44 +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
Georg Ehrke
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
2013-08-30 18:07:49 +02: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
Jan-Christoph Borchardt
1e834c57a4
fix issues caused by introduction of sticky Apps management footer
2013-08-30 13:46:10 +02:00
Morris Jobke
bf6981312a
Merge pull request #4660 from owncloud/apps-management-sticky
...
Apps management as sticky footer and rename to 'Apps', fix #4622
2013-08-30 03:47:15 -07:00
Arthur Schiwon
22e1f73d5e
Use Group methods for searching, fixes #4201
2013-08-30 12:37:46 +02:00
petemcfarlane
ab1f78eac3
prefix 'tbody tr' to separate app/core css errors
...
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
2013-08-30 10:48:04 +01: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
Jan-Christoph Borchardt
c9c4ab22a4
Apps management as sticky footer and rename to 'Apps', fix #4622
2013-08-30 11:17:31 +02:00
Jan-Christoph Borchardt
a6c7b210db
adjust right padding of controls bar, fix #4650
2013-08-30 10:26:41 +02:00
Jan-Christoph Borchardt
3a2534d3bd
fix coding style for controls bar
2013-08-30 10:20:39 +02:00
Morris Jobke
0a23ac18bc
Merge pull request #4642 from masakik/master
...
Minor enhancement to console.php
2013-08-29 12:05:32 -07:00
Masaki
04b9e77478
replace ident spaces with tabs
2013-08-29 15:03:16 -03:00
ringmaster
f4ec5182bd
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-08-29 12:06:07 -04: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
Thomas Müller
2cfcf0083f
Merge pull request #4643 from owncloud/touch-newfile-hook
...
also emmit create hook when creating new files using touch()
2013-08-29 08:37:46 -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
Robin Appelman
bf9045f585
test case for hooks send from a non-default view
2013-08-29 15:25:38 +02:00
Masaki Kawabata Neto
1dd18980ae
enable usage with CLI interface
...
Added option to use the status.php with console.php via CLI
2013-08-29 10:03:58 -03:00
Masaki Kawabata Neto
4db6ed34b8
added help and status commands
...
switch structure enables many commands seamlessy.
also added some help and status command.
2013-08-29 10:00:53 -03:00
Masaki Kawabata Neto
98a04d7c73
added help and status commands
...
switch structure enables many commands seamlessy.
also added some help and status command.
2013-08-29 10:00:30 -03: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
ea6e74ca95
Merge pull request #4552 from dampfklon/fix4552
...
Make group suffix in share dialog translatable
2013-08-28 15:46:51 -07:00
Morris Jobke
af6eb9d41b
Merge pull request #4631 from owncloud/hotfix_4630
...
Work around #4630 to fix license showing
2013-08-28 15:42:06 -07:00
Thomas Müller
81cab5ada8
Merge pull request #3926 from owncloud/improve_filesummary
...
Improve filelist summary
2013-08-28 15:11:09 -07:00
Thomas Müller
67ce2ad869
Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders
...
also move empty folders to the trash bin
2013-08-28 14:54:37 -07:00
Thomas Müller
cebb635955
Merge pull request #4615 from owncloud/npm-modules
...
Adds Node Modules to build in gitignore for easy testing.
2013-08-28 14:18:47 -07:00
Morris Jobke
f0ea23891a
Merge pull request #4618 from owncloud/visualize-js
...
visualize
2013-08-28 14:17:50 -07:00