Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3783 from owncloud/improved_wording | Michael Gapczynski | 2013-06-19 | 1 | -1/+1 |
|\ | |||||
| * | fixed enghlish sentence, thanks to @MTGap | Björn Schießle | 2013-06-19 | 1 | -1/+1 |
* | | Merge pull request #3764 from owncloud/scanfolder-existing | icewind1991 | 2013-06-19 | 4 | -36/+70 |
|\ \ | |/ |/| | |||||
| * | fix updaters test cases | Robin Appelman | 2013-06-19 | 1 | -2/+1 |
| * | add tests for reusing existing data in scanner | Robin Appelman | 2013-06-17 | 2 | -5/+21 |
| * | reuse etag when doing a forced rescan | Robin Appelman | 2013-06-14 | 1 | -1/+1 |
| * | scanner: give more percision about what data is reused during scanning | Robin Appelman | 2013-06-14 | 1 | -17/+29 |
| * | split of scanning the childs of a folder | Robin Appelman | 2013-06-14 | 1 | -17/+24 |
* | | also use the default theme if the theme is set to an empty string in the con... | Björn Schießle | 2013-06-19 | 1 | -2/+2 |
* | | fix lost password page, don't show checkbox is encryption is not enabled | Björn Schießle | 2013-06-19 | 2 | -6/+6 |
* | | Merge pull request #3661 from owncloud/fixing-windows-server-master | Jörn Friedrich Dreyer | 2013-06-19 | 4 | -6/+137 |
|\ \ | |||||
| * | | dirname('/test.txt') returns '\' on windows whereas on linux we get back '.' | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |
| * | | restore Updater functionality on non-Windows platforms | Thomas Mueller | 2013-06-13 | 1 | -4/+4 |
| * | | Add tests for the updater with mount points | Michael Gapczynski | 2013-06-12 | 1 | -3/+125 |
| * | | [Fixing unit tests in Windows] | Thomas Mueller | 2013-06-10 | 1 | -0/+6 |
| * | | [Fixing Updater Unit Tests on Windows] | Thomas Mueller | 2013-06-10 | 1 | -3/+3 |
| * | | [Fixing Updater Unit Tests on Windows] | Thomas Mueller | 2013-06-10 | 1 | -1/+4 |
| * | | Let's just use '/' as we do almost everywhere - this change fixes two failing... | Thomas Mueller | 2013-06-10 | 1 | -2/+2 |
* | | | Merge pull request #3773 from owncloud/port_3596 | Thomas Müller | 2013-06-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Users page: username instead of login name as col header to avoid confusion w... | Arthur Schiwon | 2013-06-18 | 1 | -1/+1 |
* | | | | Merge pull request #3765 from owncloud/hide-logo-claim | Frank Karlitschek | 2013-06-18 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | hide the logo claim in case the theme is not loaded | Jan-Christoph Borchardt | 2013-06-17 | 2 | -2/+2 |
* | | | | | Merge pull request #3774 from owncloud/fix_sql_in_vcategories | Thomas Müller | 2013-06-18 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | remove dangling AND in SQL statement | Jörn Friedrich Dreyer | 2013-06-18 | 1 | -1/+1 |
|/ / / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-18 | 542 | -1097/+1124 |
|/ / / | |||||
* | | | Merge pull request #3727 from owncloud/fix_glob_escaping | Björn Schießle | 2013-06-17 | 3 | -322/+316 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into fix_glob_escaping | Björn Schießle | 2013-06-17 | 798 | -6942/+7274 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-17 | 542 | -1113/+1140 |
* | | | | Merge pull request #3621 from owncloud/path-mimetype | Thomas Müller | 2013-06-16 | 2 | -12/+31 |
|\ \ \ \ | |||||
| * | | | | Basic tests for getFileNameMimeType | Robin Appelman | 2013-06-16 | 1 | -0/+9 |
| * | | | | actually return result | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| * | | | | fix variable name | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| * | | | | seperate mimetype guessing from filename | Robin Appelman | 2013-06-06 | 1 | -12/+22 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-16 | 584 | -1195/+1306 |
* | | | | | Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder | Morris Jobke | 2013-06-15 | 1 | -2/+9 |
|\ \ \ \ \ | |||||
| * | | | | | duplicate verification | Bastien Ho | 2013-05-10 | 1 | -3/+0 |
| * | | | | | Fix inexisting trashbin's sub-folders | Bastien Ho | 2013-05-10 | 1 | -2/+12 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-15 | 766 | -6766/+6851 |
* | | | | | | Merge pull request #3733 from owncloud/email_template | Jan-Christoph Borchardt | 2013-06-14 | 4 | -9/+56 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove » and « from the text mail because they will be escaped | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |
| * | | | | | | Do no translate "ownCloud - " | Stephan Arts | 2013-06-14 | 2 | -4/+4 |
| * | | | | | | Use templates to theme share e-mails (#3683) | Stephan Arts | 2013-06-14 | 4 | -9/+56 |
* | | | | | | | Merge pull request #3473 from opensaucesystems/master | Thomas Müller | 2013-06-14 | 2 | -3/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update settings.php | opensaucesystems | 2013-05-23 | 1 | -1/+1 |
| * | | | | | | | Remove http:// from label and add placeholder | opensaucesystems | 2013-05-23 | 1 | -1/+1 |
| * | | | | | | | Enable https authentication | opensaucesystems | 2013-05-23 | 1 | -1/+1 |
| * | | | | | | | Enable https authentication | opensaucesystems | 2013-05-23 | 1 | -2/+8 |
* | | | | | | | | Merge pull request #3721 from owncloud/oracle_setup_fixes | Thomas Müller | 2013-06-14 | 5 | -26/+47 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | remove default tablespace in parameter | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -3/+3 |
| * | | | | | | | adding default to $hint within ctor of DatabaseSetupException | Thomas Mueller | 2013-06-14 | 1 | -1/+1 |