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

21667 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jan-Christoph Borchardt
4602436bce fix notification visibility, fix #11016 2014-09-11 14:12:29 +02:00
Thomas Müller
9737ba74ce Merge pull request #11007 from owncloud/replaces-10850 
Add X-UA-Compatible to all templates
 2014-09-11 12:34:44 +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
Lukas Reschke
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
Vincent Petry
71776e307f Add select2 cache for complete group list 
To avoid making a server request every time the dropdown opens, the
whole list of groups are cached (from the last request):

Whenever the user types in a search term it will still send server
requests.
 2014-09-11 11:12:44 +02:00
Lukas Reschke
bce5c2dae9 Add X-UA-Compatible to all templates 
Replaces https://github.com/owncloud/core/pull/10850
 2014-09-11 10:28:52 +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
Thomas Müller
e6af67d5ea Merge pull request #9698 from owncloud/fix-9666 
Load apps in tests, fixes #9666
 2014-09-11 08:05:00 +02:00
Jenkins for ownCloud
0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
kondou
18ef7bf1ed Preserve transparency when loading from a file 
Fix #7148 - again :)
 2014-09-10 23:49:21 +02:00
Robin McCorkell
45b02f8f47 Merge pull request #10992 from oparoz/patch-3 
Create .user.ini for PHP-FPM
 2014-09-10 18:05:28 +01:00
Jan-Christoph Borchardt
8d0d336e03 fit select2 to ownCloud input style 2014-09-10 18:09:22 +02:00
Robin Appelman
0878f722db Fix contructor in test 2014-09-10 17:59:32 +02:00
Robin McCorkell
08e38a1072 Fix mkdir error in mountconfig.php 2014-09-10 17:28:25 +02:00
Robin McCorkell
b754a8261a Load apps in test situations 2014-09-10 17:28:25 +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
Olivier Paroz
59facd769f Create .user.ini for PHP-FPM 
PHP-FPM can't read .htaccess PHP settings unless a PECL extension is installed.
From version 5.3+ of PHP, settings can be set in .user.ini files

This is a .user.ini file mirroring what is included in the .htaccess file
TODO: Update the documentation if there are sections documenting how to change some PHP limits
 2014-09-10 16:08:40 +02:00
Lukas Reschke
1d639161b6 Merge pull request #10990 from owncloud/fix-testCallRegister-master 
requesttoken has now a length of 30 chars
 2014-09-10 16:04:44 +02:00
Robin Appelman
fa2b385d33 Fix method name 2014-09-10 15:59:24 +02:00
Thomas Müller
007802121c requesttoken has now a length of 30 chars 2014-09-10 15:35:21 +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
Vincent Petry
a064536ec1 Fixed select2 for admin and apps page 
Added explicit escaping.
Now internally using a pipe symbol as separator for select2, to make it
possible to use group names containing commas.
 2014-09-10 14:30:02 +02:00
Jörn Friedrich Dreyer
8e2acb1482 repair search lucene before installing 2014-09-10 10:22:40 +02:00
Jenkins for ownCloud
c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Lukas Reschke
fa096217b1 Merge pull request #9512 from libasys/patch-2 
Fix use Sharing Api with calendar
 2014-09-09 23:58:24 +02:00
Lukas Reschke
01e1157a54 Merge pull request #10844 from owncloud/acceptance-enableapps 
Added acceptance tests for enabling apps
 2014-09-09 23:44:06 +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
743d792f5e This fixes the double scrollbars issue 2014-09-09 22:59:16 +02:00
Vincent Petry
cd94b54be3 Merge pull request #10969 from owncloud/set-e 
terminate script execution in case of failure
 2014-09-09 20:08:48 +02:00
Bernhard Posselt
2a4201dbea Merge pull request #10964 from owncloud/static-array-functions 
More sugar for including lists of files in templates
 2014-09-09 18:56:48 +02:00
Vincent Petry
0d28ba0662 Added select2 on the apps page 
Moved setupGroupsSelect() from admin.js to a common settings.js
as OC.Settings.setupGoupsSelect().

Now using select2 as well on the apps page.
 2014-09-09 18:04:00 +02:00
Vincent Petry
39f5580cdf Remove excludegroup.php 
The ajax call is now using ajax/appconfig.php instead
 2014-09-09 18:04:00 +02:00
Vincent Petry
4a27f4b8b5 Load select2 on admin page 2014-09-09 18:03:05 +02:00
Vincent Petry
d23621536c Now using select2 for the groups excluded from sharing 2014-09-09 18:03:05 +02:00
Vincent Petry
412da87e65 Move select2 from files_external to core 2014-09-09 18:03:05 +02:00
kondou
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
Thomas Müller
8196536309 terminate script execution in case of failure 2014-09-09 17:12:20 +02:00
Bernhard Posselt
023e066971 more sugar for including lists of templates 2014-09-09 15:47:42 +02:00
Lukas Reschke
dc99fd768a Merge pull request #10948 from owncloud/fix-zindex 
fix z-index of header and dropdowns, fix user menu not showing on mobile
 2014-09-09 14:23:28 +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
Thomas Müller
fd92fc7c47 Merge pull request #9753 from owncloud/filepath-css 
Remove special case for css in OC.filePath
 2014-09-09 13:59:19 +02:00
Lukas Reschke
e3c99a8505 Add beforeeach and aftereach 2014-09-09 13:08:50 +02:00
Lukas Reschke
cabd70148f Add unittest for filePath 2014-09-09 12:05:19 +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