summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use Doctrines filter by table nametbelau6662014-12-225-6/+17
| | | | | | | Doctrine's SchemaManager can filter table names by regular expression. On this way it picks up only ownClouds's tables in a database. by tbelau666
* Merge pull request #12969 from owncloud/clarify-docsMorris Jobke2014-12-222-4/+4
|\ | | | | Clarify return values
| * Fix typoLukas Reschke2014-12-192-2/+2
| |
| * Clarify return valuesLukas Reschke2014-12-192-2/+2
| | | | | | | | This function returns `null` when no user is logged-in.
* | Merge pull request #12961 from owncloud/try_to_cache_keysMorris Jobke2014-12-224-19/+91
|\ \ | | | | | | cache keys to read them only once from the hard disc
| * | cache keys to read them only once from the hard discBjoern Schiessle2014-12-194-19/+91
| | |
* | | Merge pull request #12983 from owncloud/root-ifaceMorris Jobke2014-12-222-1/+35
|\ \ \ | | | | | | | | Add an interface for the root folder so apps have an interface to deal with storage
| * | | add an interface for the root folder so apps have an interface to deal with ↵Bernhard Posselt2014-12-212-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage fix comments and newline add newline
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2244-14/+852
| | | |
* | | | Merge pull request #12978 from owncloud/fix-support-claimThomas Müller2014-12-211-1/+1
|\ \ \ \ | | | | | | | | | | Change support message to be more explicit about the enterprise edition
| * | | | Change support message to be more explicit about the enterprise editionMorris Jobke2014-12-201-1/+1
| | | | |
* | | | | Merge pull request #12981 from owncloud/MDB2SchemaManager-tearDown-OracleThomas Müller2014-12-211-3/+2
|\ \ \ \ \ | | | | | | | | | | | | Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
| * | | | | Properly call parent::tearDown() in MDB2SchemaManager::tearDown().Andreas Fischer2014-12-201-3/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | The early return introduced by 04c982a96e19f2254739c24ee8c6b568edcb4190 prevents parent::tearDown() being called on Oracle.
* | | | | Merge pull request #12982 from owncloud/timefac-ifaceThomas Müller2014-12-212-1/+41
|\ \ \ \ \ | | | | | | | | | | | | Add an interface for the timefactory class
| * | | | | add an interface for the timefactory classBernhard Posselt2014-12-202-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | fix indention
* | | | | | Merge pull request #12942 from owncloud/favs-missingsharedsubdirsMorris Jobke2014-12-212-13/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix issues with searchByTag in shared storage
| * | | | | | Fix issues with searchByTag in shared storageVincent Petry2014-12-182-13/+78
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-2174-18/+398
| |_|/ / / |/| | | |
* | | | | Merge pull request #12974 from owncloud/documents-typefaceMorris Jobke2014-12-201-0/+0
|\ \ \ \ \ | | | | | | | | | | | | change Documents default typeface from serif to sans-serif
| * | | | | change Documents default typeface from serif to sans-serifJan-Christoph Borchardt2014-12-191-0/+0
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-20448-610/+794
| | | | | |
* | | | | | Merge pull request #12972 from owncloud/use-https-where-possibleTom Needham2014-12-191-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Link to HTTPS page
| * | | | | Link to HTTPS pageLukas Reschke2014-12-191-2/+2
| |/ / / / | | | | | | | | | | | | | | | Those domains are now accessible via HTTPS
* | | | | Fix Undefined variable: result at tags.php#231derkostka2014-12-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop Adjust indentation Do it right - indentation sorry, this is my first one
* | | | | Merge pull request #12749 from owncloud/server2server-sharing-ngBjörn Schießle2014-12-1930-247/+948
|\ \ \ \ \ | | | | | | | | | | | | server to server sharing next generation
| * | | | | Next step in server-to-server sharing next generation, see #12285Bjoern Schiessle2014-12-1930-247/+948
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
* | | | | Merge pull request #12101 from owncloud/ldap_split_mappingblizzz2014-12-1915-282/+573
|\ \ \ \ \ | |/ / / / |/| | | | Ldap split mapping from Access superclass
| * | | | Split mapping from Access and Helper classes into it's own. Fully test them, ↵Arthur Schiwon2014-12-1915-282/+573
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | too. remove unused methods split mapping methods off from Access class fix DB query handling move 'clear mapping' methods from static helper to new mapping class add tests test directly with DB finishing tests and fix return value from setDNbyUUID add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class. add missing info to PHPDoc add unmap method fix namespaces fix test inheritance PHPDoc and a small code restructure for scrutinizer, no effective changes PostgreSQL does not accept LIMIT in DELETE queries phpdoc fixes, no code changes
* | | | | Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-modeLukas Reschke2014-12-192-0/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add ultra-slim hack for incognito mode
| * | | | Add ultra-slim hack for incognito modeLukas Reschke2014-12-172-0/+12
| | | | | | | | | | | | | | | | | | | | As discussed at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
* | | | | Merge pull request #12956 from owncloud/jenkins-user-backend-namesThomas Müller2014-12-1911-11/+105
|\ \ \ \ \ | | | | | | | | | | | | [jenkins only] introduce names for user backends - IUserBackend
| * | | | | introduce names for user backends - IUserBackendMorris Jobke2014-12-1911-11/+105
| | | | | | | | | | | | | | | | | | | | | | | | * LDAP with multiple servers also proved backendName
* | | | | | Merge pull request #12935 from owncloud/public-tagsmanagerissueMorris Jobke2014-12-192-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Only populate tags in main file list
| * | | | | Only populate tags in main file listVincent Petry2014-12-182-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Moved populateTags to be done on the main file list. This prevents the public file list to go through the same code and cause an error when there is no user.
* | | | | Also add secretLukas Reschke2014-12-191-1/+1
| | | | |
* | | | | Merge pull request #12954 from owncloud/hhvm-apc-clearLukas Reschke2014-12-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | HHVM: In APC cache clear, only request the cache key in APCIterator.
| * | | | | HHVM: In APC cache clear, only request the cache key in APCIterator.Andreas Fischer2014-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value of the $format parameter of the APCIterator constructur is APC_ITER_ALL which instructs the iterator to provide all available information on cache values being iterated over. Only the key value is necessary for matching and deletion via apc_delete(), though. This prevents a "Format values FILENAME, DEVICE, INODE, MD5, NUM_HITS, MTIME, CTIME, DTIME, ATIME, REFCOUNT not supported yet." notice on HHVM.
* | | | | | Merge pull request #12918 from owncloud/use-uid-instead-of-login-nameMorris Jobke2014-12-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return UID instead of login name
| * | | | | | Return UID instead of login nameLukas Reschke2014-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this OCS on LDAP is broken for API requests coming via Basic Authentication...
* | | | | | | Merge pull request #12926 from owncloud/master-pear5Thomas Müller2014-12-191-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update 3rdparty submodule to restore PEAR5.php
| * | | | | | | Update 3rdparty submodule to restore PEAR5.phpAndreas Fischer2014-12-181-0/+0
| | | | | | | |
* | | | | | | | Merge pull request #12906 from owncloud/keyboardnav-feedbackThomas Müller2014-12-195-11/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Accessibility: Keyboard navigation feedback
| * | | | | | | | proper feedback for breadcrumbs when tabbing with keyboardJan-Christoph Borchardt2014-12-191-0/+1
| | | | | | | | |
| * | | | | | | | improve keyboard navigation feedback for certain buttonsJan-Christoph Borchardt2014-12-191-0/+1
| | | | | | | | |
| * | | | | | | | introduce first 'Skip to content' buttonJan-Christoph Borchardt2014-12-192-4/+27
| | | | | | | | |
| * | | | | | | | first part of fixing feedback for file list when using keyboardJan-Christoph Borchardt2014-12-191-4/+9
| | | | | | | | |
| * | | | | | | | fix feedback for apps menu when using keyboardJan-Christoph Borchardt2014-12-191-3/+3
| | | | | | | | |
| * | | | | | | | fix feedback for app navigation when using keyboardJan-Christoph Borchardt2014-12-191-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #12921 from owncloud/user-mail-user-managementThomas Müller2014-12-199-79/+253
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Mail address of users is now changable in the user management
| * | | | | | | | Mail address of users is now changable in the user managementMorris Jobke2014-12-189-79/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduced new route settings/users/{id}/mailAddress * kept old responses * better error messages * dropped lostpassword.php from settings/ajax * cleaned up the UserList.add() and hand in user object instead of each attribute as another parameter * check for change permission of mail address * proper response messages