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

5702 commits

Author SHA1 Message Date
Bart Visscher
cb37a2716a Also clear cached UserGroup when a user is added/removed 2014-02-27 20:09:07 +01:00
Bart Visscher
00e27d5343 Clear the cached user groups when a group is deleted 2014-02-27 19:12:03 +01:00
Bart Visscher
1d7564dc2f Only check for existence of shared files when doing shared storage setup 
The getItemsSharedWith function also retrieves related information,
resulting in work that isn't used here.
 2014-02-21 23:07:35 +01:00
Bart Visscher
f4f72e77d8 Delay fetching the display name until it is requested 2014-02-21 23:07:35 +01:00
Bart Visscher
6f4ecd32b3 Add more caching in the group manager 2014-02-21 23:07:35 +01:00
Thomas Müller
27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Robin Appelman
80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
Thomas Müller
f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php 
Conflicts:
	config/config.sample.php
 2014-02-21 09:51:51 +01:00
Lukas Reschke
f7fa8662e2 Remove session_id_regenerate from here 
Jenkins somewhat complains that there are already sent headers.
 2014-02-21 08:12:45 +01:00
Lukas Reschke
69325c5eeb Move session_regenerate_id to login() 2014-02-21 08:11:07 +01:00
Thomas Müller
ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 
Allow passing a root folder to get the used space from in the quota wrapper
 2014-02-20 16:47:59 +01:00
Lukas Reschke
c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Björn Schießle
4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator 
Add missing slash in URLGenerator::getAbsoluteURL().
 2014-02-20 14:57:03 +01:00
Lukas Reschke
e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons 
Fix filetype icons
 2014-02-20 14:53:41 +01:00
Lukas Reschke
0241ddc759 Merge pull request #6519 from nhirokinet/master 
Security Update: session fixation
 2014-02-20 14:28:26 +01:00
Thomas Müller
fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller
a0e790227e remove unused functions - have been introduced with the old minimizer approach 2014-02-20 14:11:31 +01:00
Thomas Müller
31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
icewind1991
742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup 
fix master - #7274 brokes it
 2014-02-20 13:40:12 +01:00
Thomas Müller
8cf73ca42f integrate assetic for asset pipeline-ing 2014-02-20 13:28:27 +01:00
Thomas Müller
7242d00aa6 enable static delivery of css files 2014-02-20 13:27:46 +01:00
Thomas Müller
ac8e6b15b6 kill references to core.js and core.css 2014-02-20 13:23:24 +01:00
Thomas Müller
bf22ed7bdb kill old minimizer code 2014-02-20 13:10:56 +01:00
Björn Schießle
16eb43c033 Merge pull request #7247 from owncloud/sharing_cleanup_step1 
clean up the sharing ajax calls, add mail notification class
 2014-02-20 11:56:20 +01:00
Lukas Reschke
719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix 
Added extra checks for invalid file chars in newfile.php and newfolder.php
 2014-02-20 11:53:58 +01:00
Jan-Christoph Borchardt
3e2c56157b reduce width of searchbox on mobile, fix overlap, fix #7282 2014-02-20 11:33:46 +01:00
Jan-Christoph Borchardt
3e235b2699 merge master 2014-02-20 10:51:13 +01:00
Jan-Christoph Borchardt
a6fb6abbe0 fix filetype icons for gzip, tex, perl, csv, sh 2014-02-20 10:45:11 +01:00
Morris Jobke
b76a3993d4 fix master - #7274 brokes it 2014-02-20 09:47:59 +01:00
Bjoern Schiessle
2fd75d8f1c clean up the sharing ajax calls, add mail notification class 2014-02-19 19:33:00 +01:00
Jan-Christoph Borchardt
cac4652c10 coding style: spaces around => 2014-02-19 16:28:29 +01:00
Jan-Christoph Borchardt
937a25593b fix lots of file type icons for archives, js, flash, ics, fonts, code, ... 2014-02-19 16:27:38 +01:00
Lukas Reschke
2d5b3899a6 Hardening: Remove dangerous characters + Subdirectory Check 
If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.
 2014-02-19 15:38:00 +01:00
Vincent Petry
952584e9c7 Merge pull request #7195 from owncloud/files-selectall 
Do not send file list for select all on Download/delete
 2014-02-19 14:33:24 +01:00
Morris Jobke
bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2014-02-19 11:51:04 +01:00
Morris Jobke
f944707a15 fix wrong removes 2014-02-19 11:50:17 +01:00
icewind1991
2d5ab1a5c4 Merge pull request #7260 from owncloud/watcher-policy 
Allow setting the frequency of which the file watcher checks for updates
 2014-02-19 11:17:27 +01:00
Vincent Petry
e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo 
use a FileInfo object of the directory when generting the filelist
 2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller
1e321406ee Merge pull request #7114 from owncloud/scrutinizer_documentation_patches 
polish documentation based on scrutinizer patches
 2014-02-19 07:04:37 +01:00
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
icewind1991
3cc7228c7c Merge pull request #7253 from owncloud/preferences-caching 
Add caching to OC\Preferences
 2014-02-18 18:17:58 +01:00
Thomas Müller
8991e4505a Merge pull request #6796 from owncloud/statementwrapper-bindparam 
Add bindParam to the database statement wrapper
 2014-02-18 18:13:57 +01:00
Thomas Müller
1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps 
Remove usage of legacy OC_Appconfig
 2014-02-18 18:10:22 +01:00
Vincent Petry
bd71a1b7b6 Added file name check in webdav connector 
- added file name check for the put, rename and setNames() methods which
  throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
  unit tests
 2014-02-18 17:54:32 +01:00
Vincent Petry
797e0a614c Added extra checks for invalid file chars in newfile.php and newfolder.php 
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters
 2014-02-18 17:54:32 +01:00
Tom Needham
a573fe7d76 Merge pull request #6650 from owncloud/migration_unit_tests 
User migration fix, and basic unit test
 2014-02-18 17:35:49 +01:00
Lukas Reschke
3b1083f46e Merge pull request #7176 from owncloud/style 
Some style fixes
 2014-02-18 17:30:26 +01:00
tomneedham
0beaeed713 Remove unused variables 2014-02-18 16:28:04 +00:00
Robin Appelman
2166683e3b Allow setting the frequency of which the file watcher checks for updates 2014-02-18 16:34:25 +01:00