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

19710 Commits

Author SHA1 Message Date
Thomas Müller 09ebe1cfa6 function declaration did not match 2014-07-29 00:34:02 +02:00
Bjoern Schiessle 1bba266417 add unit test 2014-07-28 22:45:03 +02:00
Bjoern Schiessle 4e87ac2bb9 make sure that we set the expire date if a date is adefault date is set 2014-07-28 22:45:03 +02:00
Thomas Müller 708b734e48 Merge pull request #9945 from owncloud/remove-mssql-bundle-master 
remove MssqlBundle
 2014-07-28 22:44:40 +02:00
Thomas Müller e0b649cf8d remove MssqlBundle 2014-07-28 22:22:40 +02:00
Bjoern Schiessle aff948925a update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-28 22:04:13 +02:00
Björn Schießle 0dc649f391 Merge pull request #9758 from owncloud/share-expdatefix 
Fix enforced share expiration date to be based on share time
 2014-07-28 17:58:26 +02:00
Björn Schießle c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date 
[share api] add OCS api call to set expire date for link shares
 2014-07-28 17:28:32 +02:00
Morris Jobke 1fbbaed261 Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster 
generate copy of sqlite database file in data directory
 2014-07-28 16:54:52 +02:00
Robin Appelman cb0ff19dc4 Merge pull request #9924 from owncloud/eventsource-nginx-buffering 
Prevent nginx from buffering event source events
 2014-07-28 16:17:35 +02:00
Morris Jobke 798ffd9d7c Merge pull request #9853 from owncloud/design-mobile-search 
improve look of search on mobile, save space in top bar, fix overlap
 2014-07-28 13:15:19 +02:00
Thomas Müller 539d2b7ec3 Merge pull request #9784 from josh4trunks/libreoffice_match_cl 
Cleanup Document Preview
 2014-07-28 13:03:33 +02:00
Morris Jobke 1b5d31adc7 update 3rdparty submodule to merge commit 2014-07-28 12:54:20 +02:00
Jan-Christoph Borchardt 13ca1c6a99 Merge pull request #9585 from owncloud/design-fix-public-footer 
move public page footer rules from sharing app to core so it is used by other apps too
 2014-07-28 12:53:29 +02:00
Jan-Christoph Borchardt c51c93c800 Merge pull request #9847 from owncloud/design-input-grouping 
enable input grouping also outside of log in screen
 2014-07-28 12:52:49 +02:00
Bjoern Schiessle b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Thomas Müller a3411e3719 Merge pull request #9641 from owncloud/localuser-addressbook 
ownCloud users are exported as address book
 2014-07-28 12:18:56 +02:00
Thomas Müller 534fb9ebf9 Merge pull request #9631 from owncloud/update-getid3 
update getID3 library
 2014-07-28 11:51:36 +02:00
Bjoern Schiessle de4233bc1c show a warning in the personal settings and admin settins if the encyption keys are not initialized 2014-07-28 11:31:06 +02:00
Thomas Müller 11214219f3 Merge pull request #9819 from owncloud/updater-setversionafterupdate 
Set version AFTER a successful update
 2014-07-28 11:19:57 +02:00
Thomas Müller 0aa652ecfd Merge pull request #9859 from tiezdne/master 
Update mimetypes.list.php
 2014-07-28 11:16:43 +02:00
Thomas Müller cfaa05cc0e Merge pull request #9905 from owncloud/joblist-non-existing-class 
Dont try to execute jobs that no longer exist
 2014-07-28 11:09:27 +02:00
Thomas Müller ab8efe3aa2 Merge pull request #9935 from owncloud/harden-get-urlco 
Verify whether the URL is valid
 2014-07-28 11:07:41 +02:00
Thomas Müller c87f425fe7 generate copy of sqlite database file in data directory 2014-07-28 10:29:39 +02:00
Thomas Müller f2982b7a08 Merge pull request #9904 from owncloud/loggedout-getuserfolder 
Dont throw an error when calling $server->getUserFolder when logged out
 2014-07-28 10:04:01 +02:00
Thomas Müller 37f673c8b5 Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master 
don't silently exit in cli-mode in case ownCloud in not yet installed
 2014-07-28 09:40:40 +02:00
Jenkins for ownCloud a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jan-Christoph Borchardt 0b63111892 Merge pull request #9922 from visit1985/app_icon_size 
max icon size for app menu
 2014-07-28 00:47:55 +02:00
Lukas Reschke 260729fd7d Verify whether the URL is valid 
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017

@karlitschek Backport for stable6 and stable7 requested.
 2014-07-27 16:46:32 +02:00
Jenkins for ownCloud 9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Robin Appelman 2c4e06d325 Prevent nginx from buffering event source events 2014-07-26 16:07:11 +02:00
Michael Göhler 1e69fc9af2 max icon size for app menu 2014-07-26 13:06:51 +02:00
Jenkins for ownCloud 010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Jörn Friedrich Dreyer ec7a10f882 reorder if statements to remove negation, indentation correction 2014-07-25 19:39:29 +02:00
Robin Appelman 43978befda Dont try to execute jobs that no longer exist 2014-07-25 18:02:02 +02:00
Robin Appelman acafb4a426 Merge pull request #9669 from owncloud/group-public 
Add group management to the public api
 2014-07-25 17:55:12 +02:00
Robin Appelman bf12bba079 Dont throw an error when calling $server->getUserFolder when logged out 2014-07-25 17:52:50 +02:00
Morris Jobke ae3761f15d add autoload 2014-07-25 17:37:33 +02:00
Morris Jobke a9666c4f5b update getID3 library 2014-07-25 15:25:45 +02:00
Bjoern Schiessle ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Björn Schießle 40f2a34be1 Merge pull request #9867 from owncloud/fix_sharing_update 
fix sharing update, add proper escaping
 2014-07-25 10:16:22 +02:00
Jenkins for ownCloud 3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Bjoern Schiessle c22b5c7884 fix sharing update, add proper escaping 2014-07-24 20:16:40 +02:00
Vincent Petry 63ffae8373 Merge pull request #9861 from owncloud/console-dontloadappsonupdate 
Do not load apps in console.php when an upgrade is due
 2014-07-24 18:30:33 +02:00
Thomas Müller 176ecbd311 ownCloud users are exported as address book 2014-07-24 17:35:02 +02:00
Vincent Petry 2b1cd84fcc Do not load apps when an upgrade is due 
This makes it still possible to update from the command line, but
disables custom commands from apps
 2014-07-24 16:53:30 +02:00
Thomas Müller 788a2eca2f Merge pull request #9841 from owncloud/fix-password-reset-master 
Fix password reset in console command and lost password controller
 2014-07-24 15:58:02 +02:00
tiezdne 6a2f3921f6 Update mimetypes.list.php 2014-07-24 15:43:55 +02:00
Thomas Müller b72a3e5be7 Merge pull request #9837 from owncloud/ignore-non-oc-tables-master 
Adding test which breaks because bit and/or enum datatypes are used
 2014-07-24 15:36:17 +02:00
Jan-Christoph Borchardt 3013b26092 improve look of search on mobile, save space in top bar 2014-07-24 14:38:19 +02:00