mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,285 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

13285 Commits

Author SHA1 Message Date
Bjoern Schiessle 88c4ac9b98 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-02 14:39:45 +02:00
Bjoern Schiessle 6572ca811f error.php no longer needed 2013-09-02 11:36:20 +02:00
Bjoern Schiessle 5e508f1ccb improved documentation of the methods 2013-09-02 11:34:28 +02:00
Bjoern Schiessle bab63c22ee encryption error messages, distinguish between a re-enabled encryption app and a password change from outside 2013-09-02 11:26:11 +02:00
Jörn Friedrich Dreyer 06870a6e39 Merge pull request #4673 from owncloud/ocsapi_cleanup 
remove the activity call here. it is not implemented anyways.
 2013-09-02 01:46:29 -07:00
Morris Jobke 91c0923cce Merge pull request #4663 from owncloud/fix-sticky-apps 
fix issues caused by introduction of sticky Apps management footer
 2013-09-02 01:11:09 -07:00
Morris Jobke a2f18eabb1 Merge pull request #4657 from owncloud/files-controls-fixes 
Files controls fixes
 2013-09-01 23:08:23 -07:00
Morris Jobke 8a4acf263e Merge pull request #4674 from owncloud/fit-filepicker-new-icons 
Fit filesummary for \OC\Preview's new mimetype-icons
 2013-09-01 23:06:59 -07:00
Morris Jobke 1e501a8521 IE8 fixes 2013-09-02 08:05:47 +02:00
Bernhard Posselt f038cb9aea Merge pull request #4671 from owncloud/emptycontent 
centers text message in empty-content page (files and files_trashbin apps)
 2013-09-01 17:47:55 -07:00
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
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
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
Bjoern Schiessle d7dca966a2 improved error messaging, initial commit 2013-08-30 10:17:50 +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
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
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