Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2516 from kabum/master | Bernhard Posselt | 2013-03-29 | 1 | -1/+12 |
|\ | | | | | share autocomplete - improve group appearance - issue #173 | ||||
| * | use simple markup to highlight groups in share autocomplete | Morris Jobke | 2013-03-22 | 2 | -10/+4 |
| | | |||||
| * | replace hardcoded css style with css class - ref owncloud/core#173 | Morris Jobke | 2013-03-21 | 2 | -1/+6 |
| | | |||||
| * | share autocomplete - improve group appearance | Morris Jobke | 2013-03-21 | 1 | -1/+13 |
| | | | | | | | | | | | | highlight groups with markup (bold font) instead of "(group)" postfix ref owncloud/core#173 | ||||
* | | Merge pull request #2584 from mrtorrent/fix_instanceid_format | Bernhard Posselt | 2013-03-29 | 2 | -12/+18 |
|\ \ | | | | | | | Fix instanceid format to prevent session loop | ||||
| * | | Ensure instanceid contains a letter | Miquel Rodríguez Telep / Michael Rodríguez-Torrent | 2013-03-26 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instanceid is generated by uniqid() and then used as the session_name. Because session_name requires at least one letter and uniqid() does not guarantee to provide that, in the case that uniqid() generates a string of only digits, the user will be stuck in an infinite login loop because every request will generate a new PHP session. | ||||
| * | | Minor typo, coding style fixes for OC_Util::getInstanceId | Miquel Rodríguez Telep / Michael Rodríguez-Torrent | 2013-03-26 | 1 | -12/+12 |
| | | | |||||
* | | | Merge pull request #2597 from kabum/lesslog | Bernhard Posselt | 2013-03-29 | 3 | -10/+24 |
|\ \ \ | | | | | | | | | Make it possible to show less log entries again | ||||
| * | | | fix typo and remove animation | Morris Jobke | 2013-03-28 | 1 | -2/+1 |
| | | | | |||||
| * | | | convert js call to css rule | Morris Jobke | 2013-03-28 | 2 | -1/+1 |
| | | | | |||||
| * | | | apply code review hints | Morris Jobke | 2013-03-28 | 2 | -15/+13 |
| | | | | |||||
| * | | | add copyright note | Morris Jobke | 2013-03-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | remove animation | Morris Jobke | 2013-03-27 | 1 | -2/+1 |
| | | | | |||||
| * | | | Make it possible to show less log entries again - fix owncloud/core#1593 | Morris Jobke | 2013-03-27 | 2 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | * show "less" button only if there are more than 3 entries * only "remove" logs till last 3 entries | ||||
* | | | | Merge pull request #2448 from owncloud/userlist_available_groups | Bernhard Posselt | 2013-03-29 | 1 | -4/+13 |
|\ \ \ \ | | | | | | | | | | | User list: Keep array of available groups. Should fix #873 | ||||
| * | | | | User list: Keep array of available groups. Should fix #873 | Thomas Tanghus | 2013-03-19 | 1 | -4/+13 |
| | | | | | |||||
* | | | | | Merge pull request #2585 from mrtorrent/fix_install_app_version_check | Bart Visscher | 2013-03-29 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix install app version check | ||||
| * | | | | | Use isAppVersionCompatible in app installer | Miquel Rodríguez Telep / Michael Rodríguez-Torrent | 2013-03-27 | 1 | -2/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #2575 from owncloud/fixing-1461-master | Jörn Friedrich Dreyer | 2013-03-28 | 1 | -5/+25 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix upload progressbar in IE8 and IE9 | ||||
| * | | | | | fixes #1463 - file size is now displayed correctly in IE8 | Thomas Mueller | 2013-03-26 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | fixes #1461 | Thomas Mueller | 2013-03-26 | 1 | -3/+19 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-28 | 14 | -18/+21 |
| | | | | | |||||
* | | | | | Whitespaces | Arthur Schiwon | 2013-03-27 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Share Dialog: show Displayname instead of internal name | Arthur Schiwon | 2013-03-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Cache: on equal mtime also for equal size before keeping ETag, at least ↵ | Arthur Schiwon | 2013-03-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | makes Unit Test happy | ||||
* | | | | | Cache: Do not overwrite ETag when file did not change | Arthur Schiwon | 2013-03-27 | 1 | -4/+6 |
| | | | | | |||||
* | | | | | Only prepare an SQL statement once. | Arthur Schiwon | 2013-03-27 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Add PHPDoc | Arthur Schiwon | 2013-03-27 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Adjust to Icewind's fix | Arthur Schiwon | 2013-03-27 | 1 | -51/+0 |
| | | | | | |||||
* | | | | | Cache: fix property path for getting legacy etag | Robin Appelman | 2013-03-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Port Icewind's fix I | Robin Appelman | 2013-03-27 | 2 | -2/+23 |
| | | | | | |||||
* | | | | | Port OC_Property Table Index | Arthur Schiwon | 2013-03-27 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | Change LIMIT in DB query respectively remove where not necessary | Arthur Schiwon | 2013-03-27 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Remove Debug output | Arthur Schiwon | 2013-03-27 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | Upgrade FileCache on ownCloud upgrade for all users with files | Arthur Schiwon | 2013-03-27 | 2 | -1/+66 |
| | | | | | |||||
* | | | | | Performance: prepare queries only once | Arthur Schiwon | 2013-03-27 | 1 | -5/+10 |
| | | | | | |||||
* | | | | | Fix lost ETag on Cache Upgrade | Arthur Schiwon | 2013-03-27 | 1 | -3/+74 |
| | | | | | |||||
* | | | | | Files External: show display names instead of internal user names in Settings UI | Arthur Schiwon | 2013-03-27 | 2 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #2598 from ceri/master | blizzz | 2013-03-27 | 0 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Use displayName in the From field of outbound email about new shares. | ||||
| * | | | | | Use displayName in the From field of outbound email about new shares. | Ceri Davies | 2013-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important in the Active Directory case where users are currently getting a GUID in the From field, making emails look quite a lot like spam. | ||||
* | | | | | | Users: use DisplayName in the Display Name col when appending users | Arthur Schiwon | 2013-03-27 | 1 | -1/+1 |
| |_|_|/ / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-27 | 363 | -5581/+8771 |
| | | | | | |||||
* | | | | | Merge pull request #2578 from owncloud/fixing-2577-master | Thomas Müller | 2013-03-26 | 2 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | prevent to fire delete ajax a second time. | ||||
| * | | | | | prevent to fire delete ajax a second time. | Thomas Mueller | 2013-03-26 | 2 | -3/+3 |
| | |/ / / | |/| | | | | | | | | | | | | | Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only | ||||
* | | | | | Merge pull request #2567 from owncloud/fix_insertIfNotExist | Thomas Tanghus | 2013-03-26 | 1 | -15/+16 |
|\ \ \ \ \ | |/ / / / |/| | | | | Properly prepare insertIfNotExist queries. | ||||
| * | | | | And removing an irrelevant comment ;) | Thomas Tanghus | 2013-03-26 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Double quotes to backticks | Thomas Tanghus | 2013-03-26 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Missing backticks. Thx @Raydiation :) | Thomas Tanghus | 2013-03-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | D'oh, why concatenate static strings. | Thomas Tanghus | 2013-03-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Quote key for SQLite. | Thomas Tanghus | 2013-03-26 | 1 | -1/+1 |
| | | | | |