368391e401
Merge pull request #11009 from owncloud/tobiasKaminsky-route
...
REST API for thumbnails
2014-09-16 19:31:51 +02:00
4ebc11aa8d
Merge pull request #11102 from owncloud/visit1985-issue_108
...
mysql setup: if dbuser exists try a different one (owncloud/core#108 )
2014-09-16 18:54:37 +02:00
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
ba445e85b2
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
...
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
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
e62d5b7e55
Route for thumbnail generation
...
Thumbnail generation
Removed Log
Added requested changes
Added requested changes.
- Fix code style
- Add exception if file does not exist
- Switch route styling
Replaces https://github.com/owncloud/core/pull/10805
Fix codestyle
Fix codestyle
Migrate to appframework
Fix typo
2014-09-16 15:00:58 +02:00
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
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
e6609d0970
simplify mysql user creation flow
...
if dbuser exists try a different one, owncloud/core#108
changed outdated comment
corrected length calculation
changed indentation for else clauses
2014-09-16 11:53:54 +02:00
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
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
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
627252fe81
Merge pull request #11060 from owncloud/rmobslang
...
remove obsolete language files
2014-09-15 17:31:10 +02:00
4f0f7e35ca
Fix unexisting class and PHPDoc
...
You can't add int here as hint...
2014-09-15 17:08:56 +02:00
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
cf76933b76
add phpdoc
2014-09-15 15:10:03 +02:00
3157d307f7
add y to with-aspect naming schema
2014-09-15 15:10:03 +02:00
d824d03fe1
Disable database migrations for MSSQL - scripts have to be applied manually
2014-09-15 15:00:32 +02:00
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
5d1fa60e0d
remove obsolete language files
2014-09-13 15:29:11 +02:00
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
cfd8b3f976
Merge pull request #11043 from owncloud/test-againstNull
...
Return false in case the passed values are not of type string
2014-09-12 09:42:42 -04:00
5ff999d69d
Return false in case one of the values is null
2014-09-12 13:34:45 +02:00
27cd30aa94
content size checks are not valid for LOCK
2014-09-12 09:42:32 +02:00
d6834b6389
[tx-robot] updated from transifex
2014-09-12 03:28:56 -04:00
4878f7a416
Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
...
Add custom hex2bin implementation for 5.3
2014-09-11 15:05:36 +02:00
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
8d7926543b
Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over
...
Refresh if maintenance mode is over
2014-09-11 11:34:39 +02:00
59209e0f2b
use intl's native normalizer_normalize() in case the module is available
2014-09-11 10:24:31 +02:00
bfebbe47de
Merge pull request #10962 from owncloud/repair_search_lucene
...
repair search lucene before installing
2014-09-11 10:09:43 +02:00
1973275adc
Add custom hex2bin implementation for 5.3
...
Fixes https://github.com/owncloud/core/issues/11004
2014-09-11 09:51:45 +02:00
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
18ef7bf1ed
Preserve transparency when loading from a file
...
Fix #7148 - again :)
2014-09-10 23:49:21 +02:00
2a382a87d5
Merge pull request #10988 from owncloud/usetransactions-wrong-name
...
Fix method name useTransactions
2014-09-10 17:27:23 +02:00
fa2b385d33
Fix method name
2014-09-10 15:59:24 +02:00
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
8e2acb1482
repair search lucene before installing
2014-09-10 10:22:40 +02:00
ba698a4942
Merge pull request #10972 from ppaysant/routes-defaults
...
Allow default values for route parameters.
2014-09-09 23:40:46 +02:00
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
cb5416b798
Allow default values for route parameters.
2014-09-09 23:00:29 +02:00
69f2c0544e
Refresh if maintenance mode is over
...
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.
Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
023e066971
more sugar for including lists of templates
2014-09-09 15:47:42 +02:00
d02f6c7ebe
Merge pull request #10947 from owncloud/html-imports
...
add template functions for html imports
2014-09-09 14:07:46 +02:00
3d4f77c8f1
Merge pull request #10949 from owncloud/allow_prefilling_login
...
allow prefilling login
2014-09-09 11:42:14 +02:00
353155b516
Merge pull request #7323 from owncloud/Jonny007-MKD-master
...
Update adapter.php
2014-09-09 11:31:50 +02:00
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
317e6d03b4
[tx-robot] updated from transifex
2014-09-09 01:55:47 -04:00
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
a9a3f17b35
Merge pull request #10927 from owncloud/update-nosetupbackends
...
Do not load extra user backends when an upgrade is due
2014-09-08 22:57:15 +02:00
0aad7fa1b1
allow prefilling login
2014-09-08 21:44:13 +02:00
Lukas Reschke
Thomas Müller
tobiasKaminsky
Michael Göhler
Morris Jobke
Georg Ehrke
Volkan Gezer
Raghu Nayyar
Clark Tomlinson
Jenkins for ownCloud
kondou
Robin Appelman
Vincent Petry
Jörn Friedrich Dreyer
Bernhard Posselt
Patrick Paysant
Bernhard Posselt
VicDeo