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

11909 Commits

Author SHA1 Message Date
Georg Ehrke cc478d2f48 use ppt icon instead of preview 2013-06-18 13:53:02 +02:00
Georg Ehrke bea4376fd4 remove opendocument.php 2013-06-18 11:04:08 +02:00
Georg Ehrke 1a933a9173 Merge branch 'master' into oc_preview 2013-06-17 12:31:02 +02:00
Georg Ehrke 6082a0649c stream first mb of movie to create preview 2013-06-17 12:27:26 +02:00
Jenkins for ownCloud 6156d71832 [tx-robot] updated from transifex 2013-06-17 02:08:11 +02:00
Thomas Müller e013e7adea Merge pull request #3621 from owncloud/path-mimetype 
seperate mimetype guessing from filename
 2013-06-16 13:14:16 -07:00
Robin Appelman d42f7b85f3 Basic tests for getFileNameMimeType 2013-06-16 20:19:37 +02:00
Jenkins for ownCloud 8243d19050 [tx-robot] updated from transifex 2013-06-16 02:07:45 +02:00
Morris Jobke c99e7e97a3 Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder 
Fix inexisting trashbin's sub-folders
 2013-06-15 01:31:32 -07:00
Jenkins for ownCloud ab411d2700 [tx-robot] updated from transifex 2013-06-15 02:07:18 +02:00
Jan-Christoph Borchardt 9dfba295cd Merge pull request #3733 from owncloud/email_template 
E-mail templates (#3683)
 2013-06-14 14:43:41 -07:00
Thomas Müller 126a0cac8d Merge pull request #3473 from opensaucesystems/master 
Small update to user_webdavauth
 2013-06-14 11:31:23 -07:00
Thomas Müller 0ac7c5712a Merge pull request #3721 from owncloud/oracle_setup_fixes 
Oracle setup fixes
 2013-06-14 11:21:02 -07:00
Thomas Mueller f3d33a7d5b remove » and « from the text mail because they will be escaped 2013-06-14 20:04:20 +02:00
Stephan Arts ff64278a07 Do no translate "ownCloud - " 2013-06-14 18:02:35 +02:00
Stephan Arts 3cd7747e7b Use templates to theme share e-mails (#3683) 2013-06-14 17:38:56 +02:00
Jan-Christoph Borchardt 2344654236 Merge pull request #3726 from owncloud/remove-outlines 
remove dotted outlines in Firefox, fix #3712
 2013-06-14 08:06:52 -07:00
Jörn Friedrich Dreyer 9498cf959f remove default tablespace in parameter 2013-06-14 15:54:45 +02:00
Thomas Müller 22d419b74f No coverage for tests 2013-06-14 15:42:54 +02:00
Thomas Mueller 1ef66941a7 adding default to $hint within ctor of DatabaseSetupException 2013-06-14 15:38:09 +02:00
Thomas Müller 9d576de0bd No coverage for settings/l10n 2013-06-14 15:17:02 +02:00
Thomas Müller 08f81f3f92 No coverage for lib/l10n and core/l10n 2013-06-14 14:24:58 +02:00
Jan-Christoph Borchardt 06fd7e0d21 remove dotted outlines in Firefox, fix #3712 2013-06-14 14:08:04 +02:00
Thomas Mueller 5c7d7549ea coding style 2013-06-14 13:54:41 +02:00
Jörn Friedrich Dreyer 471b9c055a use executeAudited in sabredav lock 2013-06-14 12:23:44 +02:00
Jörn Friedrich Dreyer 961a001af3 add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup 2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer fc309caf16 fix oci dbschema test 2013-06-14 12:12:32 +02:00
Jörn Friedrich Dreyer e5d3cd59ac use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config 2013-06-14 12:09:49 +02:00
Jörn Friedrich Dreyer dcdabac04d oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect 2013-06-14 12:06:29 +02:00
Morris Jobke 8d62bb3aab Merge pull request #3684 from owncloud/pg_install_db_master 
Try connection with specified db when postgres does not work
 2013-06-14 02:50:01 -07:00
Thomas Müller 27f7ef49e4 Merge pull request #2835 from owncloud/move-maint-start 
Move maintenance start to ajax call
 2013-06-14 02:13:18 -07:00
Björn Schießle a8a60d761b Merge pull request #3715 from owncloud/fixes_for_3641_3620 
files_encryption: bug fixes for reported problems.
 2013-06-14 01:38:15 -07:00
Morris Jobke 7093b0829f improve comment 2013-06-14 11:28:33 +03:00
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start 
Conflicts:
	lib/util.php
 2013-06-14 10:06:13 +02:00
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Florin Peter 62f4ed7009 Merge branch 'master' into fixes_for_3641_3620 2013-06-14 01:14:33 +02:00
Thomas Müller 8edb56de05 Merge pull request #3690 from owncloud/use_execute_audited_in_filecache 
use executeAudited in files cache
 2013-06-13 13:55:55 -07:00
Thomas Müller 2a58cf8117 Merge pull request #3686 from owncloud/minor_exception_cleanup 
minor cleanup for exception handling
 2013-06-13 13:50:31 -07:00
Morris Jobke c6fd3f9820 Merge pull request #3586 from owncloud/contributing 
Revise Contributing document
 2013-06-13 12:36:11 -07:00
Morris Jobke 5a214817f2 Fix typo 2013-06-13 22:35:32 +03:00
Florin Peter 8566881758 fix for path_hash not unique as reported at #3641 2013-06-13 20:52:34 +02:00
Florin Peter 35da408222 fix memory problems as reported at #3620 2013-06-13 20:51:22 +02:00
Björn Schießle 7889f2ef5c Merge pull request #3687 from owncloud/template_updates 
Make templates aware of different owncloud editions
 2013-06-13 07:32:41 -07:00
Björn Schießle 15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle 4bafa4e81a Merge pull request #3558 from owncloud/files_encryption_check_private_key 
check if the decrypted private key is valid on login and on read/write files
 2013-06-13 04:18:32 -07:00
Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
 2013-06-13 13:17:35 +02:00
Jörn Friedrich Dreyer 31f7afe56a PDOException has no previous(), oh the consistency ... 2013-06-13 13:14:00 +02:00
Björn Schießle dd8011925a Merge pull request #3552 from owncloud/files_encryption_upgrade_fix 
Fix files_encryption app upgrade from 4.5 to 5.0
 2013-06-13 03:54:19 -07:00
Björn Schießle bc2862fcb9 Merge branch 'master' into files_encryption_upgrade_fix 2013-06-13 12:53:29 +02:00
Thomas Müller 54f3174665 Merge pull request #3640 from infoneo/master 
Folders with multiple periods problem fix
 2013-06-13 03:34:36 -07:00