| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #9517 from brantje/Add-webapp-meta-tags | Morris Jobke | 2014-07-16 | 1 | -0/+4 |
| |\ | | | | | Add webapp support | ||||
| | * | Changed to 1 line | Sander | 2014-07-08 | 1 | -3/+1 |
| | | | |||||
| | * | Added suggestions from @jancborchardt in #9517 | Sander | 2014-07-08 | 1 | -3/+3 |
| | | | |||||
| | * | Update layout.user.php | Sander | 2014-07-08 | 1 | -1/+1 |
| | | | |||||
| | * | Add webapp support | Sander | 2014-07-08 | 1 | -0/+6 |
| | | | |||||
| * | | Merge pull request #9654 from owncloud/enctest-fileproxydisabledfix | Björn Schießle | 2014-07-16 | 1 | -0/+2 |
| |\ \ | | | | | | | Reenable proxies if a test failed to restore it | ||||
| | * | | Reenable proxies if a test failed to restore it | Vincent Petry | 2014-07-15 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #9653 from owncloud/fix-9590 | Vincent Petry | 2014-07-16 | 3 | -14/+27 |
| |\ \ \ | | | | | | | | | external storage table layout fixes | ||||
| | * | | | fix CSS coding style | Morris Jobke | 2014-07-16 | 1 | -5/+6 |
| | | | | | |||||
| | * | | | Fix #9590. Fix #9612. | Stephane V | 2014-07-15 | 3 | -14/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters. The rows of the table are now always visible until the end (the trash icon is accessible). (Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.) | ||||
| * | | | | Merge pull request #9550 from kofemann/dcache-fixes-for-upstream | icewind1991 | 2014-07-16 | 2 | -4/+22 |
| |\ \ \ \ | | | | | | | | | | | storage: do not check file mode on rename | ||||
| | * | | | | files: storage: rename should check parent directories of old and new files | Tigran Mkrtchyan | 2014-07-10 | 2 | -4/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as described by POSIX.1-2008 (see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html) Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
| * | | | | | Merge pull request #9662 from owncloud/enc_error_handling_master | Björn Schießle | 2014-07-16 | 5 | -25/+74 |
| |\ \ \ \ \ | | | | | | | | | | | | | [encryption] improved error handling | ||||
| | * | | | | | introduce some encryption exceptions and catch additional error cases | Bjoern Schiessle | 2014-07-16 | 4 | -25/+73 |
| | | | | | | | |||||
| | * | | | | | make sure that the crypt library is loaded | Bjoern Schiessle | 2014-07-16 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9647 from owncloud/files_external_multiuser_tests | Robin McCorkell | 2014-07-16 | 1 | -0/+37 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add unit test for multi-user configuration loading | ||||
| | * | | | | | | Add unit test for multi-user configuration loading | Robin McCorkell | 2014-07-15 | 1 | -0/+37 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge pull request #9664 from owncloud/enc-removelegacytests | Morris Jobke | 2014-07-16 | 1 | -84/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [OC8] Removed legacy encryption tests | ||||
| | * | | | | | | Removed legacy encryption tests | Vincent Petry | 2014-07-16 | 1 | -84/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #9661 from owncloud/share-ownerdisplaynamefix | Morris Jobke | 2014-07-16 | 2 | -1/+20 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Correctly return the owner display name for children of shares | ||||
| | * | | | | | | Correctly return the owner display name for children of shares | Vincent Petry | 2014-07-16 | 2 | -1/+20 |
| | | |/ / / / | |/| | | | | |||||
| * / | | | | | Port of #9584 | Stephan Peijnik | 2014-07-16 | 2 | -2/+23 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9583 lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs. settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Fix indentation. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Renamed $grp to $group in foreach loop. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Use is_null() instead of empty() when checking the return value of GroupManager::get(). Additionally, $grp was renamed to $group inside \OC\Group\MetaData::fetchGroups(). Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> Updated code to reflect changes introduced to \OC\Group\MetaData. Now that fetchGroups() does not exist anymore and getGroups() is called directory, the 'groups' property does not exist anymore. Instead, we now generate that array on the fly and return it from getGroups. Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com> | ||||
| * | | | | | Merge pull request #9640 from owncloud/fix_9627 | Björn Schießle | 2014-07-16 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | make sure that 'OC_Theme' exists before checking if the method exists | ||||
| | * | | | | | make sure that 'OC_Theme' exists before checking if the method exists | Bjoern Schiessle | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-16 | 473 | -3097/+2186 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9644 from owncloud/fix_user_api | Thomas Müller | 2014-07-15 | 2 | -3/+3 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Fix user api | ||||
| | * | | | | | use UserSession service to resolve user id | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | use correct IUser in interface | Jörn Friedrich Dreyer | 2014-07-15 | 1 | -2/+2 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #9540 from owncloud/use_fileinfo_in_search_results | blizzz | 2014-07-15 | 1 | -33/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | use fileinfo object in search results | ||||
| | * | | | | | mkae getRelativePath of file search results overwriteable in subclasses | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -2/+1 |
| | | | | | | | |||||
| | * | | | | | return relative path | Jörn Friedrich Dreyer | 2014-07-14 | 1 | -27/+15 |
| | | | | | | | |||||
| | * | | | | | use fileinfo object in search results | Jörn Friedrich Dreyer | 2014-07-09 | 1 | -9/+11 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9628 from edozzo/master | blizzz | 2014-07-15 | 1 | -2/+12 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Userlist: async load doesnt fill checked group/subadmin array | ||||
| | * | | | | | Strinct comparsion fix | DeLtAfOx | 2014-07-15 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Userlist: async load doesnt fill checked group/subadmin array | DeLtAfOx | 2014-07-15 | 1 | -2/+12 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-this | icewind1991 | 2014-07-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add warning because there are people that enable this app because they think it's the WebDAV implementation of ownCloud | ||||
| | * | | | | | | Update info.xml | Lukas Reschke | 2014-07-15 | 1 | -1/+1 |
| | | |_|/ / / | |/| | | | | |||||
| * | | | | | | Merge pull request #8987 from owncloud/lastindexid-debug | Vincent Petry | 2014-07-15 | 3 | -8/+51 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL | ||||
| | * | | | | | | - Added test to trigger index id error | Vincent Petry | 2014-07-14 | 3 | -8/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - re-enable encryption migration tests - sqlite requires reconnect after schema changes | ||||
| * | | | | | | | Merge pull request #9561 from libasys/patch-3 | icewind1991 | 2014-07-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix Error undefined index: file_target | ||||
| | * | | | | | | | Update share.php | libasys | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | change isset with empty on line 1911 | ||||
| | * | | | | | | | Update share.php | libasys | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isset for error: ``` Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911 ``` | ||||
| * | | | | | | | | Merge pull request #9621 from owncloud/fix_logger_implementation | Thomas Müller | 2014-07-15 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | fix logger implementation | ||||
| | * | | | | | | | fix logger implementation and test | Jörn Friedrich Dreyer | 2014-07-15 | 2 | -2/+2 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | throw exception if file is to large for trash bin | Bjoern Schiessle | 2014-07-15 | 3 | -6/+46 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #9633 from owncloud/correct-icon-license | Thomas Müller | 2014-07-15 | 7 | -38/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Correct icon license | ||||
| | * | | | | | | | remove unused 3rdparty clock and lock icons | Jan-Christoph Borchardt | 2014-07-15 | 6 | -37/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | correct icon license, we use Elementary icons, not Silk anymore | Jan-Christoph Borchardt | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #9570 from PhilJung/master | blizzz | 2014-07-15 | 2 | -1/+153 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | [Issue #9559] identifiers uid=xxx must be considered as user DN and not ... | ||||
| | * | | | | | | | File written by blizzz | Philippe Jung | 2014-07-14 | 1 | -0/+151 |
| | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |