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

22115 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
68efeba343 Merge pull request #13125 from owncloud/lower-deprecation-warning-level 
degraded logging policy for server container in AppFramework
 2015-01-06 14:38:50 +01:00
Thomas Müller
20886d8151 Merge pull request #13116 from owncloud/fix_assets 
Fix JS asset generation
 2015-01-06 14:36:51 +01:00
Morris Jobke
4ffe7ddb75 degraded logging policy for server container in AppFramework 2015-01-06 13:43:40 +01:00
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Thomas Müller
c0ad6e818b Merge pull request #13101 from owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that 
Fix undefined variable and write unit tests for OC_Principal connector
 2015-01-05 20:09:10 +01:00
Robin McCorkell
2c44bc1768 Fix JS asset generation 
At some point SeparatorFilter should be included upstream
(kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be
removed and the `use` in lib/private/templatelayout.php rewritten.

SeparatorFilter inserts a separator between assets, preventing issues when
files are incorrectly terminated. For JS this is a semicolon.
 2015-01-05 15:48:04 +00:00
Morris Jobke
0e17a00b62 Merge pull request #13103 from owncloud/fix-htaccess-regex 
escape . in htaccess regex for CSS and JS HTTP headers
 2015-01-05 13:26:56 +01:00
Morris Jobke
e5ea000aae Merge pull request #13108 from owncloud/fix-public-link-mount-for-pre-oc7 
Check for version before mounting a public link
 2015-01-05 13:23:13 +01:00
Bernhard Posselt
a6d2019014 Merge pull request #13107 from owncloud/change-to-better-error-level 
Use info instead of warning log level
 2015-01-05 12:09:59 +01:00
Morris Jobke
28c8f5a0f9 Check for version before mounting a public link 
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
 2015-01-05 11:50:05 +01:00
Lukas Reschke
8689605999 Use info instead of warning log level 
Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106

Fixes https://github.com/owncloud/core/issues/13106
 2015-01-05 11:18:54 +01:00
Lukas Reschke
a0023974e3 Merge pull request #13099 from owncloud/fix-provisioning-api 
Remove unnecessary setUp method from provisioning_api
 2015-01-05 10:35:24 +01:00
Morris Jobke
e97219cf75 escape . in htaccess regex for CSS and JS HTTP headers 2015-01-05 10:23:24 +01:00
Lukas Reschke
3e324f87d0 Use proper test name 2015-01-05 09:54:14 +01:00
Lukas Reschke
7b3f736300 Use proper namespace 2015-01-05 09:54:14 +01:00
Lukas Reschke
0ed00bca43 Use namespace 2015-01-05 09:54:14 +01:00
Lukas Reschke
556c9b6f46 Write unit-tests and use DI 2015-01-05 09:54:12 +01:00
Lukas Reschke
f2ddd565e8 Fix code-style 2015-01-05 09:53:01 +01:00
Morris Jobke
f2e759b533 Merge pull request #13095 from derkostka/master 
fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
 2015-01-05 09:47:44 +01:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Tom Needham
f17f0ade7f Remove unnecessary setUp method 2015-01-04 23:10:44 +00:00
derkostka
deedfad050 fix "app":"PHP","message":"Undefined variable: user at/principal.php#66" 
changed variable #user to #name
 2015-01-04 17:07:33 +01:00
Morris Jobke
298eae9c86 Merge pull request #13060 from dratini0/master 
Fix: X-Accel-Redirect did not support custom data dir and local mounts
 2015-01-04 10:09:30 +01:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Morris Jobke
fcae87170d Merge pull request #13091 from owncloud/fix-provisioning-api 
Fix remaining unit tests for provisioning_api
 2015-01-03 22:41:44 +01:00
Tom Needham
a20de1548d Add proper group setup and teardown to all provisioning_api tests 2015-01-03 15:58:36 +00:00
Tom Needham
5c0d7f2ee5 Create admin group before running provisioning_api tests 2015-01-03 15:39:42 +00:00
Tom Needham
97d31946c3 Ensure admin group is present before running tests 2015-01-03 13:25:48 +00:00
Morris Jobke
92f062baac Merge pull request #13082 from mmattel/rename_text_no_external_storages 
adopt text "no external storage configured"
 2015-01-03 11:59:22 +01:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
Thomas Müller
81f4811300 Merge pull request #13083 from owncloud/fix-provisioning-api 
Add provisioning_api app.php so app is detected
 2015-01-02 21:23:05 +01:00
root
c44d41178a adopt text "no ecternal storage configured" 
storage -> storages
 2015-01-02 21:00:02 +01:00
Tom Needham
32d9563359 Change array element order to fix failing test 2015-01-02 19:07:31 +00:00
Tom Needham
a4f270a9ce Add placeholder app.php for provisioning_api so app is detected 2015-01-02 18:52:11 +00:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Frank Karlitschek
ac6c7845f0 8.0 alpha 1 2015-01-01 23:07:16 +01:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
dratini0
31970ee740 removed a little duplication 2014-12-30 22:36:13 +01:00
dratini0
f2075f803f Fix: X-Accel-Redirect did not support custom data dir and local mounts 2014-12-30 22:07:04 +01:00
Frank Karlitschek
c16cb74ba2 jump to 8.0.0.0 The test upgrade and installation of apps realistic. 
Don´t open the champaign yet. This is obviously not the final release. ;-)
The final will have the version number 8.0.0.x
 2014-12-30 22:02:41 +01:00
Lukas Reschke
59930fcdbf Merge pull request #13055 from owncloud/dbal25 
update dbal to 2.5.0
 2014-12-30 19:04:50 +01:00
Robin Appelman
571d3a031f update dbal to 2.5.0 2014-12-30 16:47:30 +01:00
Jenkins for ownCloud
01374ab6b5 [tx-robot] updated from transifex 2014-12-30 01:54:26 -05:00
Frank Karlitschek
cd53da43c0 Merge pull request #12854 from owncloud/add-direct-download-link 
Adding foundation for the direct download url
 2014-12-29 18:47:39 +01:00
Jenkins for ownCloud
c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Thomas Müller
81243b0f5d adding getDirectDownload() to Wrapper 2014-12-28 17:17:14 +01:00
Thomas Müller
5b00bc1d6e Adding basement for the direct download url 2014-12-28 17:17:14 +01:00
Thomas Müller
9f327457dc Merge pull request #13023 from owncloud/provisioning_api-2 
[jenkins] Add provisioning_api app
 2014-12-28 14:29:49 +01:00
Thomas Müller
aec79b0c0e Merge pull request #13043 from owncloud/check-for-hash 
Check for hash
 2014-12-28 14:12:57 +01:00