| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #5458 from owncloud/fixing-5222-master | VicDeo | 2013-10-23 | 4 | -4/+105 |
|\ |
|
| * | add missing file header | Thomas Müller | 2013-10-23 | 1 | -0/+6 |
| * | fixing php 5.3.3 error: | Thomas Müller | 2013-10-22 | 1 | -2/+3 |
| * | Merge branch 'master' into fixing-5222-master | Thomas Müller | 2013-10-22 | 2 | -12/+11 |
| |\ |
|
| * | | php 5.3 compatibility regarding OC\DB\Connection fixed | Thomas Müller | 2013-10-21 | 3 | -2/+96 |
* | | | Update CONTRIBUTING.md | Johannes Twittmann | 2013-10-23 | 1 | -1/+4 |
* | | | Merge pull request #5404 from owncloud/ldap_settings_wizard | blizzz | 2013-10-23 | 20 | -481/+2721 |
|\ \ \ |
|
| * | | | LDAP Wizard: proper strings and translations for user and group count text | Arthur Schiwon | 2013-10-23 | 3 | -5/+11 |
| * | | | merge master with resolved conflicts | Arthur Schiwon | 2013-10-23 | 439 | -4410/+8340 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #5472 from owncloud/enc_init_status_on_enable | Björn Schießle | 2013-10-23 | 4 | -1/+14 |
|\ \ \ \ |
|
| * | | | | remove debug output | Bjoern Schiessle | 2013-10-22 | 1 | -1/+0 |
| * | | | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabled | Bjoern Schiessle | 2013-10-22 | 3 | -1/+14 |
| * | | | | add post_enable hook if a app gets enabled | Bjoern Schiessle | 2013-10-22 | 1 | -0/+1 |
* | | | | | Merge pull request #5482 from owncloud/fix_weird_http_namespace | Thomas Müller | 2013-10-23 | 13 | -10/+18 |
|\ \ \ \ \ |
|
| * | | | | | Fix namespace for OCP\Appframework\Http | Thomas Tanghus | 2013-10-23 | 13 | -10/+18 |
* | | | | | | Merge pull request #5391 from owncloud/undefined-property-in-schema-master | Thomas Müller | 2013-10-22 | 1 | -3/+4 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Use quoteIdentifier with proper objects | Victor Dubiniuk | 2013-10-21 | 1 | -0/+5 |
| * | | | | | removing pointless calls on quoteIdentifier() - reason: name on $tableDiff do... | Thomas Müller | 2013-10-17 | 1 | -6/+2 |
* | | | | | | Merge pull request #5451 from owncloud/reuse-session-ocs-master | Thomas Müller | 2013-10-22 | 1 | -3/+19 |
|\ \ \ \ \ \ |
|
| * | | | | | | Support existing sessions within OCS API calls | Thomas Müller | 2013-10-21 | 1 | -3/+19 |
* | | | | | | | Merge pull request #5310 from owncloud/hide_filestable-header_when_empty | Christopher Schäpers | 2013-10-22 | 3 | -10/+24 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Fixed empty content logic | Vincent Petry | 2013-10-21 | 2 | -2/+2 |
| * | | | | | | | Fix mind-boggling emptycontent logic | kondou | 2013-10-21 | 3 | -6/+8 |
| * | | | | | | | Fix shared folder still showing fileheader | kondou | 2013-10-21 | 2 | -3/+3 |
| * | | | | | | | Improve updateEmptyContent logic | kondou | 2013-10-20 | 1 | -1/+1 |
| * | | | | | | | Create FileList.updateEmptyContent() and fix not showing emptycontent after d... | kondou | 2013-10-20 | 1 | -5/+10 |
| * | | | | | | | Hide files list header, when theres no files to see | kondou | 2013-10-12 | 3 | -5/+12 |
* | | | | | | | | Merge pull request #5479 from owncloud/fixing-4502-master | Thomas Müller | 2013-10-22 | 3 | -0/+19 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | - delete properties on node delete | Thomas Müller | 2013-10-22 | 3 | -0/+19 |
| | |_|_|/ / / /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle | Thomas Müller | 2013-10-22 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Fixed ugly white space while loading file thumbnail | Vincent Petry | 2013-10-22 | 1 | -2/+10 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #5467 from owncloud/fixing-5063-master | Thomas Müller | 2013-10-22 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | display the original file name - this will change in case of renames | Thomas Müller | 2013-10-22 | 1 | -3/+3 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #5473 from owncloud/files-startviewerfunc | Thomas Müller | 2013-10-22 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Added FileList.setViewerMode to hide controls | Vincent Petry | 2013-10-22 | 1 | -0/+25 |
| |/ / / / / / / |
|
* | | | | | | | | Merge pull request #5476 from owncloud/admin-showwarningwhenhomeexists | Thomas Müller | 2013-10-22 | 2 | -0/+19 |
|\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
| * | | | | | | | Added warning notification when user home already exists | Vincent Petry | 2013-10-22 | 2 | -0/+19 |
|/ / / / / / / |
|
* | | | | | | | Merge pull request #5455 from owncloud/fixing-2423-master | Thomas Müller | 2013-10-22 | 10 | -15/+32 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | use OC_Helper::linkToDocs() in lib/private/config.php | Thomas Müller | 2013-10-21 | 1 | -1/+1 |
| * | | | | | | | introduce OC_Helper::linkToDocs() | Thomas Müller | 2013-10-21 | 3 | -6/+18 |
| * | | | | | | | introduce link_to_docs() and migrate links | Thomas Müller | 2013-10-21 | 9 | -15/+20 |
* | | | | | | | | Merge pull request #5437 from owncloud/create-custom-logfile | Thomas Müller | 2013-10-22 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Try to create custom log file before falling back to default. | Andreas Fischer | 2013-10-20 | 1 | -1/+11 |
* | | | | | | | | | Merge pull request #5426 from owncloud/fix-3612 | Vincent Petry | 2013-10-22 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/
|/| | | | | | | | |
|
| * | | | | | | | | Takes Import button to next line. | raghunayyar | 2013-10-21 | 1 | -1/+4 |
| * | | | | | | | | Adds margin to the SSL root certificate button | raghunayyar | 2013-10-19 | 1 | -0/+1 |
* | | | | | | | | | Merge pull request #5446 from frisco82/fixNotifyUser | Frank Karlitschek | 2013-10-21 | 2 | -12/+11 |
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/
|/| | | | | | | | |
|
| * | | | | | | | | fix notify user, and made js more resiliant to changes | Ramiro Aparicio | 2013-10-21 | 2 | -12/+11 |
* | | | | | | | | | Merge pull request #5249 from owncloud/activities-api | Thomas Müller | 2013-10-21 | 6 | -0/+184 |
|\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 26 | -476/+233 |
| |\ \ \ \ \ \ \ \ \ |
|