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

549 Commits

Author SHA1 Message Date
Bart Visscher 8e26f291a7 Merge pull request #4684 from owncloud/improved-console 
Use more object oriented way for console commands
 2013-09-19 14:22:32 -07:00
Thomas Tanghus 09d043729a Note to self 2: Do as you preach. Test! 2013-09-18 15:02:25 +02:00
Thomas Tanghus 79cd655920 Note to self: Test before pushing!!! 2013-09-18 14:50:21 +02:00
Thomas Tanghus 534933ee9b Use new emitter system 2013-09-18 13:15:38 +02:00
Thomas Tanghus fe86182dac OC_Cache namespace changes and add UserCache to server container. 
Refs #4863
 2013-09-17 17:46:33 +02:00
Thomas Müller 5d4e9e0d25 /OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized 
This fixes unit test execution
 2013-09-15 23:07:18 +02:00
Thomas Müller ad82a56f79 Merge branch 'master' into appframework-master 2013-09-15 21:18:59 +02:00
Thomas Müller 5b3388c7c4 Merge branch 'master' into appframework-master 2013-09-13 20:56:49 +02:00
kondou c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Axel Roenn 7810e27dad Changed default behaviour to not log IP address in case of an auth failure. Can be configured in OC conf now. 
Log level changed to warning .
 2013-09-10 11:07:26 +02:00
Axel Roenn 0cd6473909 On an auth failure the uid and the IP address should be logged to the standard log file. 
This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header
  instead of the remote address.
 2013-09-09 15:35:39 +02:00
Thomas Müller e9849270e3 Revert "fixes #4574" 
This reverts commit 81a45cfcf1.
 2013-09-06 00:28:13 +02:00
kondou 820fd42161 Merge branch 'master' into oc_avatars 2013-09-04 12:56:40 +02:00
kondou e5fc7b9dbe Merge branch 'master' into clean_up_util 
Conflicts:
	lib/base.php
 2013-09-02 07:58:06 +02:00
kondou 76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
Bart Visscher 0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
kondou 5d653753bd Merge branch 'master' into oc_avatars 2013-08-31 12:56:36 +02:00
Thomas Müller a9d6b59307 Merge branch 'master' into appframework-master 2013-08-31 01:38:44 +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
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
kondou 0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
Georg Ehrke b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +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 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
Thomas Müller a995e81686 Merge branch 'master' into appframework-master 2013-08-26 21:31:15 +02:00
Stephane Martin 81a45cfcf1 fixes #4574 2013-08-26 15:16:41 +02:00
Georg Ehrke 6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Thomas Müller ba029ef4b2 initial setup of the server container 2013-08-21 00:58:15 +02:00
kondou f1518a54df Merge branch 'master' into clean_up_util 
Conflicts:
	lib/util.php
 2013-08-20 17:20:30 +02:00
kondou 65d802329f Fix some naming and spacing in lib/util.php 2013-08-18 10:33:09 +02:00
kondou 9c5416fe4a Clean up \OC\Util 
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
 2013-08-15 15:57:32 +02:00
Thomas Tanghus ca495758bd Fix octemplate string escaping. 2013-08-14 23:06:43 +02:00
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Robin Appelman 10d3e63ce5 add quota streamwrapper that limits the amount of data that can be written to a stream 2013-07-25 00:31:51 +02:00
Jan-Christoph Borchardt 93b227d803 shorten wording on config directory errors 2013-07-23 18:41:00 +02:00
Bart Visscher aa22194a09 In debug mode uncaught exceptions should display a nice page 2013-07-21 22:40:35 +02:00
Bart Visscher 49fca86f3c Cleanup error generation in base.php 2013-07-16 22:36:39 +02:00
Bart Visscher 7d86e262e1 Use autoloader for Patchwork/PHP/Shim/Normalizer 2013-07-16 22:32:04 +02:00
Bart Visscher 1a2db491af Merge pull request #3962 from owncloud/move-error-handlers 
Move error handlers from OC_Log to OC\Log\ErrorHandler
 2013-07-15 09:23:37 -07:00
Thomas Müller 6f5b0af67f Merge pull request #3487 from owncloud/basic_auth_hack 
Basic Auth is broken - again...
 2013-07-14 14:56:45 -07:00
Georg Ehrke a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Björn Schießle 9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827 
Squashed commit of the following:

commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:03:23 2013 +0200

    initialize OC_Defaults only once

commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:02:48 2013 +0200

    link to doc in error messages

commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #3791

commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:10:21 2013 +0200

    link to docs in error messages, fix #3819
 2013-07-08 10:07:57 +02:00
Bart Visscher 2db839c4d3 Move error handlers from OC_Log to OC\Log\ErrorHandler 2013-07-05 19:28:10 +02:00
Bart Visscher 57370353ad Check if the app is enabled and the app path is found before trying to load the script file 2013-06-28 20:34:28 +02:00
Bart Visscher 9a50a8f0cc Don't load the apps when we need to upgrade 
The loading can call functions that require new tables, like oc_jobs
 2013-06-28 17:23:40 +02:00
Thomas Mueller 3b91ce695f session_life_time -> session_lifetime 
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
 2013-06-28 15:17:54 +02:00
Thomas Mueller 794c189650 session life time is now configurable and set to the same value 2013-06-26 09:21:38 +02:00
Victor Dubiniuk fbbb6ef8ef Init dummy session first 2013-06-17 23:41:07 +03:00
Georg Ehrke 1a933a9173 Merge branch 'master' into oc_preview 2013-06-17 12:31:02 +02:00
Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start 
Conflicts:
	lib/util.php
 2013-06-14 10:06:13 +02:00
Georg Ehrke 85ecec8b01 Merge branch 'master' into oc_preview 2013-06-06 11:13:55 +02:00
Thomas Tanghus 9cd6645037 Move comment and set requesttoken. 2013-06-05 00:38:08 +02:00
Thomas Tanghus 2572c9a6b7 Merge pull request #3578 from owncloud/ocdialog 
Replacement for jquery.dialog to fit better with ownCloud design.
 2013-06-03 06:37:27 -07:00
Jörn Friedrich Dreyer b76725c1fa Merge pull request #3560 from owncloud/init-order-session 
initialize the session earlier
 2013-06-03 03:21:05 -07:00
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +02:00
Robin Appelman 251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Robin Appelman b8b0b7606a initialize the session earlier 2013-05-31 17:31:52 +02:00
Thomas Tanghus ad5c4bf771 Cleanup hacke v.2 2013-05-31 00:53:57 +02:00
Thomas Tanghus e21649ccff Revert "Clean up hack." 
This reverts commit 138c7f615b.
 2013-05-31 00:53:15 +02:00
Thomas Tanghus 138c7f615b Clean up hack. 2013-05-31 00:28:03 +02:00
Jörn Friedrich Dreyer 476747ee89 Merge pull request #3509 from owncloud/update_jquery_to_1_10 
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
 2013-05-30 06:00:52 -07:00
Georg Ehrke d8008ae421 Merge branch 'master' into oc_preview 2013-05-29 13:24:14 +02:00
Georg Ehrke fa6b96090a move to OC namespace 2013-05-29 12:46:54 +02:00
Georg Ehrke eebc15dce0 connect preview lib to filesystem hooks 2013-05-29 12:01:43 +02:00
Robin Appelman 040045cc2e provide a dummy session for CLI 2013-05-28 01:15:38 +02:00
Robin Appelman e73c04501e Fix session not working error 2013-05-28 01:10:18 +02:00
Robin Appelman 44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
kondou 3001db6b50 Update jquery to 1.10.0 & add jquery-migrate 1.2.1 2013-05-27 20:13:13 +02:00
Thomas Tanghus e66f609a64 Hack base.php to make Basic Auth work 2013-05-25 05:51:51 +03:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template 
Use js templates in OC.dialogs etc.
 2013-05-22 03:00:04 -07:00
Michael Gapczynski c62f230ddb Merge branch 'master' into move-maint-start 2013-05-21 11:26:56 -04:00
Florin Peter a92dead754 only connect share hooks if installation OC is installed 2013-05-17 01:20:02 +02:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form(). 
Also load octemplate per default.
 2013-05-16 13:41:04 +02:00
Michael Gapczynski f8336c1e2c Turn off theme before update 2013-05-14 09:34:01 -04:00
Robin Appelman 0d25c0001c check for setlocale after setting up the paths to prevent autoloader confusion 2013-05-07 22:53:07 +02:00
Robin Appelman 0b5f6b9c13 Move autoloader to it's own class 2013-05-07 22:16:17 +02:00
Bart Visscher 41f7eb948a Move start of the maintenance mode to the ajax call 
Make sure the update page is shown in a browser. And not an ajax request
 2013-05-04 00:05:29 +02:00
Robin Appelman 172499d5f3 Don't start the session when in cli mode 2013-04-26 14:53:59 +02:00
Thomas Tanghus c84281990c Merge pull request #2993 from owncloud/resolve_apps_lib_path 
Let autoloader resolve paths under apps lib directory.
 2013-04-24 13:33:05 -07:00
Morris Jobke b1c9b296e8 Merge pull request #3089 from guruz/fix_ugly_config_writeability_error 
Fix ugly error style on install
 2013-04-24 02:24:23 -07:00
Markus Goetz f1a63254fb Fix ugly error style on install 
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
 2013-04-23 11:06:28 +02:00
Lukas Reschke 6e78c4fcc0 Disallow URLs containing a @ 2013-04-23 00:26:40 +03:00
Robin Appelman e63633b5f3 Don't try to use backgroundjobs before the installtion is done 2013-04-22 20:23:23 +02:00
Robin Appelman 40de36a8f3 Try to supress pre-upgrade backgroundjob error 2013-04-21 00:58:15 +02:00
Robin Appelman 07f510692c Ensure we don't throw an exception before we can upgrade to the new backgroundjob system 2013-04-21 00:08:55 +02:00
Robin Appelman 7948341a86 Rework background job system 2013-04-20 23:27:46 +02:00
Thomas Tanghus 4ccc9d896a Merge pull request #3010 from owncloud/fix-cookie_path 
Don't use empty session.cookie_path, otherwise we get multiple cookies
 2013-04-19 01:17:35 -07:00
Thomas Tanghus e09c17de5b Added explanation 2013-04-18 22:29:50 +02:00
Bart Visscher e4876c9117 Don't use empty session.cookie_path, otherwise we get multiple cookies 2013-04-18 21:11:58 +02:00
Thomas Tanghus 9facb67fab Let autoloader resolve paths under apps lib directory. 2013-04-18 08:30:09 +02:00
Brice Maron 43d0f1fabf Warn when we do an upgrade 2013-04-17 21:29:14 +02:00
Lukas Reschke fbffbe0170 Juse send the cookies in the ownCloud directory 2013-04-06 00:16:52 +02:00
VicDeo 3e9ea6d13b Remove space before parethesis 2013-03-20 16:54:06 +04:00