Commit Graph

20181 Commits

Author SHA1 Message Date
Clark Tomlinson 7d4317e9fb Merge pull request #10845 from owncloud/usealphanumericstring
Only return lowercase letters and digits for backwards compatbility
2014-09-03 11:36:21 -04:00
Lukas Reschke 26f337d523 Only return lowercase letters and digits for backwards compatbility 2014-09-03 17:18:00 +02:00
Thomas Müller 954925eaa0 Merge pull request #10667 from pmjdebruijn/itunes-appid
defaults: add customizable defaultiTunesAppId
2014-09-03 16:26:20 +02:00
Lukas Reschke 373d1c5e9f Merge pull request #10642 from owncloud/securityutils
Add some security utilities
2014-09-03 15:28:42 +02:00
Clark Tomlinson d64cacec43 Merge pull request #10826 from oparoz/master
Adding TIFF support to the files app
2014-09-03 09:14:35 -04:00
Clark Tomlinson 0400f7845c Merge pull request #10723 from owncloud/webdav-folder-size
adding new webdav property containing the folder size
2014-09-03 09:07:23 -04:00
Lukas Reschke dbbdcff862 Increment version 2014-09-03 14:21:35 +02:00
Lukas Reschke dcea6de26a Fix quoting 2014-09-03 14:16:55 +02:00
Lukas Reschke a54af89d8a Add test for the second argument 2014-09-03 14:13:12 +02:00
Lukas Reschke 1ccbaae846 Refactor tests a little bit 2014-09-03 13:51:44 +02:00
Olivier Paroz 3bf155e138 This is not a PDF, there are no pages 2014-09-03 12:32:59 +02:00
Lukas Reschke 20a7fb0334 Fix CHAR_SYMBOLS 2014-09-03 12:22:21 +02:00
Thomas Müller 6cdb1d89ae Merge pull request #10761 from canadaduane/fix_occ_upgrade
Ensure db connection before changing cache state
2014-09-03 11:27:16 +02:00
Thomas Müller 52dc31e13c Merge pull request #10725 from owncloud/sabredav-etag-master
adding OC-ETag header
2014-09-03 11:21:47 +02:00
Lukas Reschke 77c0adb520 Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils 2014-09-03 11:04:49 +02:00
Lukas Reschke 50b430ee7c Add char consts, hash the specified password for the HMAC 2014-09-03 11:03:27 +02:00
Jenkins for ownCloud 8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Olivier Paroz b559b21dc3 Converts TIFF files to PNG 2014-09-02 22:56:39 +02:00
Olivier Paroz 1e600a0d36 Adding support for tiff files 2014-09-02 22:53:41 +02:00
jbtbnl 70c54d485a Merge pull request #10816 from owncloud/app-nav-submit
Also style submit buttons for navigation inputs
2014-09-02 20:13:34 +02:00
Robin Appelman e5fec4df0c Merge pull request #10697 from owncloud/fs-no-autosetup
Don't automatically setup the filesystem the moment we load OC\Files\Filesystem
2014-09-02 20:01:34 +02:00
Robin Appelman 3c618a0252 Also setup the filesystem when matching routes 2014-09-02 16:15:42 +02:00
Robin Appelman 724ff6264a Remove unneeded file initialization in encryption, already handled in a hook 2014-09-02 16:15:42 +02:00
Robin Appelman a9a37b5363 Don't automatically setup the filesystem the moment we load OC\Files\FileSystem 2014-09-02 16:15:42 +02:00
Vincent Petry 90f66e0f8d Merge pull request #10807 from owncloud/acceptance-readme
Fixed readme for acceptance tests
2014-09-02 11:57:16 +02:00
Bernhard Posselt 93abef4059 also style submit buttons 2014-09-02 11:40:53 +02:00
Jenkins for ownCloud 689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Vincent Petry 47c3a5c3b1 Fixed readme for acceptance tests 2014-09-01 22:57:54 +02:00
felixboehm 9020a375a7 Merge pull request #10733 from owncloud/acceptance_tests
ownCloud acceptance tests
2014-09-01 19:38:23 +02:00
Jenkins for ownCloud e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
felixboehm 6efc7ebef5 Merge pull request #10779 from owncloud/ignore-po-files
remove po files and ignore them in the future
2014-08-31 18:06:14 +02:00
Morris Jobke 06fd51d2fc Merge pull request #10644 from owncloud/app-navigation-utils
Create boilerplate css code for navigation utilities, like delete and edit
2014-08-31 17:51:01 +02:00
Bernhard Posselt c9012be0b6 Add app utilities - CSS menus for sidebar
* has-menu, has-count
* use active for has-menu to show it
* use open for action popup to show up
* inactive buttons have less opacity
* borders for edit input
* use z-index for app content on mobile to prevent navigation items from sticking out
2014-08-31 17:42:54 +02:00
Morris Jobke 2e76b5cc9e Merge pull request #10778 from owncloud/eof-cron
add proper End of Line character
2014-08-31 16:35:03 +02:00
Morris Jobke 4024960a0e Merge pull request #10780 from owncloud/config-public
Extend public config interface
2014-08-31 15:54:35 +02:00
Lukas Reschke 8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman 0a1e5aebf1 Extend public config interface 2014-08-31 15:27:36 +02:00
Lukas Reschke fe74b397a5 Use correct 3rdparty 2014-08-31 15:27:15 +02:00
Lukas Reschke ae3425d2da Merge branch 'master' into securityutils
Conflicts:
	lib/private/util.php
2014-08-31 15:21:09 +02:00
Thomas Müller c67cb54ca0 remove po files and ignore them in the future 2014-08-31 15:02:44 +02:00
Morris Jobke b7445582dc add proper End of Line character 2014-08-31 14:21:46 +02:00
Morris Jobke 73685892ed Merge pull request #10770 from owncloud/getUserFolder
update public interface for getUserFolder
2014-08-31 13:26:32 +02:00
Robin Appelman 3a85767182 5.3 syntax... 2014-08-31 13:16:28 +02:00
Lukas Reschke a197ef0f6c Merge pull request #10768 from owncloud/l10n-use-public
Use public api for getting l10n
2014-08-31 11:58:59 +02:00
Morris Jobke ac6324a5d0 update public interface for getUserFolder 2014-08-31 11:16:40 +02:00
Robin Appelman ab5a389836 Merge pull request #10766 from owncloud/getUserFolder
Add optional user ID parameter for getUseFolder
2014-08-31 11:07:37 +02:00
Robin Appelman bfa0c4b78a Explicitly set the timezones 2014-08-31 11:06:18 +02:00
Lukas Reschke 4bc9980f4b Add test for expired certificate
Will only work after tomorrow
2014-08-31 10:47:50 +02:00
Lukas Reschke 4efe6f6240 Add unit tests and fix rootcerts creation bug 2014-08-31 10:47:50 +02:00
Robin Appelman 1361bbb1e6 Cleanup routes 2014-08-31 10:47:50 +02:00