| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | Merge pull request #7416 from owncloud/share_api_7311 | Thomas Müller | 2014-02-26 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | only add "received_from" if a share was found | Bjoern Schiessle | 2014-02-26 | 1 | -6/+6 | |
| | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 9 | -44/+279 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Remove unused variables, add doc blocks and break lines | Joas Schilling | 2014-02-26 | 4 | -16/+37 | |
| | * | | | | | | | | | Hide SMTP options based on selected send mode | Joas Schilling | 2014-02-26 | 2 | -18/+36 | |
| | * | | | | | | | | | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 4 | -66/+28 | |
| | * | | | | | | | | | Add option to change email settings in admin section | Joas Schilling | 2014-02-18 | 6 | -0/+234 | |
| * | | | | | | | | | | Merge pull request #7406 from owncloud/settings-apps.js-style | Jan-Christoph Borchardt | 2014-02-26 | 1 | -5/+17 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | coding style fixes: cut long lines, whitespace | Jan-Christoph Borchardt | 2014-02-26 | 1 | -5/+17 | |
| * | | | | | | | | | | | Merge pull request #7410 from owncloud/scrutinizer_fix_kondou | Morris Jobke | 2014-02-26 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Fix scrutinizer issue in settings/js/apps.js | kondou | 2014-02-26 | 1 | -2/+2 | |
| | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #7414 from owncloud/fix-3rdparty-submodule | Thomas Müller | 2014-02-26 | 1 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Update 3rdparty submodule | Thomas Müller | 2014-02-26 | 1 | -0/+0 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge pull request #7279 from owncloud/folderid-reuse | icewind1991 | 2014-02-26 | 2 | -2/+13 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Remove fileid parameter for getFolderContent | Robin Appelman | 2014-02-21 | 1 | -5/+2 | |
| | * | | | | | | | | | | Split getFolderContentById | Robin Appelman | 2014-02-21 | 1 | -0/+10 | |
| | * | | | | | | | | | | Merge branch 'master' into folderid-reuse | Robin Appelman | 2014-02-21 | 339 | -3585/+2768 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Reuse the folder id in View->getFolderContents | Robin Appelman | 2014-02-19 | 2 | -4/+8 | |
| * | | | | | | | | | | | | Merge pull request #7399 from owncloud/themable-doc-links | Jan-Christoph Borchardt | 2014-02-26 | 2 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | introduce new theme function to allow full creation of documentation links: b... | Thomas Müller | 2014-02-25 | 2 | -1/+8 | |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #7405 from owncloud/files-admin.js-style | Vincent Petry | 2014-02-26 | 1 | -8/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | coding style fixes, cut long lines, comments not on same lines, curly braces | Jan-Christoph Borchardt | 2014-02-26 | 1 | -8/+11 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #7401 from owncloud/highlight_selected_app_settings | Vincent Petry | 2014-02-26 | 2 | -1/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | fix for coding style | Jan-Christoph Borchardt | 2014-02-26 | 1 | -1/+6 | |
| | * | | | | | | | | | | | Highlight the selected app in app-settings | kondou | 2014-02-26 | 2 | -1/+3 | |
| * | | | | | | | | | | | | Merge pull request #7328 from owncloud/McNetic-zipstreamer | Vincent Petry | 2014-02-26 | 2 | -112/+101 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'master' into McNetic-zipstreamer | Thomas Müller | 2014-02-24 | 28 | -290/+361 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into McNetic-zipstreamer | Thomas Müller | 2014-02-21 | 40 | -177/+504 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | updating 3rdparty | Thomas Müller | 2014-02-21 | 1 | -0/+0 | |
| | * | | | | | | | | | | | | | Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into M... | Thomas Müller | 2014-02-20 | 2 | -112/+101 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | switched zip file creation to ZipStreamer to create zip files directly in memory | Nicolai Ehemann | 2014-01-22 | 1 | -33/+9 | |
| | | * | | | | | | | | | | | | | refactored/cleaned up lib/files.php | Nicolai Ehemann | 2014-01-22 | 1 | -77/+84 | |
| | | * | | | | | | | | | | | | | lib/files.php: make use of === instead of == | Nicolai Ehemann | 2014-01-18 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | Merge pull request #7335 from owncloud/fix-7333 | Vincent Petry | 2014-02-25 | 2 | -3/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Fixed mount config path | Vincent Petry | 2014-02-24 | 1 | -3/+4 | |
| | * | | | | | | | | | | | | | | Fix path to the mount file | Lukas Reschke | 2014-02-20 | 1 | -1/+2 | |
| | * | | | | | | | | | | | | | | Fix code to search for mount.json in custom data folders | Lukas Reschke | 2014-02-20 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | Merge pull request #7371 from owncloud/core-storagemovedeleteall | Vincent Petry | 2014-02-25 | 2 | -38/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Removed unused deleteAll method on Common storage class | Vincent Petry | 2014-02-24 | 1 | -37/+0 | |
| | * | | | | | | | | | | | | | | | Replace deleteAll call with unlink call | Vincent Petry | 2014-02-24 | 1 | -1/+1 | |
| | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge pull request #6299 from leo-b/ldap_nested_groups | VicDeo | 2014-02-25 | 3 | -10/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | replace spaces with tabs | root | 2014-02-21 | 1 | -5/+5 | |
| | * | | | | | | | | | | | | | | | fix coding style to blizzz happy.. ;-) | root | 2014-02-12 | 1 | -8/+10 | |
| | * | | | | | | | | | | | | | | | fix indentation | root | 2013-12-11 | 1 | -42/+42 | |
| | * | | | | | | | | | | | | | | | remove debug output | root | 2013-12-10 | 1 | -3/+0 | |
| | * | | | | | | | | | | | | | | | Merge remote branch 'upstream/master' into ldap_nested_groups | root | 2013-12-10 | 329 | -4807/+8676 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | move nested group checkbox to directory settings | root | 2013-12-10 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | combineFilterWithAnd recently moved to Access | root | 2013-12-08 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | add support for nested groups | root | 2013-12-06 | 3 | -10/+73 | |
| * | | | | | | | | | | | | | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keys | Björn Schießle | 2014-02-25 | 4 | -4/+140 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | ||||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |