Thomas Müller
|
ba445e85b2
|
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
Deduplicate dependency checks
|
2014-09-16 16:33:02 +02:00 |
Lukas Reschke
|
2f10b60c9e
|
Merge pull request #10754 from cetra3/master
Refactor internal session handler to write directly to $_SESSION
|
2014-09-16 15:48:19 +02:00 |
Lukas Reschke
|
261d07c95c
|
Merge pull request #11084 from owncloud/no-migration-for-mssql-master
Disable database migrations for MSSQL - scripts have to be applied manua...
|
2014-09-16 14:00:24 +02:00 |
Lukas Reschke
|
5813cf32dc
|
Deduplicate dependency checks
Some code that I also used for https://github.com/owncloud/administration/pull/11
|
2014-09-16 13:07:47 +02:00 |
Morris Jobke
|
dd70d1b88c
|
Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
Fix unexisting class and PHPDoc
|
2014-09-16 10:29:01 +02:00 |
Morris Jobke
|
af52ffc5d5
|
Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
add y to with-aspect naming schema
|
2014-09-16 08:36:33 +02:00 |
Morris Jobke
|
245a0e2ad8
|
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
Preserve transparency when loading from a file
|
2014-09-16 08:33:56 +02:00 |
Lukas Reschke
|
4f0f7e35ca
|
Fix unexisting class and PHPDoc
You can't add int here as hint...
|
2014-09-15 17:08:56 +02:00 |
Morris Jobke
|
06eb3b62c6
|
Merge pull request #10109 from owncloud/issue_#9793_guestlayout
Step one, open guest layout for different styles.
|
2014-09-15 15:15:41 +02:00 |
Georg Ehrke
|
cf76933b76
|
add phpdoc
|
2014-09-15 15:10:03 +02:00 |
Georg Ehrke
|
3157d307f7
|
add y to with-aspect naming schema
|
2014-09-15 15:10:03 +02:00 |
Thomas Müller
|
d824d03fe1
|
Disable database migrations for MSSQL - scripts have to be applied manually
|
2014-09-15 15:00:32 +02:00 |
Lukas Reschke
|
07b14bcd4f
|
Merge pull request #10960 from owncloud/use-intl-module-master
use intl's native normalizer_normalize() in case the module is available
|
2014-09-15 14:13:30 +02:00 |
Raghu Nayyar
|
1145529584
|
Merge pull request #11041 from owncloud/no-size-check-on-lock-master
content size checks are not valid for LOCK
|
2014-09-13 00:48:52 +05:30 |
Lukas Reschke
|
5ff999d69d
|
Return false in case one of the values is null
|
2014-09-12 13:34:45 +02:00 |
Thomas Müller
|
27cd30aa94
|
content size checks are not valid for LOCK
|
2014-09-12 09:42:32 +02:00 |
Thomas Müller
|
4878f7a416
|
Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
Add custom hex2bin implementation for 5.3
|
2014-09-11 15:05:36 +02:00 |
Lukas Reschke
|
7d2c521b46
|
Step one, open guest layout for different styles.
Conflicts:
core/templates/layout.guest.php
Step one, open guest layout for different styles.
|
2014-09-11 11:41:02 +02:00 |
Thomas Müller
|
59209e0f2b
|
use intl's native normalizer_normalize() in case the module is available
|
2014-09-11 10:24:31 +02:00 |
Lukas Reschke
|
bfebbe47de
|
Merge pull request #10962 from owncloud/repair_search_lucene
repair search lucene before installing
|
2014-09-11 10:09:43 +02:00 |
Lukas Reschke
|
1973275adc
|
Add custom hex2bin implementation for 5.3
Fixes https://github.com/owncloud/core/issues/11004
|
2014-09-11 09:51:45 +02:00 |
kondou
|
18ef7bf1ed
|
Preserve transparency when loading from a file
Fix #7148 - again :)
|
2014-09-10 23:49:21 +02:00 |
Thomas Müller
|
2a382a87d5
|
Merge pull request #10988 from owncloud/usetransactions-wrong-name
Fix method name useTransactions
|
2014-09-10 17:27:23 +02:00 |
Robin Appelman
|
fa2b385d33
|
Fix method name
|
2014-09-10 15:59:24 +02:00 |
Vincent Petry
|
70ebe86e60
|
Merge pull request #10929 from owncloud/issue/10514
Set overwritewebroot when installing owncloud to avoid problems
|
2014-09-10 15:07:57 +02:00 |
Jörn Friedrich Dreyer
|
8e2acb1482
|
repair search lucene before installing
|
2014-09-10 10:22:40 +02:00 |
Bernhard Posselt
|
ba698a4942
|
Merge pull request #10972 from ppaysant/routes-defaults
Allow default values for route parameters.
|
2014-09-09 23:40:46 +02:00 |
Lukas Reschke
|
c3d90b96c8
|
Merge pull request #10922 from owncloud/explicit-scan-transactions
Use bigger transactions when doing explicit file system scans
|
2014-09-09 23:32:32 +02:00 |
Patrick Paysant
|
cb5416b798
|
Allow default values for route parameters.
|
2014-09-09 23:00:29 +02:00 |
Bernhard Posselt
|
023e066971
|
more sugar for including lists of templates
|
2014-09-09 15:47:42 +02:00 |
Bernhard Posselt
|
d02f6c7ebe
|
Merge pull request #10947 from owncloud/html-imports
add template functions for html imports
|
2014-09-09 14:07:46 +02:00 |
Jörn Friedrich Dreyer
|
3d4f77c8f1
|
Merge pull request #10949 from owncloud/allow_prefilling_login
allow prefilling login
|
2014-09-09 11:42:14 +02:00 |
Lukas Reschke
|
353155b516
|
Merge pull request #7323 from owncloud/Jonny007-MKD-master
Update adapter.php
|
2014-09-09 11:31:50 +02:00 |
Jörn Friedrich Dreyer
|
ed2414fd0d
|
Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
Keep fileid on move in objectstore, fixes #10848
|
2014-09-09 10:25:10 +02:00 |
VicDeo
|
efd485acda
|
Merge pull request #10858 from owncloud/issue/10847
Use correct language package so the subject is correctly translated
|
2014-09-09 01:11:34 +03:00 |
Jörn Friedrich Dreyer
|
0aad7fa1b1
|
allow prefilling login
|
2014-09-08 21:44:13 +02:00 |
Bernhard Posselt
|
f685d03674
|
append .html since componets always use html files
|
2014-09-08 21:37:18 +02:00 |
Bernhard Posselt
|
4aff85cd0c
|
add template functions for html imports
|
2014-09-08 21:19:44 +02:00 |
Lukas Reschke
|
70abce0482
|
Merge pull request #10739 from owncloud/eventsource-public
Add EventSource to the public API
|
2014-09-08 18:46:27 +02:00 |
Lukas Reschke
|
c79c894dbb
|
Merge pull request #10755 from owncloud/shorter_sharing_links
Shorter sharing links
|
2014-09-08 17:26:20 +02:00 |
Lukas Reschke
|
2d847934ed
|
Merge pull request #10938 from owncloud/useSecureMimetype
Use secure mimetype for content delivery
|
2014-09-08 17:13:54 +02:00 |
Lukas Reschke
|
5de404eb92
|
Merge pull request #10827 from oparoz/patch-2
Libreoffice config folder needs to be set
|
2014-09-08 16:41:26 +02:00 |
Lukas Reschke
|
fa718d2e2c
|
Fix typo
|
2014-09-08 16:34:03 +02:00 |
Lukas Reschke
|
0cdfe4f8c2
|
Merge pull request #10911 from owncloud/template-funcs
Add template shortcut functions for style and script
|
2014-09-08 16:32:05 +02:00 |
Lukas Reschke
|
312ed18d15
|
Use secure mimetype for content delivery
Adds some hardening against potential CSP bypassed.
|
2014-09-08 15:57:39 +02:00 |
Joas Schilling
|
249558966e
|
Set overwritewebroot when installing owncloud to avoid problems
Fix #10514
|
2014-09-08 14:30:13 +02:00 |
Robin Appelman
|
644755df66
|
Use bigger transactions when doing explicit file system scans
|
2014-09-08 14:15:41 +02:00 |
Vincent Petry
|
637cff68ac
|
Merge pull request #10862 from chli1/master
fix BadRequest error if CONTENT_LENGTH not set
|
2014-09-08 10:00:15 +02:00 |
cetra3
|
459ead69f6
|
Merge branch 'master' of https://github.com/owncloud/core
|
2014-09-08 15:05:49 +09:30 |
Bernhard Posselt
|
7e4d244200
|
add shortcut functions for style and script
|
2014-09-06 14:25:28 +02:00 |