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

21674 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling
2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Thomas Müller
a6c088a1ef adding new config parameter for sqlite to specify the journal mode 2014-11-25 16:29:06 +01:00
Joas Schilling
711912a7b3 Move namespaced constants to namespaced class 2014-11-25 16:27:27 +01:00
Lukas Reschke
fc116f563f Allow read-only configuration 
Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database
 2014-11-25 16:26:47 +01:00
Bjoern Schiessle
4643a5d238 replace \OC:: with \OC::->getSession() 2014-11-25 16:15:32 +01:00
Thomas Müller
0f18274ca5 Merge pull request #12416 from owncloud/app-info-xml-parser-2 
App info xml parser 2
 2014-11-25 15:56:52 +01:00
Georg Ehrke
1a1b459ae8 delete old previews 2014-11-25 15:42:02 +01:00
Bjoern Schiessle
1d33503487 we no longer need to keep the session open for encryption 2014-11-25 13:37:11 +01:00
Thomas Müller
553188273c Merge pull request #12313 from oparoz/patch-2 
The class name is Movie NOT Movies
 2014-11-25 12:40:25 +01:00
Bjoern Schiessle
917bef39b7 don't store private public-share-key in session 2014-11-25 12:32:25 +01:00
Thomas Müller
5ce34fbaf6 handle invalid xml file 2014-11-25 11:53:28 +01:00
Thomas Müller
d4f107d4dd simplify xml parser code 2014-11-25 11:53:28 +01:00
Thomas Müller
c503ecd544 Introduce app info xml parser including basic unit test - necessary for #10777 2014-11-25 11:53:28 +01:00
Olivier Paroz
93a6cc17a5 The class name is Movie NOT Movies 2014-11-25 11:35:38 +01:00
Thomas Müller
b68c07d687 autoconfig.php only to be deleted on successful installation 2014-11-25 11:14:35 +01:00
Bjoern Schiessle
f274833403 remove unused variable 2014-11-25 10:12:10 +01:00
Morris Jobke
6fb2477fb7 Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate 
Don't disclose relative directory path for single shared files of user
 2014-11-25 10:09:16 +01:00
Morris Jobke
bc3c835f6a Merge pull request #12390 from owncloud/use-session-in-case 
Close session only if encryption app is not enabled
 2014-11-25 09:32:16 +01:00
Morris Jobke
53b2d85709 Merge pull request #12402 from owncloud/fix-phpdoc 
Fix PHPDoc and deprecated code
 2014-11-25 09:20:36 +01:00
Lukas Reschke
eb1dcb87c1 Merge pull request #12380 from owncloud/remove-oc-migrate 
Remove OC_Migrate
 2014-11-25 00:25:37 +01:00
Lukas Reschke
b947b65e5b Fix PHPDoc and deprecated code 
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
 2014-11-24 23:09:49 +01:00
Morris Jobke
02095d4f20 Merge pull request #11837 from owncloud/fix-11328 
unify count filters and introduce display name attribute detection
 2014-11-24 18:13:01 +01:00
Olivier Paroz
e2a9bd7838 You can only change the oritentation of a JPEG 
TIFFs also have EXIF headers, but they're not supported by the Image class

PHP doc
http://php.net/manual/en/function.exif-read-data.php
 2014-11-24 17:32:53 +01:00
Björn Schießle
949d7b3312 Merge pull request #12391 from owncloud/fix_12361 
use login name to verify password
 2014-11-24 17:06:48 +01:00
Thomas Müller
ddacd7f900 Merge pull request #12294 from owncloud/route-postfix 
Add route postfix to allow url versioning when only the http method changed
 2014-11-24 16:32:54 +01:00
Bjoern Schiessle
1645c8f819 use login name to verify password 2014-11-24 15:44:43 +01:00
Lukas Reschke
8589079590 Close session only if encryption app is not enabled 
Fixes https://github.com/owncloud/core/issues/12389
 2014-11-24 15:02:49 +01:00
Morris Jobke
168fce0b18 Merge pull request #12303 from owncloud/windows-unknown-command-command 
Deduplicate findBinaryPath() and do not try "command -v" on windows
 2014-11-24 14:03:07 +01:00
Morris Jobke
1b17429c1d Merge pull request #12142 from owncloud/DeprecateOldIAPICalls 
Deprecate older API wrappers and calls
 2014-11-24 14:01:49 +01:00
Morris Jobke
8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info 
sharing: make sure that we only find the shares from a given owner
 2014-11-24 11:44:43 +01:00
Thomas Müller
e956bd1094 Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change 
Use `/` as redirect location if webroot is set to an empty value
 2014-11-24 11:09:17 +01:00
Vincent Petry
49ad10cfd0 Merge pull request #12362 from owncloud/add-ocs-header-per-default 
Add OCS API header per default
 2014-11-24 11:09:00 +01:00
Lukas Reschke
216d617938 Remove OC_Migrate 
This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346
 2014-11-24 10:53:45 +01:00
Lukas Reschke
c556382160 Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore 
add puphpet and vagrant to gitignore
 2014-11-24 09:01:23 +01:00
Jenkins for ownCloud
0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Lukas Reschke
cebfdd877d Merge pull request #12372 from owncloud/preview_tiff_fix 
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
 2014-11-24 01:12:43 +01:00
Georg Ehrke
03a975a080 add puphpet and vagrant to gitignore 2014-11-23 23:01:50 +01:00
Georg Ehrke
45d985f2d8 remove ugly hack and don't use OC\Preview\Image for tiffs and svgs 2014-11-23 19:11:03 +01:00
Jenkins for ownCloud
a3496cf7fa [tx-robot] updated from transifex 2014-11-23 01:54:39 -05:00
Morris Jobke
fe46393115 Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci 
Rename providers to not begin with test
 2014-11-22 16:41:29 +01:00
Morris Jobke
2cc3edb10d Merge pull request #12328 from owncloud/remove-testcleanuplistener 
Remove testcleanuplistener
 2014-11-22 10:05:47 +01:00
Jenkins for ownCloud
fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Arthur Schiwon
9aef83b579 make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise) 2014-11-22 00:51:41 +01:00
Lukas Reschke
8c2aeb9b21 Add OCS API header per default 
Relieve @PVince from having to write it all the time ;-)
 2014-11-21 19:54:19 +01:00
Arthur Schiwon
503de94392 make updateCount work properly with new xp'd mode as well as without 2014-11-21 16:23:56 +01:00
Bjoern Schiessle
a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Lukas Reschke
0fa8b449b2 Use / as redirect location if webroot is set to an empty value 
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
 2014-11-21 15:38:36 +01:00
Arthur Schiwon
c07c338c90 fix counting when ldapPagingSize is 0 2014-11-21 14:51:20 +01:00
Miguel Prokop
397f14ed86 Consolidate if statement, and update unit test 2014-11-21 13:31:56 +01:00