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

2244 commits

Author SHA1 Message Date
Morris Jobke
7f4e447a5f fix shortcuts - underline instead of camelCase 2014-11-04 13:57:38 +01:00
Morris Jobke
fde8ef0655 Merge pull request #11916 from owncloud/introduce-bower 
Introduce bower dependency managment for frontend libraries
 2014-11-04 11:59:33 +01:00
Morris Jobke
7f1d974796 Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig 
First check whether it is the default config before touching
 2014-11-03 21:20:42 +01:00
Morris Jobke
d763b32048 ability to add bower resources 
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
 2014-11-03 20:54:40 +01:00
Thomas Müller
994768d99f Update Pimple to V3.0 2014-11-03 16:57:16 +01:00
Lukas Reschke
9790801268 First check whether it is the default config before touchign 
Potentially fixes https://github.com/owncloud/core/issues/11678
 2014-11-03 16:37:04 +01:00
Morris Jobke
56cf1d9d27 fix odd behaviour 2014-10-31 18:46:47 +01:00
Vincent Petry
fd4b97d758 Merge pull request #9044 from owncloud/add-missing-email-principal 
adding missing email address for principal
 2014-10-31 13:24:42 +01:00
Vincent Petry
55658e7bb2 Merge pull request #11539 from owncloud/mount-setup-once 
Only mount the storages for the user once
 2014-10-31 10:42:29 +01:00
Morris Jobke
1c7f1a8787 Merge pull request #11877 from owncloud/fix-11875-master 
prevent PHP notice
 2014-10-30 21:43:38 +01:00
Vincent Petry
bed81ea854 Merge pull request #11080 from owncloud/addheader-text-2 
Fix the addHeader tag attributes text methods to not ignore the text parameter
 2014-10-30 18:13:46 +01:00
Thomas Müller
99921489cf prevent PHP notice 2014-10-30 17:24:25 +01:00
Thomas Müller
9b293537a6 Merge pull request #11740 from owncloud/update-archive-tar 
Update pear/archive_tar to 1.3.13
 2014-10-30 17:14:07 +01:00
Lukas Reschke
6db69c5d05 Merge pull request #11864 from owncloud/clear-session-after-logout 
Clear session after logout
 2014-10-30 16:47:46 +01:00
Morris Jobke
90e523ead0 Merge pull request #11858 from owncloud/fix-11064 
Allow any outgoing XHR connections
 2014-10-30 16:19:39 +01:00
Thomas Müller
08b46ccc17 Update pear/archive_tar to 1.3.13 2014-10-30 16:10:00 +01:00
Thomas Müller
18f7f582ac Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro 
Fix stupid copy paste fail
 2014-10-30 14:45:58 +01:00
Morris Jobke
e2001c6d31 Merge pull request #11821 from owncloud/generic-response 
Add a generic data response
 2014-10-30 14:05:25 +01:00
Lukas Reschke
770c62c5d8 Clear session after logout 
Fixes https://github.com/owncloud/core/issues/8420
 2014-10-30 12:10:39 +01:00
Lukas Reschke
e219d72619 Fix stupid copy paste fail 
...
 2014-10-30 10:37:59 +01:00
Lukas Reschke
b3f881748d Allow any outgoing XHR connections 
Quickfix for https://github.com/owncloud/core/issues/11064
 2014-10-30 00:00:40 +01:00
Vincent Petry
106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse 
Pass the cached data to the filesystem watcher
 2014-10-29 16:38:16 +01:00
Thomas Müller
fb4f993336 Fix implementation of translation short cut 2014-10-29 10:58:10 +01:00
Vincent Petry
c682b1f0c1 Fix language file detection 2014-10-29 10:13:51 +01:00
Thomas Müller
2f19de11e4 adding console command to generate javascript translation files based on existing php translation files 
read server side translations from json files
 2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78 in case a translation javascript is not found we no longer bail out 
remove translation.php
 2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions 
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
 2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad add dataresponse 
fix docstrings

adjust copyright date

another copyright date update

another header update

implement third headers argument, fix indention, fix docstrings

fix docstrings
 2014-10-29 09:43:47 +01:00
Robin Appelman
2974d4d380 Reset the users setup after clearing mounts 2014-10-28 15:13:29 +01:00
Lukas Reschke
510d0b2cf3 Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter 
Also support closing tags with no text content given

Conflicts:
	lib/private/template.php
 2014-10-28 11:15:58 +01:00
Morris Jobke
4461e69873 Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling 
Properly catch 503 storage not available in getQuotaInfo
 2014-10-28 09:33:54 +01:00
Lukas Reschke
d6380a5395 Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable 
Make supported DBs configurable within config.php
 2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51 code cleanup during review 👍 2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9 Make supported DBs configurable within config.php 
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".
 2014-10-27 21:39:34 +01:00
Robin Appelman
3f63f4b6b1 Only mount the storages for the user once 2014-10-27 18:50:28 +01:00
Vincent Petry
21d825ed6c Properly catch 503 storage not available in getQuotaInfo 
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.
 2014-10-27 16:27:12 +01:00
Morris Jobke
a00712aa65 Merge pull request #11783 from owncloud/allow_passing_driver_options 
allow passing db driver options
 2014-10-27 16:00:13 +01:00
Robin Appelman
8de287f2ef Merge pull request #11763 from owncloud/stable-etags 
Generate stable etags for local files
 2014-10-27 15:30:30 +01:00
Jörn Friedrich Dreyer
e16a58220d allow passing driver options, fixes #11718 2014-10-27 12:30:29 +01:00
Vincent Petry
aee1edf6b5 Merge pull request #11708 from owncloud/fix-momentjs 
Setting moment locale based on user selection
 2014-10-27 10:30:47 +01:00
Lukas Reschke
acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible 
Add type hinting to functions
 2014-10-25 14:09:48 +02:00
Morris Jobke
be32e562e3 drop unneeded hint 2014-10-25 12:00:56 +02:00
Morris Jobke
63f2b1f460 Merge pull request #11767 from danbartram/add_db_rollback 
Add missing DB rollback functionality
 2014-10-24 19:52:56 +02:00
Thomas Müller
9fa5483111 Merge pull request #11709 from owncloud/temp-handling 
Cleanup handling of temporary files
 2014-10-24 19:29:05 +02:00
Dan Bartram
9c1015b790 Add missing DB rollback functionality 2014-10-24 17:44:06 +01:00
Robin Appelman
283c10f010 Generate stable etags for local files 2014-10-24 16:47:58 +02:00
Lukas Reschke
f901c5ff08 Fix PHPDoc and remove explicit type hint 2014-10-24 15:49:55 +02:00
Lukas Reschke
b3a04840b5 Add type hinting to functions 
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
 2014-10-24 14:13:40 +02:00
Robin Appelman
16cfca6a5f Better reuse of cache data for getFolderContents 2014-10-24 12:33:54 +02:00
Robin Appelman
0a3f57f832 Pass the cached data to the filesystem watcher 2014-10-24 12:32:55 +02:00