wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31689 commits 157 branches 562 tags 714 MiB
Commit graph

31689 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
06a4da43ec
[master] Ignore certificate file if it starts with file:// 2016-04-21 19:02:31 +02:00
Vincent Petry
37f6b9eaf7 Merge pull request #24145 from owncloud/limit-cron-execution-time 
Make sure that CLI cron doesn't run for ever, but makes use of the ne…
 2016-04-21 18:23:15 +02:00
Thomas Müller
6e4a28ae86 Merge pull request #24155 from owncloud/fix-birthday_calendar-acl 
Birthday calendar should never have write acl
 2016-04-21 16:49:21 +02:00
Björn Schießle
80959ad95a Merge pull request #24111 from owncloud/chunk-users-in-background-jobs 
Chunk the users correctly in the trashbin and versions background job
 2016-04-21 14:26:41 +02:00
Thomas Müller
1d1247069f
Birthday calendar should never have write acl - fixes #24154 2016-04-21 13:36:52 +02:00
Thomas Müller
e673ff0f33 Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfix 
Revert "add word wrap to tooltips. Fixes #22746"
 2016-04-21 12:52:50 +02:00
Thomas Müller
93649d6fe8 Merge pull request #24135 from owncloud/also-write-htaccess-from-cli 
Write .htaccess also from CLI
 2016-04-21 12:17:55 +02:00
Vincent Petry
b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements 
Enc master key improvements
 2016-04-21 11:48:26 +02:00
Joas Schilling
e252967e83
Make sure that CLI cron doesn't run for ever, but makes use of the next spawn 2016-04-21 10:33:44 +02:00
Joas Schilling
6f5d3adfa4 Merge pull request #24133 from owncloud/tagging_psr4 
Move \OC\Tagging to PSR-4
 2016-04-21 10:16:31 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Lukas Reschke
e977a24ba1 Revert "add word wrap to tooltips. Fixes #22746" 2016-04-20 23:13:07 +02:00
Thomas Müller
a061ef75ea Merge pull request #24127 from owncloud/handle-app-loading-error 
Handle app loading error
 2016-04-20 22:41:02 +02:00
Lukas Reschke
cd299b8537
Write .htaccess also from CLI 
The new updater as shipped with ownCloud 9.0.x invokes `occ` via `shell_exec`. This means that the `\OC::$CLI` code is used when updating.

This removes the manual `.htaccess` modifications, effectively leading to the fact that URLs without index.php in it stop working. This also affects share URLs which could be considered a rather serious regression.

- User installs 9.0.0 via web
- User shares /s/1234
- User updates to 9.0.1 via ownCloud updater
- Link to /s/1234 is broken, /index.php/s/1234 works
 2016-04-20 22:00:44 +02:00
Thomas Müller
7e2a1656f9 Merge pull request #24132 from owncloud/fix-web-updater 
Fix web updater
 2016-04-20 21:50:00 +02:00
Roeland Jago Douma
269eaeed0b
Move \OC\Tagging to PSR-4 2016-04-20 21:24:23 +02:00
Morris Jobke
6b66f2dfb4 Merge pull request #23990 from owncloud/heartbeat-debounce 
Debounce heartbeat ajax calls to lower the number of requests
 2016-04-20 21:23:10 +02:00
Thomas Müller
42b25f7821 Merge pull request #23951 from owncloud/cleanlocks-chunk 
chunk the cleaning up of shared locks
 2016-04-20 20:40:32 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
1ef92621ab Merge pull request #24064 from owncloud/update-3rdparty 
Update 3rdparty to remove unneeded files
 2016-04-20 20:38:00 +02:00
Thomas Müller
cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example 
SharedStorage to new sharing code + cleanup
 2016-04-20 20:37:27 +02:00
Thomas Müller
cdcabbd0b3 Merge pull request #24098 from owncloud/fix_23782 
When calling file_put_contents clear the checksum
 2016-04-20 20:37:01 +02:00
Thomas Müller
01b09b4f92 Merge pull request #24118 from owncloud/add-load-script-events-for-settings 
Add loadAdditionalScripts events to admin and personal settings
 2016-04-20 20:36:27 +02:00
Thomas Müller
22db0f17a8 Fix web updater - fixes #24115 2016-04-20 20:32:47 +02:00
Thomas Müller
f92054acf2 Merge pull request #24123 from owncloud/preview_psr4 
Move \OC\Preview to PSR-4
 2016-04-20 20:21:45 +02:00
Thomas Müller
7fea9974b7 In case an app has issues while loading the app is disabled and request processing continues 2016-04-20 18:02:37 +02:00
Thomas Müller
6a6fc742dc Catch class Error on all root entrypoints 2016-04-20 18:01:47 +02:00
Thomas Müller
069af51dd0 With PHP7 Throwable is the new base interface for all Exception and Error - we should be capable to log Throwable as well 2016-04-20 17:56:08 +02:00
Roeland Jago Douma
702046d4aa
Move \OC\Preview to PSR-4 2016-04-20 15:02:44 +02:00
Lukas Reschke
afad27fafd Merge pull request #24075 from owncloud/no-html-on-cli 
In case of fatal php errors and other unhandled exceptions no html er…
 2016-04-20 13:50:43 +02:00
Thomas Müller
ae27583fe2 Merge pull request #24116 from owncloud/fix_24095 
preserve information if it is a rename operation or not
 2016-04-20 13:48:24 +02:00
Thomas Müller
fff272b5cc Merge pull request #23760 from owncloud/fix-setup-mysql 
Fix conditional check in MySQL setup
 2016-04-20 13:46:42 +02:00
Thomas Müller
784cf3d722 Merge pull request #24120 from owncloud/mail_psr4 
Move \OC\Mail to PSR-4
 2016-04-20 13:45:54 +02:00
Robin McCorkell
440b5caad7 Fix conditional check in MySQL setup 2016-04-20 11:58:27 +01:00
Roeland Jago Douma
bc4185a6fe
Move \OC\Mail to PSR-4 2016-04-20 12:49:23 +02:00
Joas Schilling
c670c23455
Add loadAdditionalScripts events to admin and personal for plugins that have no section 2016-04-20 12:30:48 +02:00
Björn Schießle
4f438eee56
preserve information if it is a rename operation or not 2016-04-20 12:17:15 +02:00
Thomas Müller
34b753baa0 Merge pull request #23952 from owncloud/hide-hidden-files 
Add option to hide hidden files
 2016-04-20 11:58:38 +02:00
Thomas Müller
aa33ab0c03 Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test 
Move the group dummy backend to test
 2016-04-20 11:55:00 +02:00
Thomas Müller
a6676f31ec Merge pull request #24097 from owncloud/fix_23632 
init users mount point before recovery
 2016-04-20 11:54:45 +02:00
Thomas Müller
98f854ba1c Merge pull request #24104 from tyrylu/accessibility_settings_fix 
App settings screen accessibility fixes
 2016-04-20 11:54:23 +02:00
Thomas Müller
64956ec2cf Merge pull request #24103 from owncloud/diagnostics_psr4 
Move \OC\Diagnostics to PSR-4
 2016-04-20 11:53:24 +02:00
Jan-Christoph Borchardt
5fe630c4f1 Merge pull request #23980 from owncloud/remember-email-when-setting-expirationdate 
remember email when setting expiration date
 2016-04-20 11:42:02 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:36:15 +02:00
Björn Schießle
17eb11cce8 Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments 
Always add activities for comments to the stream
 2016-04-20 10:21:09 +02:00
Morris Jobke
66799670b4
Update 3rdparty to remove unneeded files 2016-04-20 09:19:18 +02:00
Jenkins for ownCloud
a296cbd203 [tx-robot] updated from transifex 2016-04-20 01:54:55 -04:00
Roeland Jago Douma
0dbcbc4cae
When the scanner detects a file is changed clear checksum 
Fixes #23782 and #23783

If the file scanner detects a changed file we clear the checksum while
we update the cache.

* Unit test added
 2016-04-19 20:20:45 +02:00
Lukáš Tyrychtr
c2f2edc092 Fix reporting of the categories in app settings as links by screen readers. 2016-04-19 19:49:31 +02:00
Roeland Jago Douma
e2bff0b35d
Move \OC\Diagnostics to PSR-4 2016-04-19 19:29:47 +02:00